From patchwork Fri Dec 23 01:49:13 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jonathan Wakely <jwakely.gcc@gmail.com>
X-Patchwork-Id: 132932
Return-Path: 
 <gcc-patches-return-310479-incoming=patchwork.ozlabs.org@gcc.gnu.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from sourceware.org (server1.sourceware.org [209.132.180.131])
	by ozlabs.org (Postfix) with SMTP id 6603CB6F9A
	for <incoming@patchwork.ozlabs.org>;
	Fri, 23 Dec 2011 12:49:49 +1100 (EST)
Received: (qmail 17793 invoked by alias); 23 Dec 2011 01:49:31 -0000
Received: (qmail 17728 invoked by uid 22791); 23 Dec 2011 01:49:30 -0000
X-SWARE-Spam-Status: No, hits=-2.5 required=5.0	tests=AWL, BAYES_00,
	DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM,
	RCVD_IN_DNSWL_LOW
X-Spam-Check-By: sourceware.org
Received: from mail-we0-f175.google.com (HELO mail-we0-f175.google.com)
	(74.125.82.175) by sourceware.org (qpsmtpd/0.43rc1) with
	ESMTP; Fri, 23 Dec 2011 01:49:14 +0000
Received: by werm13 with SMTP id m13so4204273wer.20 for <multiple
	recipients>; Thu, 22 Dec 2011 17:49:13 -0800 (PST)
MIME-Version: 1.0
Received: by 10.216.132.8 with SMTP id n8mr12581372wei.35.1324604953229;
	Thu, 22 Dec 2011 17:49:13 -0800 (PST)
Received: by 10.216.69.7 with HTTP; Thu, 22 Dec 2011 17:49:13 -0800 (PST)
Date: Fri, 23 Dec 2011 01:49:13 +0000
Message-ID: 
 <CAH6eHdQvv5imOTVoRN8T2L1VWt09OMCeUREyvKm94DafVoQDCg@mail.gmail.com>
Subject: [v3] fix TODO in <bits/regex.h>
From: Jonathan Wakely <jwakely.gcc@gmail.com>
To: "libstdc++" <libstdc++@gcc.gnu.org>,
	gcc-patches <gcc-patches@gcc.gnu.org>
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Unsubscribe: 
 <mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Delivered-To: mailing list gcc-patches@gcc.gnu.org

* include/bits/regex.h (match_results::size_type): Use
        allocator_traits.

Tested x86_64-linux, committed to trunk

Index: include/bits/regex.h
===================================================================
--- include/bits/regex.h	(revision 182644)
+++ include/bits/regex.h	(revision 182645)
@@ -1490,8 +1490,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       typedef const_iterator                                  iterator;
       typedef typename std::iterator_traits<_Bi_iter>::difference_type
                                                               difference_type;
-      /* TODO: needs allocator_traits */
-      typedef typename _Allocator::size_type                  size_type;
+      typedef typename allocator_traits<_Allocator>::size_type
+                                                              size_type;
       typedef _Allocator                                      allocator_type;
       typedef typename std::iterator_traits<_Bi_iter>::value_type
                                                               char_type;