Imported gcc-4.4.3

[msp430-gcc.git] / libstdc++-v3 / config / locale / gnu / messages_members.h

diff --git a/libstdc++-v3/config/locale/gnu/messages_members.h b/libstdc++-v3/config/locale/gnu/messages_members.h
index d98d8d11fff141c050a737f7840e277ac127d16b..8773562b0c45c6e2484fa3c5c6834997178cfa21 100644 (file)
--- a/libstdc++-v3/config/locale/gnu/messages_members.h
+++ b/libstdc++-v3/config/locale/gnu/messages_members.h
@@ -1,11 +1,12 @@
 // std::messages implementation details, GNU version -*- C++ -*-
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009
+// 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,
@@ -13,19 +14,19 @@
 // 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// 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/>.
+
+/** @file messages_members.h
+ *  This is an internal header file, included by other library headers.
+ *  You should not attempt to use it directly.
+ */
 
 //
 // ISO C++ 14882: 22.2.7.1.2  messages functions
@@ -33,27 +34,34 @@
 
 // Written by Benjamin Kosnik <bkoz@redhat.com>
 
+#include <libintl.h>
+
+_GLIBCXX_BEGIN_NAMESPACE(std)
+
   // Non-virtual member functions.
   template<typename _CharT>
      messages<_CharT>::messages(size_t __refs)
-     : locale::facet(__refs)
-     {  
-#if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2))
-       _M_name_messages = _S_c_name;
-#endif
-       _M_c_locale_messages = _S_c_locale; 
-     }
+     : facet(__refs), _M_c_locale_messages(_S_get_c_locale()), 
+       _M_name_messages(_S_get_c_name())
+     { }
 
   template<typename _CharT>
-     messages<_CharT>::messages(__c_locale __cloc, 
-                               const char* __s, size_t __refs) 
-     : locale::facet(__refs)
+     messages<_CharT>::messages(__c_locale __cloc, const char* __s, 
+                               size_t __refs) 
+     : facet(__refs), _M_c_locale_messages(NULL), _M_name_messages(NULL)
      {
-#if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)) 
-       _M_name_messages = new char[strlen(__s) + 1];
-       strcpy(_M_name_messages, __s);
-#endif
-       _M_c_locale_messages = _S_clone_c_locale(__cloc); 
+       if (__builtin_strcmp(__s, _S_get_c_name()) != 0)
+        {
+          const size_t __len = __builtin_strlen(__s) + 1;
+          char* __tmp = new char[__len];
+          __builtin_memcpy(__tmp, __s, __len);
+          _M_name_messages = __tmp;
+        }
+       else
+        _M_name_messages = _S_get_c_name();
+
+       // Last to avoid leaking memory if new throws.
+       _M_c_locale_messages = _S_clone_c_locale(__cloc);
      }
 
   template<typename _CharT>
@@ -69,10 +77,8 @@
   template<typename _CharT>
     messages<_CharT>::~messages()
     { 
-#if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2))
-      if (_S_c_name != _M_name_messages)
+      if (_M_name_messages != _S_get_c_name())
        delete [] _M_name_messages;
-#endif
       _S_destroy_c_locale(_M_c_locale_messages); 
     }
 
@@ -97,12 +103,26 @@
      messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs)
      : messages<_CharT>(__refs) 
      { 
-#if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2))
-       if (_S_c_name != _M_name_messages)
-        delete [] _M_name_messages;
-       _M_name_messages = new char[strlen(__s) + 1];
-       strcpy(_M_name_messages, __s);
-#endif
-       _S_destroy_c_locale(_M_c_locale_messages);
-       _S_create_c_locale(_M_c_locale_messages, __s); 
+       if (this->_M_name_messages != locale::facet::_S_get_c_name())
+        {
+          delete [] this->_M_name_messages;
+          if (__builtin_strcmp(__s, locale::facet::_S_get_c_name()) != 0)
+            {
+              const size_t __len = __builtin_strlen(__s) + 1;
+              char* __tmp = new char[__len];
+              __builtin_memcpy(__tmp, __s, __len);
+              this->_M_name_messages = __tmp;
+            }
+          else
+            this->_M_name_messages = locale::facet::_S_get_c_name();
+        }
+
+       if (__builtin_strcmp(__s, "C") != 0
+          && __builtin_strcmp(__s, "POSIX") != 0)
+        {
+          this->_S_destroy_c_locale(this->_M_c_locale_messages);
+          this->_S_create_c_locale(this->_M_c_locale_messages, __s); 
+        }
      }
+
+_GLIBCXX_END_NAMESPACE