From: redi Date: Mon, 22 Jun 2015 15:09:27 +0000 (+0000) Subject: * include/debug/list (__gnu_debug::list): Use allocator-aware X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=496d3abc0026005d64334389f23f3e80071f083d;p=thirdparty%2Fgcc.git * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@224738 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1e2fda0cf5a8..1166a1880ce8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2015-06-22 Jonathan Wakely + * 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 1562946311bf..12ac53c46756 100644 --- 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 3793a35869c1..f068ef04fe8d 100644 --- 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: