PR 43839

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

diff --git a/libstdc++-v3/src/locale.cc b/libstdc++-v3/src/locale.cc
index 22d8ab0..937e99c 100644 (file)
--- a/libstdc++-v3/src/locale.cc
+++ b/libstdc++-v3/src/locale.cc
@@ -1,10 +1,11 @@
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+// 2006, 2007, 2008, 2009, 2010
 // 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
 // terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
+// Free Software Foundation; either version 3, or (at your option)
 // any later version.
 
 // This library is distributed in the hope that it will be useful,
@@ -12,19 +13,14 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
 
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
 
 #include <clocale>
 #include <cstring>
@@ -32,14 +28,17 @@
 #include <cctype>
 #include <cwctype>     // For towupper, etc.
 #include <locale>
-#include <bits/atomicity.h>
-#include <bits/concurrence.h>
+#include <ext/concurrence.h>
 
-namespace __gnu_internal
+namespace
 {
-  // Mutex object for cache access
-  static __glibcxx_mutex_define_initialized(locale_cache_mutex);
-}
+  __gnu_cxx::__mutex&
+  get_locale_cache_mutex()
+  {
+    static __gnu_cxx::__mutex locale_cache_mutex;
+    return locale_cache_mutex;
+  }
+} // anonymous namespace
 
 // XXX GLIBCXX_ABI Deprecated
 #ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
@@ -148,7 +147,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   locale::_S_normalize_category(category __cat) 
   {
     int __ret = 0;
-    if (__cat == none || (__cat & all) && !(__cat & ~all))
+    if (__cat == none || ((__cat & all) && !(__cat & ~all)))
       __ret = __cat;
     else
       {
@@ -218,7 +217,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   }
 
   const char*
-  locale::facet::_S_get_c_name()
+  locale::facet::_S_get_c_name() throw()
   { return _S_c_name; }
 
   locale::facet::
@@ -252,7 +251,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   : _M_refcount(__refs), _M_facets(0), _M_facets_size(__imp._M_facets_size),
   _M_caches(0), _M_names(0)
   {
-    try
+    __try
       {
        _M_facets = new const facet*[_M_facets_size];
        for (size_t __i = 0; __i < _M_facets_size; ++__i)
@@ -281,7 +280,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
            std::memcpy(_M_names[__l], __imp._M_names[__l], __len);
          }
       }
-    catch(...)
+    __catch(...)
       {
        this->~_Impl();
        __throw_exception_again;
@@ -333,11 +332,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
            // New cache array.
            const facet** __oldc = _M_caches;
            const facet** __newc;
-           try
+           __try
              {
                __newc = new const facet*[__new_size];
              }
-           catch(...)
+           __catch(...)
              {
                delete [] __newf;
                __throw_exception_again;
@@ -391,7 +390,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   locale::_Impl::
   _M_install_cache(const facet* __cache, size_t __index)
   {
-    __gnu_cxx::lock sentry(__gnu_internal::locale_cache_mutex);
+    __gnu_cxx::__scoped_lock sentry(get_locale_cache_mutex());
     if (_M_caches[__index] != 0)
       {
        // Some other thread got in first.
@@ -409,7 +408,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   _Atomic_word locale::id::_S_refcount;  // init'd to 0 by linker
 
   size_t
-  locale::id::_M_id() const
+  locale::id::_M_id() const throw()
   {
     if (!_M_index)
       {