diff options
| author | Jonathan Wakely <jwakely.gcc@gmail.com> | 2011-12-23 01:47:41 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2011-12-23 01:47:41 +0000 |
| commit | 2ae90de6655ff7fa87a4ac94e155e3bfd83fe78c (patch) | |
| tree | e6bf4c5d70844e619d4ed2d487cc7c14a47b8d0e /libstdc++-v3 | |
| parent | b409bbe65f3f15a53bbf9332cfaec17b31581782 (diff) | |
| download | gcc-2ae90de6655ff7fa87a4ac94e155e3bfd83fe78c.zip gcc-2ae90de6655ff7fa87a4ac94e155e3bfd83fe78c.tar.gz gcc-2ae90de6655ff7fa87a4ac94e155e3bfd83fe78c.tar.bz2 | |
regex.h (match_results::size_type): Use allocator_traits.
* include/bits/regex.h (match_results::size_type): Use
allocator_traits.
From-SVN: r182645
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/regex.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2b56c0e..a8b31b8 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 cc1abcc..645011d 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; |