* parser.c (cp_parser_class_specifier): Set class location to that

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

diff --git a/libstdc++-v3/src/locale_facets.cc b/libstdc++-v3/src/locale_facets.cc
index 8876f58..77686c6 100644 (file)
--- a/libstdc++-v3/src/locale_facets.cc
+++ b/libstdc++-v3/src/locale_facets.cc
@@ -1,11 +1,11 @@
 // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-// 2006, 2006
+// 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,
@@ -13,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 <locale>
 
@@ -63,7 +58,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   // According to the resolution of DR 231, about 22.2.2.2.2, p11,
   // "str.precision() is specified in the conversion specification".
   void
-  __num_base::_S_format_float(const ios_base& __io, char* __fptr, char __mod)
+  __num_base::_S_format_float(const ios_base& __io, char* __fptr, 
+                             char __mod) throw()
   {
     ios_base::fmtflags __flags = __io.flags();
     *__fptr++ = '%';
@@ -93,7 +89,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 
   bool
   __verify_grouping(const char* __grouping, size_t __grouping_size,
-                   const string& __grouping_tmp)
+                   const string& __grouping_tmp) throw()
   {
     const size_t __n = __grouping_tmp.size() - 1;
     const size_t __min = std::min(__n, size_t(__grouping_size - 1));
@@ -110,7 +106,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     // ... but the first parsed grouping can be <= numpunct
     // grouping (only do the check if the numpunct char is > 0
     // because <= 0 means any size is ok).
-    if (static_cast<signed char>(__grouping[__min]) > 0)
+    if (static_cast<signed char>(__grouping[__min]) > 0
+       && __grouping[__min] != __gnu_cxx::__numeric_traits<char>::__max)
       __test &= __grouping_tmp[0] <= __grouping[__min];
     return __test;
   }