2011-11-18 Paolo Carlini <paolo.carlini@oracle.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / src / localename.cc

diff --git a/libstdc++-v3/src/localename.cc b/libstdc++-v3/src/localename.cc
index 98f6020..52e2282 100644 (file)
--- a/libstdc++-v3/src/localename.cc
+++ b/libstdc++-v3/src/localename.cc
@@ -1,5 +1,5 @@
 // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-// 2006, 2007, 2008, 2009
+// 2006, 2007, 2008, 2009, 2010
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -27,7 +27,9 @@
 #include <cstdlib>
 #include <locale>
 
-_GLIBCXX_BEGIN_NAMESPACE(std)
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   using namespace __gnu_cxx;
 
@@ -137,7 +139,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
          }
       }
     else
-      __throw_runtime_error(__N("locale::locale NULL not valid"));
+      __throw_runtime_error(__N("locale::locale null not valid"));
   }
 
   locale::locale(const locale& __base, const char* __s, category __cat)
@@ -163,7 +165,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 
     __try 
       { _M_impl->_M_replace_categories(__add._M_impl, __cat); }
-    __catch (...) 
+    __catch(...) 
       { 
        _M_impl->_M_remove_reference(); 
        __throw_exception_again;
@@ -348,4 +350,5 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       }
   }
 
-_GLIBCXX_END_NAMESPACE
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace