diff options
Diffstat (limited to 'libstdc++-v3/src')
| -rw-r--r-- | libstdc++-v3/src/compatibility.cc | 77 | ||||
| -rw-r--r-- | libstdc++-v3/src/debug.cc | 5 | ||||
| -rw-r--r-- | libstdc++-v3/src/debug_list.cc | 3 |
3 files changed, 5 insertions, 80 deletions
diff --git a/libstdc++-v3/src/compatibility.cc b/libstdc++-v3/src/compatibility.cc index 3353ba4..f88fbc7 100644 --- a/libstdc++-v3/src/compatibility.cc +++ b/libstdc++-v3/src/compatibility.cc @@ -44,7 +44,6 @@ #define ignore ignoreXX #define eq eqXX #define _List_node_base _List_node_baseXX -#define __gnu_debug __gnu_debugXX #endif #include <string> @@ -368,30 +367,15 @@ _GLIBCXX_END_NAMESPACE #include <bits/compatibility.h> #undef _GLIBCXX_APPLY_SYMVER + /* gcc-3.4.0 _ZN10__gnu_norm15_List_node_base4hookEPS0_; _ZN10__gnu_norm15_List_node_base4swapERS0_S1_; _ZN10__gnu_norm15_List_node_base6unhookEv; _ZN10__gnu_norm15_List_node_base7reverseEv; _ZN10__gnu_norm15_List_node_base8transferEPS0_S1_; -_ZN11__gnu_debug19_Safe_iterator_base9_M_attachEPNS_19_Safe_sequence_baseEb; -_ZN11__gnu_debug19_Safe_iterator_base9_M_detachEv; -_ZNK11__gnu_debug19_Safe_iterator_base11_M_singularEv; -_ZNK11__gnu_debug19_Safe_iterator_base14_M_can_compareERKS0_; -_ZN11__gnu_debug19_Safe_sequence_base13_M_detach_allEv; -_ZN11__gnu_debug19_Safe_sequence_base18_M_detach_singularEv; -_ZN11__gnu_debug19_Safe_sequence_base22_M_revalidate_singularEv; -_ZN11__gnu_debug19_Safe_sequence_base7_M_swapERS0_; -_ZNK11__gnu_debug16_Error_formatter8_M_errorEv; -_ZNK11__gnu_debug16_Error_formatter10_M_messageENS_13_Debug_msg_idE; -_ZNK11__gnu_debug16_Error_formatter10_Parameter14_M_print_fieldEPKS0_PKc; -_ZNK11__gnu_debug16_Error_formatter10_Parameter20_M_print_descriptionEPKS0_; -_ZNK11__gnu_debug16_Error_formatter13_M_print_wordEPKc; -_ZNK11__gnu_debug16_Error_formatter15_M_print_stringEPKc; */ -#include "debug_list.cc" -#include "debug.cc" - +#include "list.cc" _GLIBCXX_ASM_SYMVER(_ZNSt17_List_node_baseXX4hookEPS_, \ _ZN10__gnu_norm15_List_node_base4hookEPS0_, \ GLIBCXX_3.4) @@ -411,62 +395,7 @@ GLIBCXX_3.4) _GLIBCXX_ASM_SYMVER(_ZNSt17_List_node_baseXX8transferEPS_S0_, \ _ZN10__gnu_norm15_List_node_base8transferEPS0_S1_, \ GLIBCXX_3.4) - -_GLIBCXX_ASM_SYMVER(_ZNSt13__gnu_debugXX19_Safe_iterator_base9_M_attachEPNS_19_Safe_sequence_baseEb, \ -_ZN11__gnu_debug19_Safe_iterator_base9_M_attachEPNS_19_Safe_sequence_baseEb, \ - GLIBCXX_3.4) - -_GLIBCXX_ASM_SYMVER(_ZNSt13__gnu_debugXX19_Safe_iterator_base9_M_detachEv, \ -_ZN11__gnu_debug19_Safe_iterator_base9_M_detachEv, \ -GLIBCXX_3.4) - -_GLIBCXX_ASM_SYMVER(_ZNKSt13__gnu_debugXX19_Safe_iterator_base11_M_singularEv,\ -_ZNK11__gnu_debug19_Safe_iterator_base11_M_singularEv, \ -GLIBCXX_3.4) - -_GLIBCXX_ASM_SYMVER(_ZNKSt13__gnu_debugXX19_Safe_iterator_base14_M_can_compareERKS0_, \ -_ZNK11__gnu_debug19_Safe_iterator_base14_M_can_compareERKS0_, \ -GLIBCXX_3.4) - -_GLIBCXX_ASM_SYMVER(_ZNSt13__gnu_debugXX19_Safe_sequence_base13_M_detach_allEv, \ -_ZN11__gnu_debug19_Safe_sequence_base13_M_detach_allEv, \ -GLIBCXX_3.4) - -_GLIBCXX_ASM_SYMVER(_ZNSt13__gnu_debugXX19_Safe_sequence_base18_M_detach_singularEv, \ -_ZN11__gnu_debug19_Safe_sequence_base18_M_detach_singularEv, \ -GLIBCXX_3.4) - -_GLIBCXX_ASM_SYMVER(_ZNSt13__gnu_debugXX19_Safe_sequence_base22_M_revalidate_singularEv, \ -_ZN11__gnu_debug19_Safe_sequence_base22_M_revalidate_singularEv, \ -GLIBCXX_3.4) - -_GLIBCXX_ASM_SYMVER(_ZNSt13__gnu_debugXX19_Safe_sequence_base7_M_swapERS0_, \ -_ZN11__gnu_debug19_Safe_sequence_base7_M_swapERS0_, \ -GLIBCXX_3.4) - -_GLIBCXX_ASM_SYMVER(_ZNKSt13__gnu_debugXX16_Error_formatter8_M_errorEv, \ -_ZNK11__gnu_debug16_Error_formatter8_M_errorEv, \ -GLIBCXX_3.4) - -_GLIBCXX_ASM_SYMVER(_ZNKSt13__gnu_debugXX16_Error_formatter10_M_messageENS_13_Debug_msg_idE, \ -_ZNK11__gnu_debug16_Error_formatter10_M_messageENS_13_Debug_msg_idE, \ -GLIBCXX_3.4) - -_GLIBCXX_ASM_SYMVER(_ZNKSt13__gnu_debugXX16_Error_formatter10_Parameter14_M_print_fieldEPKS0_PKc, \ -_ZNK11__gnu_debug16_Error_formatter10_Parameter14_M_print_fieldEPKS0_PKc, \ -GLIBCXX_3.4) - -_GLIBCXX_ASM_SYMVER(_ZNKSt13__gnu_debugXX16_Error_formatter10_Parameter20_M_print_descriptionEPKS0_, \ -_ZNK11__gnu_debug16_Error_formatter10_Parameter20_M_print_descriptionEPKS0_, \ -GLIBCXX_3.4) - -_GLIBCXX_ASM_SYMVER(_ZNKSt13__gnu_debugXX16_Error_formatter13_M_print_wordEPKc, \ -_ZNK11__gnu_debug16_Error_formatter13_M_print_wordEPKc, \ -GLIBCXX_3.4) - -_GLIBCXX_ASM_SYMVER(_ZNKSt13__gnu_debugXX16_Error_formatter15_M_print_stringEPKc, \ -_ZNK11__gnu_debug16_Error_formatter15_M_print_stringEPKc, \ -GLIBCXX_3.4) +#undef _List_node_base // gcc-4.1.0 #ifdef _GLIBCXX_LONG_DOUBLE_COMPAT diff --git a/libstdc++-v3/src/debug.cc b/libstdc++-v3/src/debug.cc index 9dc73ae..8505f1e 100644 --- a/libstdc++-v3/src/debug.cc +++ b/libstdc++-v3/src/debug.cc @@ -1,6 +1,6 @@ // Debugging mode support code -*- C++ -*- -// Copyright (C) 2003, 2004, 2005 +// Copyright (C) 2003, 2004, 2005, 2006 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -44,8 +44,6 @@ namespace __gnu_internal static __glibcxx_mutex_define_initialized(iterator_base_mutex); } // namespace __gnu_internal -namespace std -{ namespace __gnu_debug { const char* _S_debug_messages[] = @@ -670,4 +668,3 @@ namespace __gnu_debug _Error_formatter::_M_format_word(char*, int, const char*, const char*) const; } // namespace __gnu_debug -} // namespace std diff --git a/libstdc++-v3/src/debug_list.cc b/libstdc++-v3/src/debug_list.cc index 5bd0c66..cec2c38 100644 --- a/libstdc++-v3/src/debug_list.cc +++ b/libstdc++-v3/src/debug_list.cc @@ -29,6 +29,5 @@ #define _GLIBCXX_DEBUG -#include <bits/c++config.h> - #include "list.cc" + |