2017-05-11 François Dumont <fdumont@gcc.gnu.org>

	* include/debug/formatter.h [_GLIBCXX_INLINE_VERSION]
	(__gnu_debug::_Error_formatter::_Parameter::_M_print_field): Remove.
	(__gnu_debug::_Error_formatter::_Parameter::_M_print_description):
	Remove.
	(__gnu_debug::_Error_formatter::_M_format_word): Remove.
	(__gnu_debug::_Error_formatter::_M_print_word): Remove.
	(__gnu_debug::_Error_formatter::_M_print_string): Remove.
	(__gnu_debug::_Error_formatter::_M_get_max_length): Remove.
	* src/c++11/debug.cc: Adapt.
	* config/abi/pre/gnu-versioned-namespace.ver: Adapt.

From-SVN: r247925

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5d69a8edac459ec7c0efc2349179605d74290537..21cdba332f888b818a4581d33008bdfaeda324c7 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,16 @@
+2017-05-11  François Dumont  <fdumont@gcc.gnu.org>
+
+       * include/debug/formatter.h [_GLIBCXX_INLINE_VERSION]
+       (__gnu_debug::_Error_formatter::_Parameter::_M_print_field): Remove.
+       (__gnu_debug::_Error_formatter::_Parameter::_M_print_description):
+       Remove.
+       (__gnu_debug::_Error_formatter::_M_format_word): Remove.
+       (__gnu_debug::_Error_formatter::_M_print_word): Remove.
+       (__gnu_debug::_Error_formatter::_M_print_string): Remove.
+       (__gnu_debug::_Error_formatter::_M_get_max_length): Remove.
+       * src/c++11/debug.cc: Adapt.
+       * config/abi/pre/gnu-versioned-namespace.ver: Adapt.
+
 2017-05-11  Jonathan Wakely  <jwakely@redhat.com>
 
        * doc/xml/manual/allocator.xml: Fix ViewCVS URLs.

diff --git a/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver b/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver
index 172181092c6f90889e0923e07ebb326f5525d348..866afb697d9729169033da5bcb2711023c720eea 100644 (file)
--- a/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver
+++ b/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver
@@ -137,11 +137,7 @@ GLIBCXX_8.0 {
     _ZNK11__gnu_debug19_Safe_iterator_base14_M_can_compareERKS0_;
 
     _ZNK11__gnu_debug16_Error_formatter10_M_message*;
-    _ZNK11__gnu_debug16_Error_formatter10_Parameter*;
-    _ZNK11__gnu_debug16_Error_formatter13_M_print_word*;
-    _ZNK11__gnu_debug16_Error_formatter15_M_print_string*;
     _ZNK11__gnu_debug16_Error_formatter8_M_error*;
-    _ZNK11__gnu_debug16_Error_formatter17_M_get_max_lengthEv;
 
     # __gnu_debug::_Safe_unordered_container_base
     # __gnu_debug::_Safe_local_iterator_base
@@ -150,7 +146,6 @@ GLIBCXX_8.0 {
     _ZN11__gnu_debug25_Safe_local_iterator_base9_M_attachEPNS_19_Safe_sequence_baseEb;
     _ZN11__gnu_debug25_Safe_local_iterator_base9_M_detachEv;
 
-
     # parallel mode
     _ZN14__gnu_parallel9_Settings3getEv;
     _ZN14__gnu_parallel9_Settings3setERS0_;

diff --git a/libstdc++-v3/include/debug/formatter.h b/libstdc++-v3/include/debug/formatter.h
index 985e3597d90c8f4964dd5ea05d1aae0bd373e459..88e59933ca3dbab3b21346d8119f527c783f02a5 100644 (file)
--- a/libstdc++-v3/include/debug/formatter.h
+++ b/libstdc++-v3/include/debug/formatter.h
@@ -373,6 +373,7 @@ namespace __gnu_debug
          _M_variant._M_instance._M_type = _GLIBCXX_TYPEID(_Type);
        }
 
+#if !_GLIBCXX_INLINE_VERSION
       void
       _M_print_field(const _Error_formatter* __formatter,
                     const char* __name) const _GLIBCXX_DEPRECATED;
@@ -380,6 +381,7 @@ namespace __gnu_debug
       void
       _M_print_description(const _Error_formatter* __formatter)
        const _GLIBCXX_DEPRECATED;
+#endif
     };
 
     template<typename _Iterator>
@@ -451,6 +453,7 @@ namespace __gnu_debug
     _GLIBCXX_NORETURN void
     _M_error() const;
 
+#if !_GLIBCXX_INLINE_VERSION
     template<typename _Tp>
       void
       _M_format_word(char*, int, const char*, _Tp)
@@ -461,14 +464,17 @@ namespace __gnu_debug
 
     void
     _M_print_string(const char* __string) const _GLIBCXX_DEPRECATED;
+#endif
 
   private:
     _Error_formatter(const char* __file, unsigned int __line)
     : _M_file(__file), _M_line(__line), _M_num_parameters(0), _M_text(0)
     { }
 
+#if !_GLIBCXX_INLINE_VERSION
     void
     _M_get_max_length() const throw () _GLIBCXX_DEPRECATED;
+#endif
 
     enum { __max_parameters = 9 };
 

diff --git a/libstdc++-v3/src/c++11/debug.cc b/libstdc++-v3/src/c++11/debug.cc
index 304ed6b404e756cec7902a4b903dc878fd3c60e6..4e0e3b8481729c122703ce906cbef0a47ac6d2ee 100644 (file)
--- a/libstdc++-v3/src/c++11/debug.cc
+++ b/libstdc++-v3/src/c++11/debug.cc
@@ -1069,6 +1069,7 @@ namespace __gnu_debug
     abort();
   }
 
+#if !_GLIBCXX_INLINE_VERSION
   // Deprecated methods kept for backward compatibility.
   void
   _Error_formatter::_Parameter::_M_print_field(
@@ -1116,4 +1117,6 @@ namespace __gnu_debug
     void
     _Error_formatter::_M_format_word(char*, int, const char*,
                                     const char*) const;
+#endif
+
 } // namespace __gnu_debug