2003-07-28 Phil Edwards <pme@gcc.gnu.org>

	* docs/doxygen/user.cfg.in, docs/html/abi.txt, docs/html/debug.html,
	docs/html/test.html, docs/html/17_intro/headers_cc.txt,
	docs/html/17_intro/howto.html, docs/html/ext/howto.html:  Change
	GLIBCPP to GLIBCXX (and explain as needed).


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@69879 138bc75d-0d04-0410-961f-82ee72b054a4

8 files changed, 28 insertions, 19 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3e833c158ab..e64b45fcf30 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,12 @@
 2003-07-28  Phil Edwards  <pme@gcc.gnu.org>
 
+	* docs/doxygen/user.cfg.in, docs/html/abi.txt, docs/html/debug.html,
+	docs/html/test.html, docs/html/17_intro/headers_cc.txt,
+	docs/html/17_intro/howto.html, docs/html/ext/howto.html:  Change
+	GLIBCPP to GLIBCXX (and explain as needed).
+
+2003-07-28  Phil Edwards  <pme@gcc.gnu.org>
+
 	* README:  Update.
 
 2003-07-28  Phil Edwards  <pme@gcc.gnu.org>
diff --git a/libstdc++-v3/docs/doxygen/user.cfg.in b/libstdc++-v3/docs/doxygen/user.cfg.in
index f661f925ff2..9911490e84c 100644
--- a/libstdc++-v3/docs/doxygen/user.cfg.in
+++ b/libstdc++-v3/docs/doxygen/user.cfg.in
@@ -869,13 +869,13 @@ INCLUDE_FILE_PATTERNS  =
 ### The class_requires macros are kludges because SKIP_FUNCTION_MACROS is
 ### completely broken, and the presence of the macros confuses the parser.
 
-PREDEFINED             = _GLIBCPP_DEPRECATED              \
-                         _GLIBCPP_USE_WCHAR_T             \
-                         _GLIBCPP_USE_LONG_LONG           \
-                         __glibcpp_class_requires="//"    \
-                         __glibcpp_class_requires2="//"   \
-                         __glibcpp_class_requires3="//"   \
-                         __glibcpp_class_requires4="//"
+PREDEFINED             = _GLIBCXX_DEPRECATED              \
+                         _GLIBCXX_USE_WCHAR_T             \
+                         _GLIBCXX_USE_LONG_LONG           \
+                         __glibcxx_class_requires="//"    \
+                         __glibcxx_class_requires2="//"   \
+                         __glibcxx_class_requires3="//"   \
+                         __glibcxx_class_requires4="//"
 
 # If the MACRO_EXPANSION and EXPAND_PREDEF_ONLY tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded.
diff --git a/libstdc++-v3/docs/html/17_intro/headers_cc.txt b/libstdc++-v3/docs/html/17_intro/headers_cc.txt
index eb930f1ff00..667f2fe235b 100644
--- a/libstdc++-v3/docs/html/17_intro/headers_cc.txt
+++ b/libstdc++-v3/docs/html/17_intro/headers_cc.txt
@@ -75,7 +75,7 @@
 
 // "C" headers that might not work if wchar_t support is disabled.
 #include <bits/c++config.h>
-#if _GLIBCPP_USE_WCHAR_T
+#if _GLIBCXX_USE_WCHAR_T
   #include <cwchar>
   #include <cwctype>
 #endif
diff --git a/libstdc++-v3/docs/html/17_intro/howto.html b/libstdc++-v3/docs/html/17_intro/howto.html
index fc43d0f5892..d1fc584679d 100644
--- a/libstdc++-v3/docs/html/17_intro/howto.html
+++ b/libstdc++-v3/docs/html/17_intro/howto.html
@@ -291,7 +291,8 @@
       <a href="../configopts.html">the configuration step</a>, with the
       various --enable/--disable choices being translated to #define/#undef).
    </p>
-   <p>All library macros begin with <code>_GLIBCPP_</code>.  The fact that
+   <p>All library macros begin with <code>_GLIBCPP_</code> in earlier
+      versions, and <code>_GLIBCXX_</code> in later versions.  The fact that
       these symbols start with a leading underscore should give you a clue
       that (by default) they aren't meant to be changed by the user.  :-)
    </p>
@@ -310,9 +311,10 @@
       The default state of the symbol is listed.  &quot;Configurable&quot;
       (or &quot;Not configurable&quot;) means that the symbol is initially
       chosen (or not) based on --enable/--disable options at configure time.
+      For 3.1 through 3.3, the prefixes are <code>_GLIBCPP_</code>.
    </p>
     <dl>
-    <dt><code>_GLIBCPP_DEPRECATED</code></dt>
+    <dt><code>_GLIBCXX_DEPRECATED</code></dt>
     <dd>Undefined by default.  Not configurable.  Turning this on enables
         older ARM-style iostreams code, and other anachronisms.  This may be
         useful in updating old C++ programs which no longer meet the
@@ -331,7 +333,7 @@
         you might try undefining this macro.
     </dd>
     -->
-    <dt><code>_GLIBCPP_CONCEPT_CHECKS</code></dt>
+    <dt><code>_GLIBCXX_CONCEPT_CHECKS</code></dt>
     <dd>Undefined by default.  Configurable.  When defined, performs
         compile-time checking on certain template instantiations to detect
         violations of the requirements of the standard.  This is described
diff --git a/libstdc++-v3/docs/html/abi.txt b/libstdc++-v3/docs/html/abi.txt
index 73cb46c9c09..430108885f9 100644
--- a/libstdc++-v3/docs/html/abi.txt
+++ b/libstdc++-v3/docs/html/abi.txt
@@ -108,8 +108,8 @@ I. What is an ABI? What's covered? What's not?
     gcc-3.2.x: 102
 
 
-  - Incremental bumping of a library pre-defined macro,
-    __GLIBCPP__. This macro is defined as the date the library was
+  - Incremental bumping of a library pre-defined macro, __GLIBCPP__ or
+    __GLIBCXX__.  This macro is defined as the date the library was
     released, in compressed ISO date format, as an unsigned long.
 
     This macro is defined in the file "c++config" in the
@@ -130,7 +130,7 @@ I. What is an ABI? What's covered? What's not?
   - Incremental bumping of a library pre-defined macro,
     _GLIBCPP_VERSION. This macro is defined as the released version of
     the library, as a string literal. This is only implemented in
-    gcc-3.1.0 releases and higher.
+    gcc-3.1.0 releases and higher, and changed to _GLIBCXX_VERSION in 3.4.
 
     This macro is defined in the file "c++config" in the
     "libstdc++-v3/include/bits" directory and is generated
@@ -200,7 +200,7 @@ I. What is an ABI? What's covered? What's not?
   --enable-symvers. 
 
   In particular, libstdc++-v3/acinclude.m4 has a macro called
-  GLIBCPP_ENABLE_SYMVERS that defaults to yes (or the argument passed
+  GLIBCXX_ENABLE_SYMVERS that defaults to yes (or the argument passed
   in via --enable-symvers=foo). At that point, the macro attempts to
   make sure that all the requirement for symbol versioning are in
   place. For more information, please consult acinclude.m4. 
diff --git a/libstdc++-v3/docs/html/debug.html b/libstdc++-v3/docs/html/debug.html
index 0ca332c7346..dcd035ca04f 100644
--- a/libstdc++-v3/docs/html/debug.html
+++ b/libstdc++-v3/docs/html/debug.html
@@ -105,7 +105,7 @@
    there are different kinds of allocation schemes that can be used by
    <code> std::allocator </code>. For implementation details, see this
    <a href="ext/howto.html#3"> document</a> and look specifically for
-   <code>GLIBCPP_FORCE_NEW</code>. 
+   <code>GLIBCXX_FORCE_NEW</code>. 
 </p>
 
 <p>In a nutshell, the default allocator used by <code>
@@ -120,7 +120,7 @@
    C++ tools: the first that can do this is valgrind 1.0.4, but later
    versions should work at least as well. Second of all, use a
    completely unoptimized build to avoid confusing valgrind. Third,
-   use GLIBCPP_FORCE_NEW to keep extraneous pool allocation noise from
+   use GLIBCXX_FORCE_NEW to keep extraneous pool allocation noise from
    cluttering debug information. 
 </p>
 
diff --git a/libstdc++-v3/docs/html/ext/howto.html b/libstdc++-v3/docs/html/ext/howto.html
index ddd8e2ae4f9..83cb50c365e 100644
--- a/libstdc++-v3/docs/html/ext/howto.html
+++ b/libstdc++-v3/docs/html/ext/howto.html
@@ -414,7 +414,7 @@
    <p>
       If a DR is not listed here, we may simply not have gotten to it yet;
       feel free to submit a patch.  Search the include/bits and src
-      directories for appearances of _GLIBCPP_RESOLVE_LIB_DEFECTS for
+      directories for appearances of _GLIBCXX_RESOLVE_LIB_DEFECTS for
       examples of style.  Note that we usually do not make changes to the code
       until an issue has reached <a href="lwg-active.html#DR">DR</a> status.
    </p>
diff --git a/libstdc++-v3/docs/html/test.html b/libstdc++-v3/docs/html/test.html
index 4d2dc536dc3..a4140beeb87 100644
--- a/libstdc++-v3/docs/html/test.html
+++ b/libstdc++-v3/docs/html/test.html
@@ -451,7 +451,7 @@ Example 4: Testing for compilation errors on line 41
      <em>testsuite_wchar_t </em>
      <p> This file indicates that the host system can run the wchar_t
      tests, and corresponds to the macro definition <code>
-     _GLIBCPP_USE_WCHAR_T</code> in the file c++config.h.
+     _GLIBCXX_USE_WCHAR_T</code> in the file c++config.h.
      </p>
      </li>
     </ul>