From: Jonathan Wakely <jwakely.gcc@gmail.com>
Date: Fri, 23 Dec 2011 01:47:41 +0000 (+0000)
Subject: regex.h (match_results::size_type): Use allocator_traits.
X-Git-Tag: releases/gcc-4.7.0~1333
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ae90de6655ff7fa87a4ac94e155e3bfd83fe78c;p=thirdparty%2Fgcc.git

regex.h (match_results::size_type): Use allocator_traits.

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

From-SVN: r182645
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2b56c0e44ed9..a8b31b8b0247 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-23  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+	* include/bits/regex.h (match_results::size_type): Use
+	allocator_traits.
+
 2011-12-22  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
 	PR libstdc++/48362
diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h
index cc1abccaba05..645011df6869 100644
--- a/libstdc++-v3/include/bits/regex.h
+++ b/libstdc++-v3/include/bits/regex.h
@@ -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;