]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
re PR libstdc++/48382 (ctype_noninline.h should not be installed)
authorPaolo Carlini <paolo.carlini@oracle.com>
Thu, 31 Mar 2011 16:06:12 +0000 (16:06 +0000)
committerPaolo Carlini <paolo@gcc.gnu.org>
Thu, 31 Mar 2011 16:06:12 +0000 (16:06 +0000)
2011-03-31  Paolo Carlini  <paolo.carlini@oracle.com>

PR libstdc++/48382
* src/ctype.cc: Do not include <bits/ctype_noninline.h>.
* src/Makefile.am: Add ctype_configure_char.cc to host_sources.
* src/Makefile.in: Regenerate.
* include/Makefile.am: Remove ctype_noninline.h from host_headers.
* include/Makefile.in: Regenerate.
* doc/xml/manual/internals.xml: Update.
* config/os/newlib/ctype_noninline.h: Fixup and rename to...
* config/os/newlib/ctype_configure_char.cc: ... this.
* config/os/aix/ctype_noninline.h: Likewise.
* config/os/aix/ctype_configure_char.cc: Likewise.
* config/os/vxworks/ctype_noninline.h: Likewise.
* config/os/vxworks/ctype_configure_char.cc
* config/os/hpux/ctype_noninline.h: Likewise.
* config/os/hpux/ctype_configure_char.cc: Likewise.
* config/os/gnu-linux/ctype_noninline.h: Likewise.
* config/os/gnu-linux/ctype_configure_char.cc: Likewise.
* config/os/mingw32/ctype_noninline.h: Likewise.
* config/os/mingw32/ctype_configure_char.cc: Likewise.
* config/os/tpf/ctype_noninline.h: Likewise.
* config/os/tpf/ctype_configure_char.cc: Likewise.
* config/os/uclibc/ctype_noninline.h: Likewise.
* config/os/uclibc/ctype_configure_char.cc: Likewise.
* config/os/bionic/ctype_noninline.h: Likewise.
* config/os/bionic/ctype_configure_char.cc: Likewise.
* config/os/djgpp/ctype_noninline.h: Likewise.
* config/os/djgpp/ctype_configure_char.cc: Likewise.
* config/os/qnx/qnx6.1/ctype_noninline.h: Likewise.
* config/os/qnx/qnx6.1/ctype_configure_char.cc: Likewise.
* config/os/bsd/netbsd/ctype_noninline.h: Likewise.
* config/os/bsd/netbsd/ctype_configure_char.cc: Likewise.
* config/os/bsd/darwin/ctype_noninline.h: Likewise.
* config/os/bsd/darwin/ctype_configure_char.cc: Likewise.
* config/os/bsd/freebsd/ctype_noninline.h: Likewise.
* config/os/bsd/freebsd/ctype_configure_char.cc: Likewise.
* config/os/irix/irix6.5/ctype_noninline.h: Likewise.
* config/os/irix/irix6.5/ctype_configure_char.cc: Likewise.
* config/os/generic/ctype_noninline.h: Likewise.
* config/os/generic/ctype_configure_char.cc: Likewise.
* config/os/solaris/solaris2.7/ctype_noninline.h: Likewise.
* config/os/solaris/solaris2.7/ctype_configure_char.cc: Likewise.

From-SVN: r171790

24 files changed:
libstdc++-v3/ChangeLog
libstdc++-v3/config/os/aix/ctype_configure_char.cc [moved from libstdc++-v3/config/os/aix/ctype_noninline.h with 89% similarity]
libstdc++-v3/config/os/bionic/ctype_configure_char.cc [moved from libstdc++-v3/config/os/bionic/ctype_noninline.h with 90% similarity]
libstdc++-v3/config/os/bsd/darwin/ctype_configure_char.cc [moved from libstdc++-v3/config/os/bsd/darwin/ctype_noninline.h with 90% similarity]
libstdc++-v3/config/os/bsd/freebsd/ctype_configure_char.cc [moved from libstdc++-v3/config/os/bsd/freebsd/ctype_noninline.h with 90% similarity]
libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc [moved from libstdc++-v3/config/os/bsd/netbsd/ctype_noninline.h with 90% similarity]
libstdc++-v3/config/os/djgpp/ctype_configure_char.cc [moved from libstdc++-v3/config/os/djgpp/ctype_noninline.h with 90% similarity]
libstdc++-v3/config/os/generic/ctype_configure_char.cc [moved from libstdc++-v3/config/os/generic/ctype_noninline.h with 90% similarity]
libstdc++-v3/config/os/gnu-linux/ctype_configure_char.cc [moved from libstdc++-v3/config/os/gnu-linux/ctype_noninline.h with 94% similarity]
libstdc++-v3/config/os/hpux/ctype_configure_char.cc [moved from libstdc++-v3/config/os/hpux/ctype_noninline.h with 90% similarity]
libstdc++-v3/config/os/irix/irix6.5/ctype_configure_char.cc [moved from libstdc++-v3/config/os/irix/irix6.5/ctype_noninline.h with 90% similarity]
libstdc++-v3/config/os/mingw32/ctype_configure_char.cc [moved from libstdc++-v3/config/os/mingw32/ctype_noninline.h with 95% similarity]
libstdc++-v3/config/os/newlib/ctype_configure_char.cc [moved from libstdc++-v3/config/os/newlib/ctype_noninline.h with 90% similarity]
libstdc++-v3/config/os/qnx/qnx6.1/ctype_configure_char.cc [moved from libstdc++-v3/config/os/qnx/qnx6.1/ctype_noninline.h with 89% similarity]
libstdc++-v3/config/os/solaris/solaris2.7/ctype_configure_char.cc [moved from libstdc++-v3/config/os/solaris/solaris2.7/ctype_noninline.h with 90% similarity]
libstdc++-v3/config/os/tpf/ctype_configure_char.cc [moved from libstdc++-v3/config/os/tpf/ctype_noninline.h with 92% similarity]
libstdc++-v3/config/os/uclibc/ctype_configure_char.cc [moved from libstdc++-v3/config/os/uclibc/ctype_noninline.h with 90% similarity]
libstdc++-v3/config/os/vxworks/ctype_configure_char.cc [moved from libstdc++-v3/config/os/vxworks/ctype_noninline.h with 89% similarity]
libstdc++-v3/doc/xml/manual/internals.xml
libstdc++-v3/include/Makefile.am
libstdc++-v3/include/Makefile.in
libstdc++-v3/src/Makefile.am
libstdc++-v3/src/Makefile.in
libstdc++-v3/src/ctype.cc

index e7cfb3240f7e1dd146cd418f41c89ca270ffc9d1..26834e5f92834c912d41fea78781a9fa80fb5c1d 100644 (file)
@@ -1,3 +1,47 @@
+2011-03-31  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR libstdc++/48382
+       * src/ctype.cc: Do not include <bits/ctype_noninline.h>.
+       * src/Makefile.am: Add ctype_configure_char.cc to host_sources.
+       * src/Makefile.in: Regenerate.
+       * include/Makefile.am: Remove ctype_noninline.h from host_headers.
+       * include/Makefile.in: Regenerate.
+       * doc/xml/manual/internals.xml: Update.
+       * config/os/newlib/ctype_noninline.h: Fixup and rename to...
+       * config/os/newlib/ctype_configure_char.cc: ... this.
+       * config/os/aix/ctype_noninline.h: Likewise.
+       * config/os/aix/ctype_configure_char.cc: Likewise.
+       * config/os/vxworks/ctype_noninline.h: Likewise.
+       * config/os/vxworks/ctype_configure_char.cc
+       * config/os/hpux/ctype_noninline.h: Likewise.
+       * config/os/hpux/ctype_configure_char.cc: Likewise.
+       * config/os/gnu-linux/ctype_noninline.h: Likewise.
+       * config/os/gnu-linux/ctype_configure_char.cc: Likewise.
+       * config/os/mingw32/ctype_noninline.h: Likewise.
+       * config/os/mingw32/ctype_configure_char.cc: Likewise.
+       * config/os/tpf/ctype_noninline.h: Likewise.
+       * config/os/tpf/ctype_configure_char.cc: Likewise.
+       * config/os/uclibc/ctype_noninline.h: Likewise.
+       * config/os/uclibc/ctype_configure_char.cc: Likewise.
+       * config/os/bionic/ctype_noninline.h: Likewise.
+       * config/os/bionic/ctype_configure_char.cc: Likewise.
+       * config/os/djgpp/ctype_noninline.h: Likewise.
+       * config/os/djgpp/ctype_configure_char.cc: Likewise.
+       * config/os/qnx/qnx6.1/ctype_noninline.h: Likewise.
+       * config/os/qnx/qnx6.1/ctype_configure_char.cc: Likewise.
+       * config/os/bsd/netbsd/ctype_noninline.h: Likewise.
+       * config/os/bsd/netbsd/ctype_configure_char.cc: Likewise.
+       * config/os/bsd/darwin/ctype_noninline.h: Likewise.
+       * config/os/bsd/darwin/ctype_configure_char.cc: Likewise.
+       * config/os/bsd/freebsd/ctype_noninline.h: Likewise.
+       * config/os/bsd/freebsd/ctype_configure_char.cc: Likewise.
+       * config/os/irix/irix6.5/ctype_noninline.h: Likewise.
+       * config/os/irix/irix6.5/ctype_configure_char.cc: Likewise.
+       * config/os/generic/ctype_noninline.h: Likewise.
+       * config/os/generic/ctype_configure_char.cc: Likewise.
+       * config/os/solaris/solaris2.7/ctype_noninline.h: Likewise.
+       * config/os/solaris/solaris2.7/ctype_configure_char.cc: Likewise.
+
 2011-03-25  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
        * testsuite/28_regex/match_results/ctors/char/default.cc: Do not call
similarity index 89%
rename from libstdc++-v3/config/os/aix/ctype_noninline.h
rename to libstdc++-v3/config/os/aix/ctype_configure_char.cc
index 71024bdcb5e8c6620c1678b86230ae4d8691a7eb..d6ca6b5fbcd6f8c615823bdcf5519d9d149dafc5 100644 (file)
@@ -1,6 +1,6 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 2000, 2001, 2002, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2011 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
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file bits/ctype_noninline.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
+/** @file ctype_configure_char.cc */
 
 //
 // ISO C++ 14882: 22.1  Locales
 //
 
+#include <locale>
+#include <cstdlib>
+#include <cstring>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
 // Information as gleaned from /usr/include/ctype.h
 
   const ctype_base::mask*
@@ -89,3 +94,6 @@
       }
     return __high;
   }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
similarity index 90%
rename from libstdc++-v3/config/os/bionic/ctype_noninline.h
rename to libstdc++-v3/config/os/bionic/ctype_configure_char.cc
index 78bc2960800eb8db6010b2c6a68ced1a8c249b22..d5a8fe1631421446c5b993e1dfeb2e508b758fa8 100644 (file)
@@ -1,6 +1,6 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 2010 Free Software Foundation, Inc.
+// Copyright (C) 2011 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
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file bits/ctype_noninline.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
+/** @file ctype_configure_char.cc */
 
 //
 // ISO C++ 14882: 22.1  Locales
 //
 
+#include <locale>
+#include <cstdlib>
+#include <cstring>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
 // Information as gleaned from /usr/include/ctype.h
 
   const ctype_base::mask*
     return __high;
   }
 
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
similarity index 90%
rename from libstdc++-v3/config/os/bsd/darwin/ctype_noninline.h
rename to libstdc++-v3/config/os/bsd/darwin/ctype_configure_char.cc
index e8e22f62836597a2750ffb012e8a07f473fb9317..30cf4ad6a0207926a46ac2da8ebfa360e54122c3 100644 (file)
@@ -1,7 +1,6 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 2000, 2001, 2002, 2009, 2010
-// Free Software Foundation, Inc.
+// Copyright (C) 2011 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
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file bits/ctype_noninline.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
+/** @file ctype_configure_char.cc */
 
 //
 // ISO C++ 14882: 22.1  Locales
 //
-  
+
+#include <locale>
+#include <cstdlib>
+#include <cstring>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
 // Information as gleaned from /usr/include/ctype.h
   
   const ctype_base::mask*
@@ -90,3 +94,6 @@
       }
     return __high;
   }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
similarity index 90%
rename from libstdc++-v3/config/os/bsd/freebsd/ctype_noninline.h
rename to libstdc++-v3/config/os/bsd/freebsd/ctype_configure_char.cc
index e8e22f62836597a2750ffb012e8a07f473fb9317..30cf4ad6a0207926a46ac2da8ebfa360e54122c3 100644 (file)
@@ -1,7 +1,6 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 2000, 2001, 2002, 2009, 2010
-// Free Software Foundation, Inc.
+// Copyright (C) 2011 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
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file bits/ctype_noninline.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
+/** @file ctype_configure_char.cc */
 
 //
 // ISO C++ 14882: 22.1  Locales
 //
-  
+
+#include <locale>
+#include <cstdlib>
+#include <cstring>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
 // Information as gleaned from /usr/include/ctype.h
   
   const ctype_base::mask*
@@ -90,3 +94,6 @@
       }
     return __high;
   }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
similarity index 90%
rename from libstdc++-v3/config/os/bsd/netbsd/ctype_noninline.h
rename to libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc
index 724523f5a8aa5155c8705221ed2e992b27f27ab8..77fe6275693efb7e9ccb60c3bf3a81cf0af461b2 100644 (file)
@@ -1,7 +1,6 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 2000, 2001, 2002, 2003, 2009, 2010
-// Free Software Foundation, Inc.
+// Copyright (C) 2011 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
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file bits/ctype_noninline.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
+/** @file ctype_configure_char.cc */
 
 //
 // ISO C++ 14882: 22.1  Locales
 //
-  
+
+#include <locale>
+#include <cstdlib>
+#include <cstring>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
 // Information as gleaned from /usr/include/ctype.h
 
   extern "C" const u_int8_t _C_ctype_[];
@@ -92,3 +96,6 @@
       }
     return __high;
   }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
similarity index 90%
rename from libstdc++-v3/config/os/djgpp/ctype_noninline.h
rename to libstdc++-v3/config/os/djgpp/ctype_configure_char.cc
index 7b14d38b63d02385a8a9bbd580733d866bde2dcd..f755eb70c4e7b8926c82fcad1d818f847247eb07 100644 (file)
@@ -1,7 +1,6 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009, 2010
-// Free Software Foundation, Inc.
+// Copyright (C) 2011 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
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file bits/ctype_noninline.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
+/** @file ctype_configure_char.cc */
 
 //
 // ISO C++ 14882: 22.1  Locales
 //
 
+#include <locale>
+#include <cstdlib>
+#include <cstring>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
 // Information as gleaned from DJGPP <ctype.h>
 
   const ctype_base::mask*
@@ -90,3 +94,6 @@
       }
     return __high;
   }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
similarity index 90%
rename from libstdc++-v3/config/os/generic/ctype_noninline.h
rename to libstdc++-v3/config/os/generic/ctype_configure_char.cc
index 30045899f76165fccb427be749e6d4f988f2f8f6..0daedf54356b486946e10245c56d7209ee4c7eaa 100644 (file)
@@ -1,7 +1,6 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2009, 2010
-//  Free Software Foundation, Inc.
+// Copyright (C) 2011 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
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file bits/ctype_noninline.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
+/** @file ctype_configure_char.cc */
 
 //
 // ISO C++ 14882: 22.1  Locales
 //
-  
+
+#include <locale>
+#include <cstdlib>
+#include <cstring>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
 // Information as gleaned from /usr/include/ctype.h
 
   const ctype_base::mask*
@@ -90,3 +94,6 @@
       }
     return __high;
   }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
similarity index 94%
rename from libstdc++-v3/config/os/gnu-linux/ctype_noninline.h
rename to libstdc++-v3/config/os/gnu-linux/ctype_configure_char.cc
index 45785d4a5e8535c87df8076adac5a0a0041878f7..5eadeaaace671413915c4ba8b195c376b94c40ca 100644 (file)
@@ -1,8 +1,6 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-// 2006, 2007, 2009, 2010
-// Free Software Foundation, Inc.
+// Copyright (C) 2011 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
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file bits/ctype_noninline.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
+/** @file ctype_configure_char.cc */
 
 //
 // ISO C++ 14882: 22.1  Locales
 //
 
+#include <locale>
+#include <cstdlib>
+#include <cstring>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
 // Information as gleaned from /usr/include/ctype.h
 
 #if _GLIBCXX_C_LOCALE_GNU
       }
     return __high;
   }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
similarity index 90%
rename from libstdc++-v3/config/os/hpux/ctype_noninline.h
rename to libstdc++-v3/config/os/hpux/ctype_configure_char.cc
index 9d178443e29eaef34851aeaeddbe9ebff335da31..4ac958a27970dce78e5ee3c5139b044b52333b3e 100644 (file)
@@ -1,7 +1,6 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2009, 2010
-// Free Software Foundation, Inc.
+// Copyright (C) 2011 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
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file bits/ctype_noninline.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
+/** @file ctype_configure_char.cc */
 
 //
 // ISO C++ 14882: 22.1  Locales
 //
-  
+
+#include <locale>
+#include <cstdlib>
+#include <cstring>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
 // Information as gleaned from /usr/include/ctype.h
 
   const ctype_base::mask*
@@ -90,3 +94,6 @@
       }
     return __high;
   }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
similarity index 90%
rename from libstdc++-v3/config/os/irix/irix6.5/ctype_noninline.h
rename to libstdc++-v3/config/os/irix/irix6.5/ctype_configure_char.cc
index 3f7af67e860bc5a16c4c17200693fbcd045dbf74..aa2481bce02ce521ed705f6daccb8a69b41ea8a7 100644 (file)
@@ -1,7 +1,6 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2001, 2002, 2009, 2010
-// Free Software Foundation, Inc.
+// Copyright (C) 2011 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
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file bits/ctype_noninline.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
+/** @file ctype_configure_char.cc */
 
 //
 // ISO C++ 14882: 22.1  Locales
 //
 
+#include <locale>
+#include <cstdlib>
+#include <cstring>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
 // Information as gleaned from /usr/include/ctype.h
 
   const ctype_base::mask*
@@ -92,3 +96,6 @@
       }
     return __high;
   }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
similarity index 95%
rename from libstdc++-v3/config/os/mingw32/ctype_noninline.h
rename to libstdc++-v3/config/os/mingw32/ctype_configure_char.cc
index 10b1fbc490cde668a9065a3680529a5916c1f713..12184075d776053cfcf5de5ea1a493f4734891d6 100644 (file)
@@ -1,7 +1,6 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2002, 2007, 2009, 2010
-// Free Software Foundation, Inc.
+// Copyright (C) 2011 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
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file bits/ctype_noninline.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
+/** @file ctype_configure_char.cc */
 
 //
 // ISO C++ 14882: 22.1  Locales
 //
 
-// The classic table used in libstdc++ is *not* the C _ctype table
-// used by mscvrt, but is based on the ctype masks defined for libstdc++
-// in ctype_base.h.
+#include <locale>
+#include <cstdlib>
+#include <cstring>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+  // The classic table used in libstdc++ is *not* the C _ctype table
+  // used by mscvrt, but is based on the ctype masks defined for libstdc++
+  // in ctype_base.h.
 
   const ctype_base::mask*
   ctype<char>::classic_table() throw()
       }
     return __high;
   }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
similarity index 90%
rename from libstdc++-v3/config/os/newlib/ctype_noninline.h
rename to libstdc++-v3/config/os/newlib/ctype_configure_char.cc
index 947bce589e6b660fe7dead44226222213ee6a65c..d5a8fe1631421446c5b993e1dfeb2e508b758fa8 100644 (file)
@@ -1,6 +1,6 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 2000, 2001, 2002, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2011 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
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file bits/ctype_noninline.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
+/** @file ctype_configure_char.cc */
 
 //
 // ISO C++ 14882: 22.1  Locales
 //
 
+#include <locale>
+#include <cstdlib>
+#include <cstring>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
 // Information as gleaned from /usr/include/ctype.h
 
   const ctype_base::mask*
       }
     return __high;
   }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
similarity index 89%
rename from libstdc++-v3/config/os/qnx/qnx6.1/ctype_noninline.h
rename to libstdc++-v3/config/os/qnx/qnx6.1/ctype_configure_char.cc
index b74e070594e04a8fa7c95fa4f8745832966da946..b6dd7f43204c8dbc725217f6c8b2a264bed4455a 100644 (file)
@@ -1,6 +1,6 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 2002, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2011 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
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file bits/ctype_noninline.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
+/** @file ctype_configure_char.cc */
 
 //
 // ISO C++ 14882: 22.1  Locales
 //
-  
+
+#include <locale>
+#include <cstdlib>
+#include <cstring>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
 // Information as gleaned from /usr/include/ctype.h
   
   const ctype_base::mask*
@@ -87,3 +92,6 @@
       }
     return __high;
   }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
similarity index 90%
rename from libstdc++-v3/config/os/solaris/solaris2.7/ctype_noninline.h
rename to libstdc++-v3/config/os/solaris/solaris2.7/ctype_configure_char.cc
index 4713c87265b5d83b82ee600b644f8233cc155639..d3519429a015b7edd7bb7b0390c1da659b23b8ef 100644 (file)
@@ -1,7 +1,6 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2009, 2010
-// Free Software Foundation, Inc.
+// Copyright (C) 2011 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
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file bits/ctype_noninline.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
+/** @file ctype_configure_char.cc */
 
 //
 // ISO C++ 14882: 22.1  Locales
 //
-  
+
+#include <locale>
+#include <cstdlib>
+#include <cstring>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
 // Information as gleaned from /usr/include/ctype.h
   
   const ctype_base::mask* 
@@ -90,3 +94,6 @@
       }
     return __high;
   }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
similarity index 92%
rename from libstdc++-v3/config/os/tpf/ctype_noninline.h
rename to libstdc++-v3/config/os/tpf/ctype_configure_char.cc
index 251270344c0ebe2c2d59b81d68e8fc1d5aa15aee..643abd3f72849e4c74d42da5c3f79b59fe03307b 100644 (file)
@@ -1,7 +1,6 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010
-// Free Software Foundation, Inc.
+// Copyright (C) 2011 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
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file bits/ctype_noninline.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
+/** @file ctype_configure_char.cc */
 
 //
 // ISO C++ 14882: 22.1  Locales
 //
-  
+
+#include <locale>
+#include <cstdlib>
+#include <cstring>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
 // Information as gleaned from /usr/include/ctype.h
 
   const ctype_base::mask*
       }
     return __high;
   }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
similarity index 90%
rename from libstdc++-v3/config/os/uclibc/ctype_noninline.h
rename to libstdc++-v3/config/os/uclibc/ctype_configure_char.cc
index 389e76eb86f3f3b50bcf781de9538246e43a6217..245c7991725087dd31926b8a55fb0e7443bced51 100644 (file)
@@ -1,7 +1,6 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2006, 2009, 2010
-// Free Software Foundation, Inc.
+// Copyright (C) 2011 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
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file bits/ctype_noninline.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
+/** @file ctype_configure_char.cc */
 
 //
 // ISO C++ 14882: 22.1  Locales
 //
-  
+
+#include <locale>
+#include <cstdlib>
+#include <cstring>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
 // Information as gleaned from /usr/include/ctype.h
 
   const ctype_base::mask*
@@ -90,3 +94,6 @@
       }
     return __high;
   }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
similarity index 89%
rename from libstdc++-v3/config/os/vxworks/ctype_noninline.h
rename to libstdc++-v3/config/os/vxworks/ctype_configure_char.cc
index 23521b76d0f141720ed2f49349b120f24421ab59..7d2904b782d363f754619a3522ffdbc7cf9adae4 100644 (file)
@@ -1,7 +1,6 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2009, 2010
-// Free Software Foundation, Inc.
+// Copyright (C) 2011 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
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file bits/ctype_noninline.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
+/** @file ctype_configure_char.cc */
 
 //
 // ISO C++ 14882: 22.1  Locales
 //
 
+#include <locale>
+#include <cstdlib>
+#include <cstring>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
 // Information as gleaned from target/h/ctype.h
 
   const ctype_base::mask*
@@ -90,3 +94,6 @@
       }
     return __high;
   }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
index 72af0b835c89be5caaf84fe161b231330c654595..c01735eb4fb8970d052dd928ccd7215df6fbe7bb 100644 (file)
@@ -254,11 +254,8 @@ not have to include <code>&lt;ctype.h&gt;</code> in this header; it will always
 included before <code>ctype_base.h</code> is included.
    </para>
 
-   <para>The next file to write is <code>ctype_noninline.h</code>, which also does
-not require include guards.  This file defines a few member functions
-that will be included in <code>include/bits/locale_facets.h</code>.  The first
-function that must be written is the <code>ctype&lt;char&gt;::ctype</code>
-constructor.  Here is the IRIX example:
+   <para>The next file to write is <code>ctype_configure_char.cc</code>.
+The first function that must be written is the <code>ctype&lt;char&gt;::ctype</code> constructor.  Here is the IRIX example:
    </para>
 
 <programlisting>
index 10ed04c4edbc0cef3667b56281e432f9231f05d9..c581aa4806a217f7612e6d451271d25267ec74de 100644 (file)
@@ -827,7 +827,6 @@ host_installdir = ${gxx_include_dir}/${host_alias}$(MULTISUBDIR)/bits
 host_headers = \
        ${host_srcdir}/ctype_base.h \
        ${host_srcdir}/ctype_inline.h \
-       ${host_srcdir}/ctype_noninline.h \
        ${host_srcdir}/os_defines.h \
        ${glibcxx_srcdir}/$(ATOMIC_WORD_SRCDIR)/atomic_word.h \
        ${glibcxx_srcdir}/$(ABI_TWEAKS_SRCDIR)/cxxabi_tweaks.h \
index 01e593d1c31bad6be4b879cee678e6b216d8d765..0da4c464538e9c8a5d5f079d64d464da989c237c 100644 (file)
@@ -1068,7 +1068,6 @@ host_installdir = ${gxx_include_dir}/${host_alias}$(MULTISUBDIR)/bits
 host_headers = \
        ${host_srcdir}/ctype_base.h \
        ${host_srcdir}/ctype_inline.h \
-       ${host_srcdir}/ctype_noninline.h \
        ${host_srcdir}/os_defines.h \
        ${glibcxx_srcdir}/$(ATOMIC_WORD_SRCDIR)/atomic_word.h \
        ${glibcxx_srcdir}/$(ABI_TWEAKS_SRCDIR)/cxxabi_tweaks.h \
index 9a3568551385bc655d9def3b40f7c6e2d9a086a7..5a6cb97082209e17a612e353db49d69af12ce5a0 100644 (file)
@@ -104,6 +104,7 @@ host_sources = \
        atomicity.cc \
        codecvt_members.cc \
        collate_members.cc \
+       ctype_configure_char.cc \
        ctype_members.cc \
        messages_members.cc \
        monetary_members.cc \
@@ -116,6 +117,9 @@ codecvt_members.cc: ${glibcxx_srcdir}/$(CCODECVT_CC)
 collate_members.cc: ${glibcxx_srcdir}/$(CCOLLATE_CC)
        $(LN_S) ${glibcxx_srcdir}/$(CCOLLATE_CC) . || true
 
+ctype_configure_char.cc: ${glibcxx_srcdir}/$(OS_INC_SRCDIR)/ctype_configure_char.cc
+       $(LN_S) ${glibcxx_srcdir}/$(OS_INC_SRCDIR)/ctype_configure_char.cc . || true
+
 ctype_members.cc: ${glibcxx_srcdir}/$(CCTYPE_CC)
        $(LN_S) ${glibcxx_srcdir}/$(CCTYPE_CC) . || true
 
index b454f66dc8b032d3ffabc4db56b73c98fca3815d..88dca846948f44c941c6ddeee1227abce7fd9777 100644 (file)
@@ -89,8 +89,8 @@ am__installdirs = "$(DESTDIR)$(toolexeclibdir)"
 LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 am__objects_1 = atomicity.lo codecvt_members.lo collate_members.lo \
-       ctype_members.lo messages_members.lo monetary_members.lo \
-       numeric_members.lo time_members.lo
+       ctype_configure_char.lo ctype_members.lo messages_members.lo \
+       monetary_members.lo numeric_members.lo time_members.lo
 @ENABLE_EXTERN_TEMPLATE_TRUE@am__objects_2 = allocator-inst.lo \
 @ENABLE_EXTERN_TEMPLATE_TRUE@  concept-inst.lo ext-inst.lo \
 @ENABLE_EXTERN_TEMPLATE_TRUE@  fstream-inst.lo ios-inst.lo \
@@ -361,6 +361,7 @@ host_sources = \
        atomicity.cc \
        codecvt_members.cc \
        collate_members.cc \
+       ctype_configure_char.cc \
        ctype_members.cc \
        messages_members.cc \
        monetary_members.cc \
@@ -829,6 +830,9 @@ codecvt_members.cc: ${glibcxx_srcdir}/$(CCODECVT_CC)
 collate_members.cc: ${glibcxx_srcdir}/$(CCOLLATE_CC)
        $(LN_S) ${glibcxx_srcdir}/$(CCOLLATE_CC) . || true
 
+ctype_configure_char.cc: ${glibcxx_srcdir}/$(OS_INC_SRCDIR)/ctype_configure_char.cc
+       $(LN_S) ${glibcxx_srcdir}/$(OS_INC_SRCDIR)/ctype_configure_char.cc . || true
+
 ctype_members.cc: ${glibcxx_srcdir}/$(CCTYPE_CC)
        $(LN_S) ${glibcxx_srcdir}/$(CCTYPE_CC) . || true
 
index 04d31cc57444c3c133011f244f238653cba452c3..e246bea10ddb8849aa148ff90fe6ba44f3b1bb20 100644 (file)
@@ -1,5 +1,5 @@
 // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005,
-// 2006, 2007, 2008, 2009
+// 2006, 2007, 2008, 2009, 2010, 2011
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -50,11 +50,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   locale::id ctype<wchar_t>::id;
 #endif
 
-  // XXX At some point, just rename this file to ctype_configure_char.cc
-  // and compile it as a separate file instead of including it here.
-  // Platform-specific initialization code for ctype tables.
-#include <bits/ctype_noninline.h>
-
   const size_t ctype<char>::table_size;
 
   ctype<char>::~ctype()