Revert revision 247926.

From-SVN: r247998

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index afe7a548bf61751ca094f7ab8ba084750650f4cc..8664e8cd52560a2665e4248d21fd301e7d100627 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -12,10 +12,6 @@
        (_Rb_tree_impl<>): Remove _Is_pod_comparator
        template parameter.
 
-       * include/debug/safe_container.h [_GLIBCXX_USE_CXX11_ABI]
-       (_Safe_container<>): Remove _IsCxx11AllocatorAware template parameter.
-       * include/debug/string: Adapt.
-
        * include/debug/formatter.h [_GLIBCXX_INLINE_VERSION]
        (__gnu_debug::_Error_formatter::_Parameter::_M_print_field): Remove.
        (__gnu_debug::_Error_formatter::_Parameter::_M_print_description):

diff --git a/libstdc++-v3/include/debug/safe_container.h b/libstdc++-v3/include/debug/safe_container.h
index e985c2ae88aad5611c09dd2508cca8968b7bf4bd..3d44c15cdf30faf109bc84a98f2f354bed423921 100644 (file)
--- a/libstdc++-v3/include/debug/safe_container.h
+++ b/libstdc++-v3/include/debug/safe_container.h
@@ -36,12 +36,8 @@ namespace __gnu_debug
   /// Safe class dealing with some allocator dependent operations.
   template<typename _SafeContainer,
           typename _Alloc,
-          template<typename> class _SafeBase
-#if _GLIBCXX_USE_CXX11_ABI
-          >
-#else
-          , bool _IsCxx11AllocatorAware = true>
-#endif
+          template<typename> class _SafeBase,
+          bool _IsCxx11AllocatorAware = true>
     class _Safe_container
     : public _SafeBase<_SafeContainer>
     {
@@ -86,10 +82,8 @@ namespace __gnu_debug
       {
        __glibcxx_check_self_move_assign(__x);
 
-#  if !_GLIBCXX_USE_CXX11_ABI
        if (_IsCxx11AllocatorAware)
          {
-#  endif
            typedef __gnu_cxx::__alloc_traits<_Alloc> _Alloc_traits;
 
            bool __xfer_memory = _Alloc_traits::_S_propagate_on_move_assign()
@@ -98,11 +92,9 @@ namespace __gnu_debug
              _Base::_M_swap(__x);
            else
              this->_M_invalidate_all();
-#  if !_GLIBCXX_USE_CXX11_ABI
          }
        else
          _Base::_M_swap(__x);
-#  endif
 
        __x._M_invalidate_all();
        return *this;
@@ -111,9 +103,7 @@ namespace __gnu_debug
       void
       _M_swap(_Safe_container& __x) noexcept
       {
-#  if !_GLIBCXX_USE_CXX11_ABI
        if (_IsCxx11AllocatorAware)
-#  endif
          {
            typedef __gnu_cxx::__alloc_traits<_Alloc> _Alloc_traits;
 

diff --git a/libstdc++-v3/include/debug/string b/libstdc++-v3/include/debug/string
index 8fd292a45a443d5600e584278387a81e3ce14567..9d4057b7d4372e34e8512526421b790682796c0e 100644 (file)
--- a/libstdc++-v3/include/debug/string
+++ b/libstdc++-v3/include/debug/string
@@ -44,20 +44,13 @@ template<typename _CharT, typename _Traits = std::char_traits<_CharT>,
   class basic_string
   : public __gnu_debug::_Safe_container<
       basic_string<_CharT, _Traits, _Allocator>,
-#if _GLIBCXX_USE_CXX11_ABI
-      _Allocator, _Safe_sequence>,
-#else
-      _Allocator, _Safe_sequence, false>,
-#endif
+      _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<
-#if _GLIBCXX_USE_CXX11_ABI
-      basic_string, _Allocator, _Safe_sequence> _Safe;
-#else
-      basic_string, _Allocator, _Safe_sequence, false> _Safe;
-#endif
+      basic_string, _Allocator, _Safe_sequence, bool(_GLIBCXX_USE_CXX11_ABI)>
+      _Safe;
 
   public:
     // types: