diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/src/globals_io.cc | 7 | ||||
| -rw-r--r-- | libstdc++-v3/src/globals_locale.cc | 6 | ||||
| -rw-r--r-- | libstdc++-v3/src/ios_init.cc | 8 | ||||
| -rw-r--r-- | libstdc++-v3/src/locale_init.cc | 8 |
5 files changed, 23 insertions, 13 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 64ea1fff58f..3742dcb8786 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2004-01-28 Benjamin Kosnik <bkoz@redhat.com> + + * src/globals_io.cc: Change to __gnu_internal namespace. + * src/globals_locale.cc: Same. + * src/locale_init.cc: Same. + * src/ios_init.cc: Same. + 2004-01-28 Stefan Olsson <stefan@snon.net> * include/ext/mt_allocator.h: Replaced all malloc() calls with diff --git a/libstdc++-v3/src/globals_io.cc b/libstdc++-v3/src/globals_io.cc index 7be53f2f30d..bf70f47c6e6 100644 --- a/libstdc++-v3/src/globals_io.cc +++ b/libstdc++-v3/src/globals_io.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -74,9 +74,10 @@ namespace std #endif } // namespace std -namespace __gnu_cxx +namespace __gnu_internal { using namespace std; + using namespace __gnu_cxx; // We use different stream buffer types depending on whether // ios_base::sync_with_stdio(false) has been called. @@ -125,4 +126,4 @@ namespace __gnu_cxx _GLIBCXX_mutex_address_init () { __GTHREAD_MUTEX_INIT_FUNCTION (_GLIBCXX_mutex_address); } #endif -} // namespace __gnu_cxx +} // namespace __gnu_internal diff --git a/libstdc++-v3/src/globals_locale.cc b/libstdc++-v3/src/globals_locale.cc index c79a379ff1a..7e370280277 100644 --- a/libstdc++-v3/src/globals_locale.cc +++ b/libstdc++-v3/src/globals_locale.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -43,7 +43,7 @@ // In macro form: // _GLIBCXX_ASM_SYMVER(currentname, oldname, GLIBCXX_3.2) -namespace __gnu_cxx +namespace __gnu_internal { using namespace std; @@ -207,4 +207,4 @@ namespace __gnu_cxx __attribute__ ((aligned(__alignof__(std::__timepunct_cache<wchar_t>)))); fake_time_cache_w timepunct_cache_w; #endif -} // namespace __gnu_cxx +} // namespace __gnu_internal diff --git a/libstdc++-v3/src/ios_init.cc b/libstdc++-v3/src/ios_init.cc index b40202553e5..f6ba9183ac2 100644 --- a/libstdc++-v3/src/ios_init.cc +++ b/libstdc++-v3/src/ios_init.cc @@ -40,8 +40,10 @@ #include <ext/stdio_filebuf.h> #include <ext/stdio_sync_filebuf.h> -namespace __gnu_cxx +namespace __gnu_internal { + using namespace __gnu_cxx; + // Extern declarations for global objects in src/globals.cc. extern stdio_sync_filebuf<char> buf_cout_sync; extern stdio_sync_filebuf<char> buf_cin_sync; @@ -60,11 +62,11 @@ namespace __gnu_cxx extern stdio_filebuf<wchar_t> buf_wcin; extern stdio_filebuf<wchar_t> buf_wcerr; #endif -} // namespace __gnu_cxx +} // namespace __gnu_internal namespace std { - using namespace __gnu_cxx; + using namespace __gnu_internal; extern istream cin; extern ostream cout; diff --git a/libstdc++-v3/src/locale_init.cc b/libstdc++-v3/src/locale_init.cc index 2eb45c85e4c..a00366bb066 100644 --- a/libstdc++-v3/src/locale_init.cc +++ b/libstdc++-v3/src/locale_init.cc @@ -1,4 +1,4 @@ -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -35,7 +35,7 @@ #include <bits/atomicity.h> #include <bits/concurrence.h> -namespace __gnu_cxx +namespace __gnu_internal { // Defined in globals.cc. extern std::locale c_locale; @@ -88,11 +88,11 @@ namespace __gnu_cxx extern std::__moneypunct_cache<wchar_t> moneypunct_cache_wt; extern std::__timepunct_cache<wchar_t> timepunct_cache_w; #endif -} // namespace __gnu_cxx +} // namespace __gnu_internal namespace std { - using namespace __gnu_cxx; + using namespace __gnu_internal; locale::locale() throw() { |