list (__gnu_debug::list): Use allocator-aware _Safe_container base.

	* include/debug/list (__gnu_debug::list): Use allocator-aware
	_Safe_container base.
	* include/debug/string (__gnu_debug::basic_string): Use
	allocator-aware _Safe_container base for cxx11 ABI.

From-SVN: r224738

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1e2fda0..1166a18 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
 2015-06-22  Jonathan Wakely  <jwakely@redhat.com>
 
+       * include/debug/list (__gnu_debug::list): Use allocator-aware
+       _Safe_container base.
+       * include/debug/string (__gnu_debug::basic_string): Use
+       allocator-aware _Safe_container base for cxx11 ABI.
+
        * include/bits/locale_conv.h (__do_str_codecvt): Handle empty range.
        (wstring_convert): Move into __cxx11 namespace.
        (wbuffer_convert(streambuf*, _Codecvt*, state_type)): Fix exception

diff --git a/libstdc++-v3/include/debug/list b/libstdc++-v3/include/debug/list
index 1562946..12ac53c 100644 (file)
--- a/libstdc++-v3/include/debug/list
+++ b/libstdc++-v3/include/debug/list
@@ -43,12 +43,12 @@ namespace __debug
     class list
     : public __gnu_debug::_Safe_container<
        list<_Tp, _Allocator>, _Allocator,
-       __gnu_debug::_Safe_node_sequence, false>,
+       __gnu_debug::_Safe_node_sequence>,
       public _GLIBCXX_STD_C::list<_Tp, _Allocator>
     {
-      typedef _GLIBCXX_STD_C::list<_Tp, _Allocator>                    _Base;
+      typedef _GLIBCXX_STD_C::list<_Tp, _Allocator>            _Base;
       typedef __gnu_debug::_Safe_container<
-       list, _Allocator, __gnu_debug::_Safe_node_sequence, false>      _Safe;
+       list, _Allocator, __gnu_debug::_Safe_node_sequence>     _Safe;
 
       typedef typename _Base::iterator         _Base_iterator;
       typedef typename _Base::const_iterator   _Base_const_iterator;

diff --git a/libstdc++-v3/include/debug/string b/libstdc++-v3/include/debug/string
index 3793a35..f068ef0 100644 (file)
--- a/libstdc++-v3/include/debug/string
+++ b/libstdc++-v3/include/debug/string
@@ -42,12 +42,13 @@ namespace __gnu_debug
     class basic_string
     : public __gnu_debug::_Safe_container<
        basic_string<_CharT, _Traits, _Allocator>,
-       _Allocator, _Safe_sequence, false>,
+       _Allocator, _Safe_sequence, bool(_GLIBCXX_USE_CXX11_ABI)>,
       public std::basic_string<_CharT, _Traits, _Allocator>
     {
       typedef std::basic_string<_CharT, _Traits, _Allocator>   _Base;
       typedef __gnu_debug::_Safe_container<
-       basic_string, _Allocator, _Safe_sequence, false>        _Safe;
+       basic_string, _Allocator, _Safe_sequence, bool(_GLIBCXX_USE_CXX11_ABI)>
+       _Safe;
 
   public:
     // types: