From 4c559edd2db9c9b8c4c0ef255f302fb6a0750403 Mon Sep 17 00:00:00 2001 From: redi Date: Fri, 12 Sep 2014 14:06:50 +0000 Subject: [PATCH] * include/debug/deque (__gnu_debug::deque): Make base class C++11 allocator aware. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@215223 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 5 +++++ 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 + * include/debug/deque (__gnu_debug::deque): Make base class C++11 + allocator aware. + +2014-09-12 Jonathan Wakely + 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; -- 2.7.4