Licensing changes to GPLv3 resp. GPLv3 with GCC Runtime Exception.

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / config / os / gnu-linux / ctype_base.h

diff --git a/libstdc++-v3/config/os/gnu-linux/ctype_base.h b/libstdc++-v3/config/os/gnu-linux/ctype_base.h
index 50a5f79..ff1f157 100644 (file)
--- a/libstdc++-v3/config/os/gnu-linux/ctype_base.h
+++ b/libstdc++-v3/config/os/gnu-linux/ctype_base.h
@@ -1,11 +1,12 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+// Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, 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,40 +14,29 @@
 // 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/>.
 
 //
 // ISO C++ 14882: 22.1  Locales
 //
   
+/** @file ctype_base.h
+ *  This is an internal header file, included by other library headers.
+ *  You should not attempt to use it directly.
+ */
+
 // Information as gleaned from /usr/include/ctype.h
   
-#if _GLIBCPP_USE_SHADOW_HEADERS
-  using _C_legacy::_ISspace;
-  using _C_legacy::_ISprint;
-  using _C_legacy::_IScntrl;
-  using _C_legacy::_ISupper;
-  using _C_legacy::_ISlower;
-  using _C_legacy::_ISalpha;
-  using _C_legacy::_ISdigit;
-  using _C_legacy::_ISpunct;
-  using _C_legacy::_ISxdigit;
-  using _C_legacy::_ISalnum;
-  using _C_legacy::_ISgraph;
-#endif
+_GLIBCXX_BEGIN_NAMESPACE(std)
 
+  /// @brief  Base class for ctype.
   struct ctype_base
   {
     // Non-standard typedefs.
@@ -62,8 +52,10 @@
     static const mask xdigit   = _ISxdigit;
     static const mask space    = _ISspace;
     static const mask print    = _ISprint;
-    static const mask graph    = _ISgraph;
+    static const mask graph    = _ISalpha | _ISdigit | _ISpunct;
     static const mask cntrl    = _IScntrl;
     static const mask punct    = _ISpunct;
-    static const mask alnum    = _ISalnum;
+    static const mask alnum    = _ISalpha | _ISdigit;
   };
+
+_GLIBCXX_END_NAMESPACE