diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2014-09-12 15:06:50 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2014-09-12 15:06:50 +0100 |
| commit | b6f866946b763415799331fe6799c4528357d6d0 (patch) | |
| tree | 81a618b6072ce4d73574f188c2a30eb6ca03aabe | |
| parent | a5d567ec327cae776e9b9722f521f9f55fa45e0b (diff) | |
| download | gcc-b6f866946b763415799331fe6799c4528357d6d0.zip gcc-b6f866946b763415799331fe6799c4528357d6d0.tar.gz gcc-b6f866946b763415799331fe6799c4528357d6d0.tar.bz2 | |
deque (__gnu_debug::deque): Make base class C++11 allocator aware.
* include/debug/deque (__gnu_debug::deque): Make base class C++11
allocator aware.
From-SVN: r215223
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/debug/deque | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index afcba38..266a116 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2014-09-12 Jonathan Wakely <jwakely@redhat.com> + * include/debug/deque (__gnu_debug::deque): Make base class C++11 + allocator aware. + +2014-09-12 Jonathan Wakely <jwakely@redhat.com> + PR libstdc++/59603 * include/bits/stl_algo.h (random_shuffle): Prevent self-swapping. * testsuite/25_algorithms/random_shuffle/59603.cc: New. diff --git a/libstdc++-v3/include/debug/deque b/libstdc++-v3/include/debug/deque index 824cb28..c17a3e1 100644 --- a/libstdc++-v3/include/debug/deque +++ b/libstdc++-v3/include/debug/deque @@ -43,12 +43,12 @@ namespace __debug class deque : public __gnu_debug::_Safe_container< deque<_Tp, _Allocator>, _Allocator, - __gnu_debug::_Safe_sequence, false>, + __gnu_debug::_Safe_sequence>, public _GLIBCXX_STD_C::deque<_Tp, _Allocator> { typedef _GLIBCXX_STD_C::deque<_Tp, _Allocator> _Base; typedef __gnu_debug::_Safe_container< - deque, _Allocator, __gnu_debug::_Safe_sequence, false> _Safe; + deque, _Allocator, __gnu_debug::_Safe_sequence> _Safe; typedef typename _Base::const_iterator _Base_const_iterator; typedef typename _Base::iterator _Base_iterator; |