2007-06-26  Martin Sebor  <sebor@roguewave.com>

	* stdcxx/branches/4.2.0: Merged the head of stdcxx/trunk.


git-svn-id: https://svn.apache.org/repos/asf/incubator/stdcxx/branches/4.2.0@550991 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/GNUmakefile b/GNUmakefile
index 00a39da..c04081a 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -681,6 +681,7 @@
 
 # try each submakefile
 .DEFAULT:
+	-@$(MAKE) -C$(BUILDDIR)/include $@
 	-@$(MAKE) -C$(LIBDIR) $@
 	-@$(MAKE) -C$(BUILDDIR)/rwtest $@
 	-@$(MAKE) -C$(BUILDDIR)/bin $@
diff --git a/README b/README
index a8f5809..c6a1f36 100644
--- a/README
+++ b/README
@@ -37,6 +37,7 @@
     VisualStudio Setup Instructions .............................. 5.1
   Library Installation ............................................. 6
   Test Suite Build Instructions .................................... 7
+    VisualStudio Test Suite Build Instructions ................... 7.1
   Library Configuration ............................................ 8
     Header config.h .............................................. 8.1
     Headers rw/_config.h and rw/_defs.h .......................... 8.2
@@ -51,7 +52,7 @@
       Macros Controlling Implementation Properties ............. 8.3.8
       Other Configuration Macros ............................... 8.3.9
       Macros Controlling Extensions ........................... 8.3.10
-  Library Oragnization ............................................. 9
+  Library Organization ............................................. 9
     Organization of Headers ...................................... 9.1 
     Organization of Sources ...................................... 9.2
   Platform Notes .................................................. 10
@@ -147,34 +148,46 @@
   create the required directory structure from the alternate structure
   (not described here).
 
-      ${TOPDIR}/GNUmakefile       master makefile
+      ${TOPDIR}/GNUmakefile           master makefile
        +- etc/
-       |  +- config/GNUmakefile.* makefiles
-       |  |  |     /*.config      compiler config files
-       |  |  |     /fixtree.sh    directory tree configuration script
-       |  |  |     /makefile.*    common definitions and rules
-       |  |  |     /runall.sh     testsuite run script
-       |  |  +- src/              configuration sources and scripts
-       |  +- nls/                 locale definitions and charmaps
-       |     +- charmaps/         character set description files
-       |     +- src/              locale definition files
-       +- examples/               set of examples and tutorials
-       |  +- include/*.h          common example headers
-       |  +- manual/*.cpp         example sources
-       |  +- tutorial/*.cpp       tutorial sources
-       +- include/*               public library headers
-       |  +- ansi/*               C++ C library headers
-       |  +- loc/_*.{h,c,cc}      private locale headers
-       |  +- rw/_*.{h,c,cc}       other private library headers
-       +- src/*.cpp               library sources
-       +- util/*.{h,c,cc,cpp}     utility headers and sources
-       +- tests/                  test suite files
-       |  +- include/*.h          common test headers
-       |  +- */*.cpp              test suite sources
-       +- ../rwtest               test suite infrastructure
+       |  +- config/GNUmakefile.*     makefiles
+       |  |  |     /*.config          compiler config files
+       |  |  |     /fixtree.sh        directory tree configuration
+       |  |  |                        script
+       |  |  |     /makefile.*        common definitions and rules
+       |  |  |     /runall.sh         testsuite run script
+       |  |  +- src/                  configuration sources and
+       |  |  |                        scripts
+       |  |  +- windows/generate.wsf  solution generation script
+       |  |            /configure.wsf configuration script
+       |  |            /build.wsf     solution build script
+       |  |            /makelog.wsf   log creation script
+       |  |            /runall.wsf    testsuite run script
+       |  |            /*.js          utility scripts
+       |  |            /*.config      compiler config files
+       |  +- nls/                     locale definitions and
+       |     |                        charmaps
+       |     +- charmaps/             character set description files
+       |     +- src/                  locale definition files
+       +- examples/                   set of examples and tutorials
+       |  +- include/*.h              common example headers
+       |  +- manual/*.cpp             example sources
+       |  +- tutorial/*.cpp           tutorial sources
+       +- include/*                   public library headers
+       |  +- ansi/*                   C++ C library headers
+       |  +- loc/_*.{h,c,cc}          private locale headers
+       |  +- rw/_*.{h,c,cc}           other private library headers
+       +- src/*.cpp                   library sources
+       +- util/*.{h,c,cc,cpp}         utility headers and sources
+       +- tests/                      test suite files
+       |  +- include/*.h              common test headers
+       |  +- */*.cpp                  test suite sources
+       +- ../rwtest                   test suite infrastructure
              +- rw/
-             |  +- rwtest/*.h     test suite infrastructure headers
-             +- src/*.cpp         test suite infrastructure sources
+             |  +- rwtest/*.h         test suite infrastructure
+             |                        headers
+             +- src/*.cpp             test suite infrastructure
+                                      sources
 
 
   4.1  Library Files
@@ -221,7 +234,7 @@
     +------------+------------+------------+------------+------------+
 
   Any  other  header  files  not  mandated by  the  C++  Standard  are
-  contained  in the include/rw/  or includ/loc  subdirectories.  Their
+  contained  in the include/rw/ or include/loc  subdirectories.  Their
   names start  with an underscore,  to prevent potential  clashes with
   any user  headers, and end  in a .h  suffix.  Some of them  may have
   corresponding .c and .cc files.
@@ -492,14 +505,78 @@
 
   o  > .\generate.bat /BUILDDIR:<builddir> /CONFIG:<config>
 
-     Where <builddir> is the name of the directory where to create the
-     solution and projects, and <config> is one of msvc-7.1, msvc-8.0,
-     and  icc-9.0.   After  the  script has  finished  generating  the
-     solution and  projects, cd to <builddir>  and launch VisualStudio
-     with the name  of the solution as the argument.   The name of the
-     solution will correspond to  the specified configuration with the
-     .sln suffix.
+     <builddir> is the pathname of the build directory where to create
+                the solution  and  projects;  the  directory  will  be
+                created  (as will  all  its  required  subdirectories)
+                this is a required argument
+     <config>   name  (not  pathname)  of  a  config  file  containing
+                compiler options; the available configuration files
+                are:
+                icc-9.0.config  - for Intel C++ 9.0
+                icc-9.1.config  - for Intel C++ 9.1
+                msvc-7.0.config - for Microsoft Visual C++ .NET
+                msvc-7.1.config - for Microsoft Visual C++ .NET 2003
+                msvc-8.0.config - for Microsoft Visual C++ .NET 2005
+                msvc-8.0-x64.config - for Microsoft Visual C++ .NET
+                                      2005 (x64 platform)
+                msvcex-8.0.config - for Microsoft Visual C++ Express
+                                    2005
+                this is a required argument
 
+  o  Example:
+       > generate.bat /BUILDDIR:C:\stdcxx /CONFIG:msvc-7.1
+
+     This command will create a build directory rooted at ${BUILDDIR},
+     the solution file  ${BUILDDIR}\msvc-7.1\msvc-7.1.sln, the project
+     files in directory  ${BUILDDIR}\msvc-7.1\Projects, and batch file
+     ${BUILDDIR}\build_msvc-7.1.bat.
+
+  To build the library, test  suite (*), and examples (*), perform the
+  following steps: (* Where available.)
+
+  o  > cd ${BUILDDIR}
+
+  o  > build_msvc-7.1.bat [<build-types>]
+
+     <build-types> is one or more of {
+                      8s, 8d, 11s, 11d, 12s, 12d, 15s, 15d
+                  }
+
+                  The  numeric  part  of <build-type>  determines  the
+                  presence  or  absence   of  support  for  debugging,
+                  whether  optimization is or  isn't enabled,  and the
+                  thread safety level of the library, as follows:
+
+                  --  optimization enabled: even  numbers (i.e., 8 and
+                      12) 
+                  --  debugging enabled: odd numbers (i.e., 11 and 15)
+                  --  thread safe code: 12 and 15
+
+                  The  single  letter following  the  numeric part  of
+                  <build-type> determines  whether a static or dynamic
+                  library is  built:
+
+                  --  s implies an static library 
+                  --  d implies a dynamic library
+
+                  The <build-types>  argument  is optional.  When  not
+                  specified a build type of 11s is assumed.
+
+  o  Example:
+       > build_msvc-7.1.bat 15d
+
+     run  the configuration  scripts, and  build a thread-safe dynamic
+     library  with   debugging  information  included   and  debugging
+     facilities enabled.  If the build is successful, the library will
+     be  located in ${BUILDDIR}\msvc-7.1\${BUILDTYPE}\lib\ and will be
+     named libstd${BUILDTYPE}.dll  (libstd${BUILDTYPE}.lib if building
+     a   static    library).    Public   library    headers   are   in
+     ${TOPDIR}\include\ and its subdirectories, the generated config.h
+     is in ${BUILDDIR}\msvc-7.1\${BUILDTYPE}\include\.
+
+     Alternatively,  you can run Microsoft Visual Studio IDE,  open the
+     generated solution file, select the desired solution configuration
+     and invoke "Build"->"Build Solution" command.
 
   6  Library Installation
   -----------------------
@@ -583,6 +660,28 @@
      * Where available. 
 
 
+  7.1  VisualStudio Test Suite Build Instructions
+  -----------------------------------------------
+
+  When  available,  the test  suite  can  be  built by  following  the
+  following steps.
+
+  o  Run  Microsoft Visual Studio IDE,  open  the  generated  solution
+     file and select the desired solution configuration.
+
+     To build  the examples  select the  .stdcxx_examples  project and
+     invoke "Build"->"Build .stdcxx_examples" command.
+
+     To build  the tests select  the .stdcxx_tests  project and invoke
+     "Build"->"Build .stdcxx_tests" command.
+
+     To run  the examples  select the .stdcxx_runexamples  project and
+     invoke "Build"->"Build .stdcxx_runexamples" command.
+
+     To run  the tests select the .stdcxx_runtests  project and invoke
+     "Build"->"Build .stdcxx_runtests" command.
+
+
   8  Library Configuration
   ------------------------
 
@@ -1126,7 +1225,7 @@
      acosf(float) is  not declared in  <math.h> on a platform  but the
      symbol extern "C" acosf is  found in the libm library binary, the
      macro   _RWSTD_NO_ACOSF   will   be   #defined  but   the   macro
-     _RWSTD_NO_ACOSF_IN_LIBM will be #undef-ined.
+     _RWSTD_NO_ACOSF_IN_LIBM will be #undefined.
 
   o  _RWSTD_NO_PURE_C_HEADERS
 
@@ -1228,7 +1327,7 @@
 
   o  _RWSTD_NO_CONDENSED_NAME
 
-     Whend   #defined,  locale   names  always   include   all  locale
+     When   #defined,  locale   names  always   include   all   locale
      categories,  even if they  are all  the same.  This is  true, for
      example, on HP-UX  when the name of the  "C" locale returned from
      setlocale (LC_ALL, 0) is "C C C C  C C" and not just "C" as it is
@@ -1236,7 +1335,7 @@
 
   o  _RWSTD_LDBL_PRINTF_PREFIX [auto, lib]
 
-     #defined the the printf() format modifier as a string literal for
+     #defined  the printf()  format modifier  as a string  literal for
      type  long double, when  supported. Typically,  the value  of the
      macro is "L".
 
@@ -1247,7 +1346,7 @@
 
   o  _RWSTD_LLONG_PRINTF_PREFIX [auto]
 
-     #defined the the printf() format modifier as a string literal for
+     #defined  the printf()  format  modifier as a string  literal for
      type long long, when supported. Typically, the value of the macro
      is "ll".
 
@@ -1291,7 +1390,7 @@
      _RWSTD_MEMPTR_SIZE   (member pointer)
 
      Each of  the _RWSTD_<type>_SIZE macros above expands  to the size
-     of the respective  fundamental type (as retruned by  sizeof) as a
+     of the respective  fundamental type (as returned by  sizeof) as a
      constant   integer   expressions   suitable   for  use   in   #if
      preprocessing   directives.   If   no   such  type   exists   the
      corresponding macros are not #defined.
@@ -1473,7 +1572,7 @@
 
   o  _RWSTD_NO_EXT_IOS_SAFE_CONVERSION [over]
 
-     When #defined, the the  const member function operator void*() of
+     When  #defined,  the  const member  function  operator void*() of
      the  class   template  basic_ios  is   declared.  Otherwise,  the
      resolution  of   the  Library   Working  Group's  issue   568  is
      implemented instead. See
@@ -1487,7 +1586,7 @@
 
   o  _RWSTD_NO_EXT_PORTABLE_RANDOM_SEQUENCE [lib, pure]
 
-     Whend  #defined,  the  random   number  generator  used  by  this
+     When  #defined,  the  random   number   generator  used  by  this
      implementation  of  the C++  Standard  Library generates  integer
      values  in the  full range  of the  type size_t.   Otherwise, the
      generator is  restricted to the  range of unsigned  32-bit values
@@ -1546,12 +1645,12 @@
   o  _RWSTD_NO_EXT_TIME_PUT_PRIMARY [over, pure]
   o  _RWSTD_NO_EXT_MESSAGES_PRIMARY [over, pure]
 
-     When  #defined,  the  correspondig  primary  template,  which  is
+     When  #defined,  the  corresponding  primary  template, which  is
      otherwise defined as an  extension of this implementation, is not
      defined by the library.
 
 
-  9  Library Oragnization
+  9  Library Organization
   -----------------------
 
   The symbols declared  and defined by this implementation  of the C++
@@ -1570,7 +1669,7 @@
   directory  (such as  iostream  or rw/_config.h) along  with a  brief
   description of the contents of the file and a copyright notice.
 
-  Below  the comment  is a  header #inclusion  guard that  pevents the
+  Below  the comment is a  header #inclusion  guard that  prevents the
   contents of the same header  file from being expanded more than once
   in any translation unit from which the header might be included more
   than once. The naming convention used for the guard is as follows:
@@ -1713,7 +1812,7 @@
     10.12  Microsoft MSVC
     --------------------
 
-    Pported to MSVC 6.0 through 8.0 on Windows (x86, IA64, and EM64T).
+    Ported to MSVC 6.0 through 8.0 on Windows (x86, IA64, and EM64T).
 
 
     10.13  SGI MIPSpro
diff --git a/doc/index.html b/doc/index.html
index d44ac09..b0de4b3 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -1,7 +1,7 @@
 <html>
     <head>
         <title>Apache C++ Standard Library Documentation</title>
-        <link rel=StyleSheet href="rw.css" type="text/css" title="Rogue Wave Standard Stylesheet">
+        <link rel=StyleSheet href="rw.css" type="text/css" title="Apache stdcxx Stylesheet">
         <meta http-equiv="content-type" content="text/html" charset="iso-8859-1"/>
     </head>
 
diff --git a/doc/stdlibref/--distance-type.html b/doc/stdlibref/--distance-type.html
index ff29153..b9689e9 100644
--- a/doc/stdlibref/--distance-type.html
+++ b/doc/stdlibref/--distance-type.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>__distance_type()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="III.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="--iterator-category.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>__distance_type()</H2><PRE><HR><B><I>Does not inherit</I></B><HR></PRE>
diff --git a/doc/stdlibref/--iterator-category.html b/doc/stdlibref/--iterator-category.html
index 91849b2..b223da4 100644
--- a/doc/stdlibref/--iterator-category.html
+++ b/doc/stdlibref/--iterator-category.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>__iterator_category()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="--distance-type.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="IV.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>__iterator_category()</H2><PRE><HR><B><I>Does not inherit</I></B> <HR></PRE>
diff --git a/doc/stdlibref/1-1.html b/doc/stdlibref/1-1.html
index ad2751b..90465d2 100644
--- a/doc/stdlibref/1-1.html
+++ b/doc/stdlibref/1-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Contents of Entries</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="1-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>1.1 Contents of Entries</H2>
diff --git a/doc/stdlibref/1-2.html b/doc/stdlibref/1-2.html
index a0a3ec3..1b07e51 100644
--- a/doc/stdlibref/1-2.html
+++ b/doc/stdlibref/1-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Conventions</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="1-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="1-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>1.2 Conventions</H2>
diff --git a/doc/stdlibref/1-3.html b/doc/stdlibref/1-3.html
index 692759f..ecb6847 100644
--- a/doc/stdlibref/1-3.html
+++ b/doc/stdlibref/1-3.html
@@ -1,11 +1,11 @@
 <HTML>
 <HEAD>
 <TITLE>Standards Conformance</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="1-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>1.3 Standards Conformance</H2>
-<P>The Rogue Wave implementation of the C++ Standard Library conforms to <I>ISO/IEC 14882:2003 -- International Standard for Information Systems -- Programming Language C++</I>. In addition, this implementation conforms to a subset of the requirements of the following standards:</P>
+<P>This implementation of the C++ Standard Library conforms to <I>ISO/IEC 14882:2003 -- International Standard for Information Systems -- Programming Language C++</I>. In addition, this implementation conforms to a subset of the requirements of the following standards:</P>
 <UL>
 <LI><P CLASS="LIST">ISO/IEC 9899<br>Programming languages -- C</P></LI>
 <LI><P CLASS="LIST">ISO/IEC 10967-1<br>Information technology -- Language independent arithmetic -- Part 1: Integer and floating point arithmetic</P></LI>
@@ -17,9 +17,9 @@
 <LI><P CLASS="LIST">ISO/IEC 2022<br>Information technology -- Character code structure and extension     techniques</P></LI>
 </UL>
 <P>At the end of each entry, the section <B>Standards Conformance</B> gives the section of the C++ Standard along with any other relevant standards from which the entry derives. </P>
-<P>In some cases, the Rogue Wave C++ Standard Library Module provides extensions to enhance functionality and usability. These extensions are highlighted where they occur. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions provided by this implementation.</P>
+<P>In some cases, this implementation of the C++ Standard Library provides extensions to enhance functionality and usability. These extensions are highlighted where they occur. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions provided by this implementation.</P>
 <BLOCKQUOTE><HR><B>
-NOTE -- Compilers may not support all the language features necessary to implement certain facilities of the Standard. Those facilities may be implemented differently or not at all in this Rogue Wave implementation. For all implementation-specific details, please see the readme file that was installed with this product.
+NOTE -- Compilers may not support all the language features necessary to implement certain facilities of the Standard. Those facilities may be implemented differently or not at all in this implementation. For all implementation-specific details, please see the readme file that was installed with this product.
 </B><HR></BLOCKQUOTE>
 
 <BR>
diff --git a/doc/stdlibref/1.html b/doc/stdlibref/1.html
index fc34288..0dc6d7e 100644
--- a/doc/stdlibref/1.html
+++ b/doc/stdlibref/1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="I.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="1-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H1>Chapter 1: Overview</H1>
diff --git a/doc/stdlibref/2-1.html b/doc/stdlibref/2-1.html
index a7001d0..4369ef1 100644
--- a/doc/stdlibref/2-1.html
+++ b/doc/stdlibref/2-1.html
@@ -1,11 +1,11 @@
 <HTML>
 <HEAD>
 <TITLE>Correlation with the Standard</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="2-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>2.1 Correlation with the Standard</H2>
-<P>This Rogue Wave C++ Standard Library Module implements sections 17 through 27 and Annexes C, D, and E of the C++ Standard. The C++ Standard contains the following libraries: </P>
+<P>The Apache C++ Standard Library implements sections 17 through 27 and Annexes C, D, and E of the C++ Standard. The C++ Standard contains the following libraries: </P>
 <UL>
 <LI><P CLASS="LIST">the Language support library <I>(</I><I><A HREF="2-2.html">Section&nbsp;2.2</A></I><I>)</I></P></LI>
 <LI><P CLASS="LIST">the Diagnostics library <I>(</I><I><A HREF="2-3.html">Section&nbsp;2.3</A></I><I>)</I></P></LI>
@@ -18,7 +18,7 @@
 <LI><P CLASS="LIST">the Numerics library <I>(</I><I><A HREF="2-10.html">Section&nbsp;2.10</A></I><I>)</I></P></LI>
 <LI><P CLASS="LIST">the Input/output library <I>(</I><I><A HREF="2-11.html">Section&nbsp;2.11</A></I><I>)</I></P></LI>
 </UL>
-<P>These libraries are described in the following sections. The header files for each library are listed in the table below each library's description. Next to each header file, the names of corresponding entries in this <I>Reference Guide</I> are given. An entry may be the name of a component in a header file or a related topic, such as <I>Iterators</I> or <I>Exceptions</I>. The names of Rogue Wave header files are the same as the Standard header files.</P>
+<P>These libraries are described in the following sections. The header files for each library are listed in the table below each library's description. Next to each header file, the names of corresponding entries in this <I>Reference Guide</I> are given. An entry may be the name of a component in a header file or a related topic, such as <I>Iterators</I> or <I>Exceptions</I>. The names of public header files provided by this implementation are the same as the Standard header files.</P>
 <P>This chapter is provided as an alternate index to help you find components for programming tasks as described in the Standard. If you are reading this manual online, click the name of a library to go to its description in this chapter. Click the name of a header file or component to go to its entry in this <I>Reference Guide</I>. </P>
 
 <BR>
diff --git a/doc/stdlibref/2-10.html b/doc/stdlibref/2-10.html
index 50ba7ed..1195bba 100644
--- a/doc/stdlibref/2-10.html
+++ b/doc/stdlibref/2-10.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Numerics library</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="2-9.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="2-11.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>2.10 Numerics library</H2>
diff --git a/doc/stdlibref/2-11.html b/doc/stdlibref/2-11.html
index 54dd2d8..e42d8c6 100644
--- a/doc/stdlibref/2-11.html
+++ b/doc/stdlibref/2-11.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Input/output library</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="2-10.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="II.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>2.11 Input/output library</H2>
diff --git a/doc/stdlibref/2-2.html b/doc/stdlibref/2-2.html
index 14c8375..743e7ae 100644
--- a/doc/stdlibref/2-2.html
+++ b/doc/stdlibref/2-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Language support library</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="2-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="2-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>2.2 Language support library</H2>
diff --git a/doc/stdlibref/2-3.html b/doc/stdlibref/2-3.html
index 590b758..3bb9172 100644
--- a/doc/stdlibref/2-3.html
+++ b/doc/stdlibref/2-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Diagnostics library</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="2-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="2-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>2.3 Diagnostics library</H2>
diff --git a/doc/stdlibref/2-4.html b/doc/stdlibref/2-4.html
index 088096a..323e29b 100644
--- a/doc/stdlibref/2-4.html
+++ b/doc/stdlibref/2-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>General utilities library</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="2-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="2-5.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>2.4 General utilities library</H2>
diff --git a/doc/stdlibref/2-5.html b/doc/stdlibref/2-5.html
index a03b946..e5f3cc8 100644
--- a/doc/stdlibref/2-5.html
+++ b/doc/stdlibref/2-5.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Strings library</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="2-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="2-6.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>2.5 Strings library</H2>
diff --git a/doc/stdlibref/2-6.html b/doc/stdlibref/2-6.html
index 278cef1..41b4e1f 100644
--- a/doc/stdlibref/2-6.html
+++ b/doc/stdlibref/2-6.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Localization library</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="2-5.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="2-7.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>2.6 Localization library</H2>
diff --git a/doc/stdlibref/2-7.html b/doc/stdlibref/2-7.html
index da27454..1944149 100644
--- a/doc/stdlibref/2-7.html
+++ b/doc/stdlibref/2-7.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Containers library</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="2-6.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="2-8.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>2.7 Containers library</H2>
diff --git a/doc/stdlibref/2-8.html b/doc/stdlibref/2-8.html
index 0edb091..ddf43e2 100644
--- a/doc/stdlibref/2-8.html
+++ b/doc/stdlibref/2-8.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Iterators library</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="2-7.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="2-9.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>2.8 Iterators library</H2>
diff --git a/doc/stdlibref/2-9.html b/doc/stdlibref/2-9.html
index 6fad11c..11e3084 100644
--- a/doc/stdlibref/2-9.html
+++ b/doc/stdlibref/2-9.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Algorithms library</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="2-8.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="2-10.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>2.9 Algorithms library</H2>
diff --git a/doc/stdlibref/2.html b/doc/stdlibref/2.html
index 66a3df9..a5ecd8b 100644
--- a/doc/stdlibref/2.html
+++ b/doc/stdlibref/2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Index of Libraries</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="1-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="2-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H1>Chapter 2: Index of Libraries</H1>
diff --git a/doc/stdlibref/A-1.html b/doc/stdlibref/A-1.html
index 8884ab6..966f0ac 100644
--- a/doc/stdlibref/A-1.html
+++ b/doc/stdlibref/A-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Warnings</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="A.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="A-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>A.1 Warnings</H2>
diff --git a/doc/stdlibref/A-2.html b/doc/stdlibref/A-2.html
index 42e80bf..148e076 100644
--- a/doc/stdlibref/A-2.html
+++ b/doc/stdlibref/A-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Readmes</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="A-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="A-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>A.2 Readmes</H2>
diff --git a/doc/stdlibref/A-3.html b/doc/stdlibref/A-3.html
index b8e81b8..e90e99b 100644
--- a/doc/stdlibref/A-3.html
+++ b/doc/stdlibref/A-3.html
@@ -1,11 +1,11 @@
 <HTML>
 <HEAD>
 <TITLE>Implementation Classes</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="A-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="B.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>A.3 Implementation Classes</H2>
-<P>In the Rogue Wave C++ Standard Library Module, the names of entities that start with two underscores refer to implementation details. They are workarounds for missing library facilities, caused by the lack of compiler support, and are not meant to be used by client code. These entities, without the underscore notation, were part of the original Hewlett-Packard Standard Template Library implementation, but were not ratified as part of the C++ Standard. They are documented in <A HREF="III.html">Part&nbsp;III, "Obsolete Classes Reference,"</A> but we do not encourage their use.</P>
+<P>In the Apache C++ Standard Library, the names of entities that start with two underscores refer to implementation details. They are workarounds for missing library facilities, caused by the lack of compiler support, and are not meant to be used by client code. These entities, without the underscore notation, were part of the original Hewlett-Packard Standard Template Library implementation, but were not ratified as part of the C++ Standard. They are documented in <A HREF="III.html">Part&nbsp;III, "Obsolete Classes Reference,"</A> but we do not encourage their use.</P>
 
 
 <BR>
diff --git a/doc/stdlibref/A.html b/doc/stdlibref/A.html
index 4f37b73..08e455b 100644
--- a/doc/stdlibref/A.html
+++ b/doc/stdlibref/A.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Implementation Details</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="IV.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="A-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H1>Appendix A: Implementation Details</H1>
diff --git a/doc/stdlibref/B.html b/doc/stdlibref/B.html
index 1703556..c40dfdc 100644
--- a/doc/stdlibref/B.html
+++ b/doc/stdlibref/B.html
@@ -1,16 +1,15 @@
 <HTML>
 <HEAD>
-<TITLE>Rogue Wave Extensions to the Standard</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<TITLE>Extensions to the C++ Standard</TITLE>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="A-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><IMG SRC="images/bnonext.gif" WIDTH=25 HEIGHT=21 ALT="No next file" BORDER=O><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
-<H1>Appendix B: Rogue Wave Extensions to the Standard</H1>
+<H1>Appendix B: Extensions to the C++ Standard</H1>
 <UL>
 
 </UL>
-<P>This Rogue Wave implementation of the C++ Standard Library contains numerous features that enhance its functionality, but do not strictly conform to the Standard as it is written. These  extensions are listed in <A HREF="B.html#Table&nbsp;39">Table&nbsp;39</A>. If you are reading this manual online, click the name of the extension to take you to its location in the documentation. </P>
-<P>If you are using the Rogue Wave Configuration and Build Model (RCB), you can build the C++ Standard Library with or without these Rogue Wave extensions. See the RCB documentation. </P>
-<H4><A NAME="Table&nbsp;39">Table&nbsp;39: Rogue Wave extensions to the C++ Standard Library&nbsp;</A></H4>
+<P>This implementation of the C++ Standard Library contains numerous features that enhance its functionality, but do not strictly conform to the Standard as it is written. These  extensions are listed in <A HREF="B.html#Table&nbsp;39">Table&nbsp;39</A>. If you are reading this manual online, click the name of the extension to take you to its location in the documentation. </P>
+<H4><A NAME="Table&nbsp;39">Table&nbsp;39: Extensions to the C++ Standard Library&nbsp;</A></H4>
 <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="3">
 <tr><td valign=top><B>Class or </B>
 <B>Component</B>
diff --git a/doc/stdlibref/I.html b/doc/stdlibref/I.html
index f8bdae9..07a3692 100644
--- a/doc/stdlibref/I.html
+++ b/doc/stdlibref/I.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Introduction</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <IMG SRC="images/bnoprev.gif" WIDTH=20 HEIGHT=21 ALT="No previous file" BORDER=O><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H1>Part I: Introduction</H1>
diff --git a/doc/stdlibref/II.html b/doc/stdlibref/II.html
index 4dbff26..be68410 100644
--- a/doc/stdlibref/II.html
+++ b/doc/stdlibref/II.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Reference</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="2-11.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="accumulate.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H1>Part II: Reference</H1>
diff --git a/doc/stdlibref/III.html b/doc/stdlibref/III.html
index 4ba6aba..3a2326a 100644
--- a/doc/stdlibref/III.html
+++ b/doc/stdlibref/III.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Obsolete Classes Reference</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="wstring.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="--distance-type.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H1>Part III: Obsolete Classes Reference</H1>
diff --git a/doc/stdlibref/IV.html b/doc/stdlibref/IV.html
index 27ef482..8b0821b 100644
--- a/doc/stdlibref/IV.html
+++ b/doc/stdlibref/IV.html
@@ -1,13 +1,13 @@
 <HTML>
 <HEAD>
 <TITLE>Appendixes</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="--iterator-category.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="A.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H1>Part IV: Appendixes</H1>
 <H2>Appendices in This Part</H2>
 <H3><A HREF="A.html">Appendix A: Implementation Details</A></H3>
-<H3><A HREF="B.html">Appendix B: Rogue Wave Extensions to the Standard</A></H3>
+<H3><A HREF="B.html">Appendix B: Extensions to the C++ Standard</A></H3>
 
 <BR>
 <HR>
diff --git a/doc/stdlibref/accumulate.html b/doc/stdlibref/accumulate.html
index 79a07a0..f8b6a79 100644
--- a/doc/stdlibref/accumulate.html
+++ b/doc/stdlibref/accumulate.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>accumulate()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="II.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="adjacent-difference.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>accumulate()</H2>
diff --git a/doc/stdlibref/acknow.html b/doc/stdlibref/acknow.html
index 4079057..3cdf318 100644
--- a/doc/stdlibref/acknow.html
+++ b/doc/stdlibref/acknow.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Acknowledgments</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <IMG SRC="images/bnoprev.gif" WIDTH=20 HEIGHT=21 ALT="No previous file" BORDER=O><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><IMG SRC="images/bnonext.gif" WIDTH=25 HEIGHT=21 ALT="No next file" BORDER=O><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <P><EMPHASIS ROLE="bold">SourcePro Core Product Team</EMPHASIS>: Tim Adams, Andrew Black, Jeremy Dean, Erin Foley, Keith Hoaglin, Ravi Inampudi, Amit Jindal, Dennis Kennedy, Shannon Lewis, Liviu Nicoara, Martin Sebor, Nikki Sharma, Marcia Steele, Giai Truong</P><P><EMPHASIS ROLE="bold">Original C++ Standard Library Module Team</EMPHASIS>: Timothy Budd, Anna Dahan, Kevin Djang, Donald Fowler, Marlene Hart, Angelika Langer, Phillipe LeMouel, Wendi Minne, Rodney Mishima, Tom Pearson, Randi Prince, Randall Robinson, Randy Smithey, Chun Zhang</P>
diff --git a/doc/stdlibref/adjacent-difference.html b/doc/stdlibref/adjacent-difference.html
index a3bfe01..f9d1293 100644
--- a/doc/stdlibref/adjacent-difference.html
+++ b/doc/stdlibref/adjacent-difference.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>adjacent_difference()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="accumulate.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="adjacent-find.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>adjacent_difference()</H2>
diff --git a/doc/stdlibref/adjacent-find.html b/doc/stdlibref/adjacent-find.html
index 5dee25a..6e156e5 100644
--- a/doc/stdlibref/adjacent-find.html
+++ b/doc/stdlibref/adjacent-find.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>adjacent_find()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="adjacent-difference.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="advance.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>adjacent_find()</H2>
diff --git a/doc/stdlibref/advance.html b/doc/stdlibref/advance.html
index 542c551..b523cb3 100644
--- a/doc/stdlibref/advance.html
+++ b/doc/stdlibref/advance.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>advance()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="adjacent-find.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="algorithm-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>advance()</H2>
diff --git a/doc/stdlibref/algorithm-h.html b/doc/stdlibref/algorithm-h.html
index 7ee2d8b..9a5592c 100644
--- a/doc/stdlibref/algorithm-h.html
+++ b/doc/stdlibref/algorithm-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;algorithm&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="advance.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="algorithms.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;algorithm&gt;</H2>
diff --git a/doc/stdlibref/algorithms.html b/doc/stdlibref/algorithms.html
index 91f8809..c22cdc1 100644
--- a/doc/stdlibref/algorithms.html
+++ b/doc/stdlibref/algorithms.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Algorithms</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="algorithm-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="allocator.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>Algorithms</H2>
diff --git a/doc/stdlibref/allocator.html b/doc/stdlibref/allocator.html
index 3479863..dc2d1d8 100644
--- a/doc/stdlibref/allocator.html
+++ b/doc/stdlibref/allocator.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>allocator</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="algorithms.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="associativecontainers.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>allocator</H2>
diff --git a/doc/stdlibref/associativecontainers.html b/doc/stdlibref/associativecontainers.html
index 9312792..fdfa830 100644
--- a/doc/stdlibref/associativecontainers.html
+++ b/doc/stdlibref/associativecontainers.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Associative Containers</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="allocator.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="auto-ptr.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>Associative Containers</H2>
diff --git a/doc/stdlibref/auto-ptr.html b/doc/stdlibref/auto-ptr.html
index 8334afd..f16e7e1 100644
--- a/doc/stdlibref/auto-ptr.html
+++ b/doc/stdlibref/auto-ptr.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>auto_ptr</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="associativecontainers.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="back-insert-iterator.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>auto_ptr</H2>
diff --git a/doc/stdlibref/back-insert-iterator.html b/doc/stdlibref/back-insert-iterator.html
index 864bada..46f474e 100644
--- a/doc/stdlibref/back-insert-iterator.html
+++ b/doc/stdlibref/back-insert-iterator.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>back_insert_iterator, back_inserter()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="auto-ptr.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="bad-alloc.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>back_insert_iterator, back_inserter()</H2>
diff --git a/doc/stdlibref/bad-alloc.html b/doc/stdlibref/bad-alloc.html
index f19d877..c2e4afe 100644
--- a/doc/stdlibref/bad-alloc.html
+++ b/doc/stdlibref/bad-alloc.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>bad_alloc</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="back-insert-iterator.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="bad-cast.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>bad_alloc</H2>
diff --git a/doc/stdlibref/bad-cast.html b/doc/stdlibref/bad-cast.html
index 93cf4fd..570ef49 100644
--- a/doc/stdlibref/bad-cast.html
+++ b/doc/stdlibref/bad-cast.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>bad_cast</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="bad-alloc.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="bad-exception.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>bad_cast</H2>
diff --git a/doc/stdlibref/bad-exception.html b/doc/stdlibref/bad-exception.html
index a88e110..b532989 100644
--- a/doc/stdlibref/bad-exception.html
+++ b/doc/stdlibref/bad-exception.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>bad_exception</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="bad-cast.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="bad-typeid.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>bad_exception</H2>
diff --git a/doc/stdlibref/bad-typeid.html b/doc/stdlibref/bad-typeid.html
index 91c0071..978e4a6 100644
--- a/doc/stdlibref/bad-typeid.html
+++ b/doc/stdlibref/bad-typeid.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>bad_typeid</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="bad-exception.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="basic-filebuf.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>bad_typeid</H2>
diff --git a/doc/stdlibref/basic-filebuf.html b/doc/stdlibref/basic-filebuf.html
index db60767..d9fb9fa 100644
--- a/doc/stdlibref/basic-filebuf.html
+++ b/doc/stdlibref/basic-filebuf.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>basic_filebuf</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="bad-typeid.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="basic-fstream.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>basic_filebuf</H2>
@@ -207,7 +207,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- This function is not part of the C++ Standard, but is included here as an extension to manipulate pipes, sockets, or other UNIX devices that can be accessed through file descriptors. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions.
+NOTE -- This function is not part of the C++ Standard, but is included here as an extension to manipulate pipes, sockets, or other UNIX devices that can be accessed through file descriptors. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx49"></A><PRE><B>basic_filebuf</B>(FILE *fp, char_type *buf = 0, 
@@ -217,7 +217,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- This function is not part of the C++ Standard, but is included here as an extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions.
+NOTE -- This function is not part of the C++ Standard, but is included here as an extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 <A NAME="sec9"><H3>Destructors</H3></A>
 
@@ -235,7 +235,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- <B>This function is not part of the C++ Standard, but is provided as an extension of this implementation for compatibility with Classic Iostreams. See </B><A HREF="B.html">Appendix&nbsp;B</A><B> for a complete list of Rogue </B>Wave extensions.
+NOTE -- <B>This function is not part of the C++ Standard, but is provided as an extension of this implementation for compatibility with Classic Iostreams. See </B><A HREF="B.html">Appendix&nbsp;B</A><B> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx52"></A><PRE>
@@ -259,7 +259,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- <B>This function is not part of the C++ Standard, but is provided as an extension of this implementation for compatibility with Classic </B><B><I>Iostreams</I></B><B>. See </B><A HREF="B.html">Appendix&nbsp;B</A><B> for a complete list of Rogue </B>Wave extensions.
+NOTE -- <B>This function is not part of the C++ Standard, but is provided as an extension of this implementation for compatibility with Classic </B><B><I>Iostreams</I></B><B>. See </B><A HREF="B.html">Appendix&nbsp;B</A><B> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx54"></A><PRE>bool 
@@ -278,7 +278,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- The behavior of the function when <SAMP>(fname == 0)</SAMP> evaluates to true is not required by the C++ Standard, but is provided as an extension of this implementation. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions. 
+NOTE -- The behavior of the function when <SAMP>(fname == 0)</SAMP> evaluates to true is not required by the C++ Standard, but is provided as an extension of this implementation. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation. 
 </B><HR></BLOCKQUOTE>
 <UL>
 <P>The file open modes are given by their C-equivalent descriptions (see the C function <SAMP>fopen()</SAMP>). They are:</P>
@@ -304,7 +304,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- The protection argument does not appear in the C++ Standard, but is included here as an extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions.
+NOTE -- The protection argument does not appear in the C++ Standard, but is included here as an extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx56"></A><PRE>basic_filebuf&lt;charT,traits&gt;*
@@ -315,7 +315,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- This function is not part of the C++ Standard, but is included here as an extension in order to manipulate pipes, sockets, or other UNIX devices that can be accessed through file descriptors. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions.
+NOTE -- This function is not part of the C++ Standard, but is included here as an extension in order to manipulate pipes, sockets, or other UNIX devices that can be accessed through file descriptors. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx57"></A><PRE>basic_filebuf&lt;charT,traits&gt;*
@@ -326,7 +326,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- This function is not part of the C++ Standard, but is provided as a convenience extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions.
+NOTE -- This function is not part of the C++ Standard, but is provided as a convenience extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx58"></A><PRE>int_type 
diff --git a/doc/stdlibref/basic-fstream.html b/doc/stdlibref/basic-fstream.html
index 0aae276..a6a74b9 100644
--- a/doc/stdlibref/basic-fstream.html
+++ b/doc/stdlibref/basic-fstream.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>basic_fstream</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="basic-filebuf.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="basic-ifstream.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>basic_fstream</H2>
@@ -195,7 +195,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- The protection argument is not part of the C++ Standard, but is included here as a convenience extension. See <A HREF="B.html">Appendix&nbsp;B</A> for  a complete list of Rogue Wave extensions.
+NOTE -- The protection argument is not part of the C++ Standard, but is included here as a convenience extension. See <A HREF="B.html">Appendix&nbsp;B</A> for  a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx76"></A><PRE><B>basic_fstream</B>(int fd, char_type *buf, streamsize n); </PRE>
@@ -208,7 +208,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- This function is not part of the C++ Standard, but is included here as an extension in order to manipulate pipes, sockets, or other UNIX devices that can be accessed through file descriptors. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions.
+NOTE -- This function is not part of the C++ Standard, but is included here as an extension in order to manipulate pipes, sockets, or other UNIX devices that can be accessed through file descriptors. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx77"></A><PRE><B>basic_fstream</B>(FILE *fp, char_type* buf, streamsize n); </PRE>
@@ -221,7 +221,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- This function is not part of the C++ Standard, but is provided here as a convenience extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions. 
+NOTE -- This function is not part of the C++ Standard, but is provided here as a convenience extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation. 
 </B><HR></BLOCKQUOTE>
 <A NAME="sec9"><H3>Destructors</H3></A>
 
@@ -246,7 +246,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- This function is not part of the C++ Standard, but is provided here as a convenience extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions.
+NOTE -- This function is not part of the C++ Standard, but is provided here as a convenience extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx81"></A><PRE>bool 
@@ -273,7 +273,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- The protection argument does not appear in the C++ Standard C++, but is included here as a convenience extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions.
+NOTE -- The protection argument does not appear in the C++ Standard C++, but is included here as a convenience extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx84"></A><PRE>void 
@@ -284,7 +284,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- This function is not part of the C++ Standard, but is provided here as a convenience extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions.
+NOTE -- This function is not part of the C++ Standard, but is provided here as a convenience extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx85"></A><PRE>void 
@@ -296,7 +296,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- This function is not part of the C++ Standard, but is provided here as a convenience extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions.
+NOTE -- This function is not part of the C++ Standard, but is provided here as a convenience extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx86"></A><PRE>basic_filebuf&lt;charT_type,traits_type&gt;* 
diff --git a/doc/stdlibref/basic-ifstream.html b/doc/stdlibref/basic-ifstream.html
index fce4f9c..0c4f758 100644
--- a/doc/stdlibref/basic-ifstream.html
+++ b/doc/stdlibref/basic-ifstream.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>basic_ifstream</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="basic-fstream.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="basic-ios.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>basic_ifstream</H2>
@@ -178,7 +178,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- This function is not part of the C++ Standard, but is included here as a convenience extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions.
+NOTE -- This function is not part of the C++ Standard, but is included here as a convenience extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx97"></A><PRE><B>basic_ifstream</B>(int fd, char_type *buf, streamsize n); </PRE>
@@ -187,7 +187,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- This function is not part of the C++ Standard, but is included here as an extension in order to manipulate pipes, sockets, or other UNIX devices that can be accessed through file descriptors. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions.
+NOTE -- This function is not part of the C++ Standard, but is included here as an extension in order to manipulate pipes, sockets, or other UNIX devices that can be accessed through file descriptors. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx98"></A><PRE><B>basic_ifstream</B>(FILE *fp, char_type* buf, streamsize n); </PRE>
@@ -196,7 +196,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- This function is not part of the C++ Standard, but is provided here as a convenience extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions.
+NOTE -- This function is not part of the C++ Standard, but is provided here as a convenience extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 <A NAME="sec9"><H3>Member Functions</H3></A>
 
@@ -228,7 +228,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- The third argument, protection, is not part of the C++ Standard, but is provided here as an extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions to the Standard.
+NOTE -- The third argument, protection, is not part of the C++ Standard, but is provided here as an extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation to the Standard.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx103"></A><PRE>void 
@@ -239,7 +239,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- This function is not part of the C++ Standard, but is provided here as an extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions.
+NOTE -- This function is not part of the C++ Standard, but is provided here as an extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx104"></A><PRE>void 
@@ -250,7 +250,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- This function is not part of the C++ Standard, but is provided here as an extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions.
+NOTE -- This function is not part of the C++ Standard, but is provided here as an extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx105"></A><PRE>basic_filebuf&lt;charT,traits&gt;* 
diff --git a/doc/stdlibref/basic-ios.html b/doc/stdlibref/basic-ios.html
index 9726875..6f02459 100644
--- a/doc/stdlibref/basic-ios.html
+++ b/doc/stdlibref/basic-ios.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>basic_ios</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="basic-ifstream.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="basic-iostream.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>basic_ios</H2>
diff --git a/doc/stdlibref/basic-iostream.html b/doc/stdlibref/basic-iostream.html
index 4bc7eae..267e3d2 100644
--- a/doc/stdlibref/basic-iostream.html
+++ b/doc/stdlibref/basic-iostream.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>basic_iostream</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="basic-ios.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="basic-istream.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>basic_iostream</H2>
diff --git a/doc/stdlibref/basic-istream.html b/doc/stdlibref/basic-istream.html
index 11d92bc..6ed6200 100644
--- a/doc/stdlibref/basic-istream.html
+++ b/doc/stdlibref/basic-istream.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>basic_istream</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="basic-iostream.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="basic-istringstream.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>basic_istream</H2>
diff --git a/doc/stdlibref/basic-istringstream.html b/doc/stdlibref/basic-istringstream.html
index 39507f4..06dbdd5 100644
--- a/doc/stdlibref/basic-istringstream.html
+++ b/doc/stdlibref/basic-istringstream.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>basic_istringstream</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="basic-istream.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="basic-ofstream.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>basic_istringstream</H2>
diff --git a/doc/stdlibref/basic-ofstream.html b/doc/stdlibref/basic-ofstream.html
index ee31078..caa7e01 100644
--- a/doc/stdlibref/basic-ofstream.html
+++ b/doc/stdlibref/basic-ofstream.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>basic_ofstream</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="basic-istringstream.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="basic-ostream.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>basic_ofstream</H2>
@@ -194,7 +194,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- This function is not part of the C++ Standard, but is included here as an extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions.
+NOTE -- This function is not part of the C++ Standard, but is included here as an extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx212"></A><PRE><B>basic_ofstream</B>(int fd, char_type *buf, streamsize n); </PRE>
@@ -207,7 +207,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- This function is not part of the C++ Standard, but is included here as an extension in order to manipulate pipes, sockets, or other UNIX devices that can be accessed through file descriptors. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions.
+NOTE -- This function is not part of the C++ Standard, but is included here as an extension in order to manipulate pipes, sockets, or other UNIX devices that can be accessed through file descriptors. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx213"></A><PRE><B>basic_ofstream</B>(FILE *fp, char_type* buf, streamsize n); </PRE>
@@ -220,7 +220,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- This function is not part of the C++ Standard, but is provided here as an extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions.
+NOTE -- This function is not part of the C++ Standard, but is provided here as an extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 <A NAME="sec9"><H3>Member Functions</H3></A>
 
@@ -252,7 +252,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- This function does not appear in the C++ Standard, but is included here as an extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions.
+NOTE -- This function does not appear in the C++ Standard, but is included here as an extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx218"></A><PRE>void 
@@ -263,7 +263,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- This function is not part of the C++ Standard, but is provided here as an extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions.
+NOTE -- This function is not part of the C++ Standard, but is provided here as an extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx219"></A><PRE>void 
@@ -274,7 +274,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- This function is not part of the C++ Standard, but is provided here as a convenience extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions.
+NOTE -- This function is not part of the C++ Standard, but is provided here as a convenience extension. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx220"></A><PRE>basic_filebuf&lt;charT,traits&gt;* 
diff --git a/doc/stdlibref/basic-ostream.html b/doc/stdlibref/basic-ostream.html
index 262b222..15ad84a 100644
--- a/doc/stdlibref/basic-ostream.html
+++ b/doc/stdlibref/basic-ostream.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>basic_ostream</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="basic-ofstream.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="basic-ostringstream.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>basic_ostream</H2>
diff --git a/doc/stdlibref/basic-ostringstream.html b/doc/stdlibref/basic-ostringstream.html
index f6c0ba7..1f25401 100644
--- a/doc/stdlibref/basic-ostringstream.html
+++ b/doc/stdlibref/basic-ostringstream.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>basic_ostringstream</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="basic-ostream.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="basic-streambuf.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>basic_ostringstream</H2>
diff --git a/doc/stdlibref/basic-streambuf.html b/doc/stdlibref/basic-streambuf.html
index a9446fb..899ac79 100644
--- a/doc/stdlibref/basic-streambuf.html
+++ b/doc/stdlibref/basic-streambuf.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>basic_streambuf</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="basic-ostringstream.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="basic-string.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>basic_streambuf</H2>
diff --git a/doc/stdlibref/basic-string.html b/doc/stdlibref/basic-string.html
index 577385e..b1ce921 100644
--- a/doc/stdlibref/basic-string.html
+++ b/doc/stdlibref/basic-string.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>basic_string</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="basic-streambuf.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="basic-stringbuf.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>basic_string</H2>
diff --git a/doc/stdlibref/basic-stringbuf.html b/doc/stdlibref/basic-stringbuf.html
index a878d5c..5f87c67 100644
--- a/doc/stdlibref/basic-stringbuf.html
+++ b/doc/stdlibref/basic-stringbuf.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>basic_stringbuf</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="basic-string.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="basic-stringstream.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>basic_stringbuf</H2>
diff --git a/doc/stdlibref/basic-stringstream.html b/doc/stdlibref/basic-stringstream.html
index 3a0b650..f8b1903 100644
--- a/doc/stdlibref/basic-stringstream.html
+++ b/doc/stdlibref/basic-stringstream.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>basic_stringstream</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="basic-stringbuf.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="bidirectionaliterators.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>basic_stringstream</H2>
diff --git a/doc/stdlibref/bidirectionaliterators.html b/doc/stdlibref/bidirectionaliterators.html
index 855b9d0..3480469 100644
--- a/doc/stdlibref/bidirectionaliterators.html
+++ b/doc/stdlibref/bidirectionaliterators.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Bidirectional Iterators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="basic-stringstream.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="binary-function.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>Bidirectional Iterators</H2>
diff --git a/doc/stdlibref/binary-function.html b/doc/stdlibref/binary-function.html
index d3610a3..a17b5ba 100644
--- a/doc/stdlibref/binary-function.html
+++ b/doc/stdlibref/binary-function.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>binary_function</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="bidirectionaliterators.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="binary-negate.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>binary_function</H2>
diff --git a/doc/stdlibref/binary-negate.html b/doc/stdlibref/binary-negate.html
index ea05dbf..ea739e0 100644
--- a/doc/stdlibref/binary-negate.html
+++ b/doc/stdlibref/binary-negate.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>binary_negate</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="binary-function.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="binary-search.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>binary_negate</H2>
diff --git a/doc/stdlibref/binary-search.html b/doc/stdlibref/binary-search.html
index 13109b5..baaa1ad 100644
--- a/doc/stdlibref/binary-search.html
+++ b/doc/stdlibref/binary-search.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>binary_search()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="binary-negate.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="bind1st.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>binary_search()</H2>
diff --git a/doc/stdlibref/bind1st.html b/doc/stdlibref/bind1st.html
index 1f22b02..dbd01f0 100644
--- a/doc/stdlibref/bind1st.html
+++ b/doc/stdlibref/bind1st.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>bind1st(), bind2nd(), binder1st, binder2nd</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="binary-search.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="bitmasktypes.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>bind1st(), bind2nd(), binder1st, binder2nd</H2>
diff --git a/doc/stdlibref/bitmasktypes.html b/doc/stdlibref/bitmasktypes.html
index 2272c7d..4732ca1 100644
--- a/doc/stdlibref/bitmasktypes.html
+++ b/doc/stdlibref/bitmasktypes.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Bitmask Types</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="bind1st.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="bitset.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>Bitmask Types</H2>
diff --git a/doc/stdlibref/bitset.html b/doc/stdlibref/bitset.html
index 5131c18..e9f437a 100644
--- a/doc/stdlibref/bitset.html
+++ b/doc/stdlibref/bitset.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>bitset</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="bitmasktypes.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="cerr.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>bitset</H2>
diff --git a/doc/stdlibref/booktoc.html b/doc/stdlibref/booktoc.html
index c894b5c..78c5b8d 100644
--- a/doc/stdlibref/booktoc.html
+++ b/doc/stdlibref/booktoc.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Alphabetical List of Descriptions</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <IMG SRC="images/bnoprev.gif" WIDTH=20 HEIGHT=21 ALT="No previous file" BORDER=O><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><IMG SRC="images/bnotoc.gif" WIDTH=56 HEIGHT=21 ALT="No link" BORDER=O><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><IMG SRC="images/bnonext.gif" WIDTH=25 HEIGHT=21 ALT="No next file" BORDER=O><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H1>Alphabetical List of Descriptions</H1>
diff --git a/doc/stdlibref/cerr.html b/doc/stdlibref/cerr.html
index ed17175..e2cde8d 100644
--- a/doc/stdlibref/cerr.html
+++ b/doc/stdlibref/cerr.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>cerr</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="bitset.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="char-traits.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>cerr</H2>
diff --git a/doc/stdlibref/char-traits.html b/doc/stdlibref/char-traits.html
index abe4434..3885f6b 100644
--- a/doc/stdlibref/char-traits.html
+++ b/doc/stdlibref/char-traits.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>char_traits</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="cerr.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="cin.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>char_traits</H2>
diff --git a/doc/stdlibref/cin.html b/doc/stdlibref/cin.html
index 4351cc0..a81070c 100644
--- a/doc/stdlibref/cin.html
+++ b/doc/stdlibref/cin.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>cin</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="char-traits.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="clog.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>cin</H2>
diff --git a/doc/stdlibref/clog.html b/doc/stdlibref/clog.html
index 7d63e61..267105d 100644
--- a/doc/stdlibref/clog.html
+++ b/doc/stdlibref/clog.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>clog</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="cin.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="codecvt.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>clog</H2>
diff --git a/doc/stdlibref/codecvt-byname.html b/doc/stdlibref/codecvt-byname.html
index 3df9b79..6fb3111 100644
--- a/doc/stdlibref/codecvt-byname.html
+++ b/doc/stdlibref/codecvt-byname.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>codecvt_byname</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="codecvt.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="collate.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>codecvt_byname</H2>
@@ -116,7 +116,7 @@
 <LI><P CLASS="LIST">A special name such as <SAMP>german</SAMP>, or <SAMP>french</SAMP>, that may be used as an alias for a canonical locale name. Such names may be provided as a convenience on some platforms and usually refer to the most common canonical locale provided by the platform. For example, <SAMP>german</SAMP> may be the equivalent of de_DE.ISO-8859-1, or <SAMP>french</SAMP> may be the equivalent of fr_FR.ISO-8859-15, and so on. Portable code should not rely on these names. </P></LI>
 </UL>
 <P>If the <SAMP>codeset</SAMP> component is provided, the <SAMP>language</SAMP> and <SAMP>territory</SAMP> components are optional and allowed only for compatibility with the format of locale names accepted by the class locale constructors, as the facet only makes use of the codeset and encoding information.</P>
-<P><A HREF="codecvt-byname.html#Table&nbsp;15">Table&nbsp;15</A> lists the names of some of the supported common codesets. The names match those assigned by IANA (see <SAMP>http://www.iana.org/assignments/character-sets</SAMP>). For a complete list of supported codesets, see the contents of the <SAMP>nls/charmaps/</SAMP> directory in the distribution of the Rogue Wave C++ Standard Library Module.   </P>
+<P><A HREF="codecvt-byname.html#Table&nbsp;15">Table&nbsp;15</A> lists the names of some of the supported common codesets. The names match those assigned by IANA (see <SAMP>http://www.iana.org/assignments/character-sets</SAMP>). For a complete list of supported codesets, see the contents of the <SAMP>nls/charmaps/</SAMP> directory in the distribution of this implementation of the C++ Standard Library.   </P>
 <H4><A NAME="Table&nbsp;15">Table&nbsp;15: Supported common codesets</A></H4>
 <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="3">
 <tr><td valign=top><B>Name</B>
@@ -231,7 +231,7 @@
 </tr>
 </TABLE>
 <BLOCKQUOTE><HR><B>
-NOTE -- The behavior of the facet member functions relies on the availability of locale database files produced by the Rogue Wave localedef utility from the <I>character set description files</I> shipped with the Rogue Wave implementation of the C++ Standard Library Module (or their equivalents). In particular, the functionality for ISO-2022-JP is dependent on the ANSI_X3.4-1968 and EUC-JP encodings, while ISO-2022-JP-2 is dependent on ANSI_X3.4-1968, EUC-JP, EUC-KR, GB2312, ISO-8859-1 and ISO-8859-7 encodings. The appropriate databases are produced automatically whenever a locale that uses such an encoding is built. For example, the codecvt encoding database for EUC-JP is built whenever the Japanese locale ja_JP.EUC-JP is built. It is also possible to create the databases by providing a dummy (empty) locale definition file and process it with the character set description file corresponding to the desired codecvt database. The facet's member functions indicate an error by returning codecvt_base::error if the database required to perform a given conversion is not found. 
+NOTE -- The behavior of the facet member functions relies on the availability of locale database files produced by the localedef utility provided with this implementation from the <I>character set description files</I> shipped with this implementation of the C++ Standard Library (or their equivalents). In particular, the functionality for ISO-2022-JP is dependent on the ANSI_X3.4-1968 and EUC-JP encodings, while ISO-2022-JP-2 is dependent on ANSI_X3.4-1968, EUC-JP, EUC-KR, GB2312, ISO-8859-1 and ISO-8859-7 encodings. The appropriate databases are produced automatically whenever a locale that uses such an encoding is built. For example, the codecvt encoding database for EUC-JP is built whenever the Japanese locale ja_JP.EUC-JP is built. It is also possible to create the databases by providing a dummy (empty) locale definition file and process it with the character set description file corresponding to the desired codecvt database. The facet's member functions indicate an error by returning codecvt_base::error if the database required to perform a given conversion is not found. 
 </B><HR></BLOCKQUOTE>
 <A NAME="sec8"><H3>Protected Members</H3></A>
 
diff --git a/doc/stdlibref/codecvt.html b/doc/stdlibref/codecvt.html
index 2f9d8dc..d58127d 100644
--- a/doc/stdlibref/codecvt.html
+++ b/doc/stdlibref/codecvt.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>codecvt</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="clog.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="codecvt-byname.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>codecvt</H2>
@@ -289,6 +289,9 @@
 <LI><P CLASS="LIST"><SAMP>state</SAMP> is either initialized to the beginning of a sequence or equal to the result of the previous conversion on the sequence. </P></LI>
 <LI><P CLASS="LIST"><SAMP>(from &lt;= end)</SAMP> is well-defined and true. </P></LI>
 </UL>
+<UL>
+<P>Note that this function does not behave similarly to the C Standard Library function <SAMP>mbsrtowcs()</SAMP>. See the <SAMP><A HREF="http://svn.apache.org/repos/asf/incubator/stdcxx/trunk/examples/manual/mbsrtowcs.cpp">mbsrtowcs.cpp</A></SAMP> example program for an implementation of this function using the <SAMP>codecvt</SAMP> facet.</P>
+</UL>
 
 <A NAME="idx487"></A><PRE>
 virtual int 
diff --git a/doc/stdlibref/collate.html b/doc/stdlibref/collate.html
index a6f1920..a50240b 100644
--- a/doc/stdlibref/collate.html
+++ b/doc/stdlibref/collate.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>collate, collate_byname</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="codecvt-byname.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="compare.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>collate, collate_byname</H2>
diff --git a/doc/stdlibref/compare.html b/doc/stdlibref/compare.html
index c6f8518..b013c22 100644
--- a/doc/stdlibref/compare.html
+++ b/doc/stdlibref/compare.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>compare</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="collate.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="complex-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>compare</H2>
diff --git a/doc/stdlibref/complex-h.html b/doc/stdlibref/complex-h.html
index c1b1973..c4b39d5 100644
--- a/doc/stdlibref/complex-h.html
+++ b/doc/stdlibref/complex-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;complex&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="compare.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="complex.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;complex&gt;</H2>
diff --git a/doc/stdlibref/complex.html b/doc/stdlibref/complex.html
index bc29a53..806576e 100644
--- a/doc/stdlibref/complex.html
+++ b/doc/stdlibref/complex.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>complex</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="complex-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="containers.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>complex</H2>
diff --git a/doc/stdlibref/contact.html b/doc/stdlibref/contact.html
index 09fbe83..21b12dd 100644
--- a/doc/stdlibref/contact.html
+++ b/doc/stdlibref/contact.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Contacting Rogue Wave</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet">
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet">
 </HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="../../index.html"><IMG SRC="images/banner.gif" ALT="Rogue Wave banner" WIDTH=405 HEIGHT=57 BORDER=0></A><br>
diff --git a/doc/stdlibref/containers.html b/doc/stdlibref/containers.html
index e11e2f4..4c37721 100644
--- a/doc/stdlibref/containers.html
+++ b/doc/stdlibref/containers.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Containers</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="complex.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="copy.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>Containers</H2>
diff --git a/doc/stdlibref/copy.html b/doc/stdlibref/copy.html
index 5698fd3..9047d51 100644
--- a/doc/stdlibref/copy.html
+++ b/doc/stdlibref/copy.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>copy(), copy_backward()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="containers.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="count.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>copy(), copy_backward()</H2>
diff --git a/doc/stdlibref/copyright.html b/doc/stdlibref/copyright.html
index 374159f..3661ab5 100644
--- a/doc/stdlibref/copyright.html
+++ b/doc/stdlibref/copyright.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Copyright Information</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="../../index.html"><IMG SRC="images/banner.gif" WIDTH=405 HEIGHT=57 ALT="Rogue Wave banner" BORDER=0></A><BR>
 <IMG SRC="images/noprev.gif" WIDTH=20 HEIGHT=21 ALT="No previous file" BORDER=O><A HREF="noframes.html"><IMG SRC="images/top.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/toc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/index.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><IMG SRC="images/nonext.gif" WIDTH=25 HEIGHT=21 ALT="No next file" BORDER=O><A HREF="../../index.html"><IMG SRC="images/blank.gif" WIDTH=56 HEIGHT=21 BORDER=O><IMG SRC="images/end.gif" WIDTH=136 HEIGHT=21 BORDER=O></A>
diff --git a/doc/stdlibref/count.html b/doc/stdlibref/count.html
index 852f6f4..6200168 100644
--- a/doc/stdlibref/count.html
+++ b/doc/stdlibref/count.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>count(), count_if()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="copy.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="cout.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>count(), count_if()</H2>
@@ -49,7 +49,7 @@
 </PRE>
 <A NAME="sec4"><H3>Description</H3></A>
 <BLOCKQUOTE><HR><B>
-NOTE -- The second versions of the count() and count_if() functions are not part of the C++ Standard, but are included here as extensions for compatibility purposes. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of Rogue Wave extensions.
+NOTE -- The second versions of the count() and count_if() functions are not part of the C++ Standard, but are included here as extensions for compatibility purposes. See <A HREF="B.html">Appendix&nbsp;B</A> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 <P>The <SAMP>count()</SAMP> algorithm compares <SAMP>value</SAMP> to elements in the sequence defined by iterators <SAMP>start</SAMP> and <SAMP>finish</SAMP>. The first version of <SAMP>count()</SAMP> returns the number of matches. The second version, which is provided for backwards compatibility or as an alternative to the first in case the template <B><I><A HREF="iterator-traits.html">iterator_traits</A></I></B> isn't provided, increments a counting value <SAMP>n</SAMP> each time it finds a match. In other words, <SAMP>count()</SAMP> returns (or adds to <SAMP>n</SAMP>) the number of iterators <SAMP>i</SAMP> in the range <SAMP>[start, finish)</SAMP> for which the following condition holds:</P>
 <P><SAMP>*i == value</SAMP></P>
diff --git a/doc/stdlibref/cout.html b/doc/stdlibref/cout.html
index 27b68bf..cc5118b 100644
--- a/doc/stdlibref/cout.html
+++ b/doc/stdlibref/cout.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>cout</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="count.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="ctype.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>cout</H2>
diff --git a/doc/stdlibref/ctype-byname.html b/doc/stdlibref/ctype-byname.html
index 5e12c3e..7182c45 100644
--- a/doc/stdlibref/ctype-byname.html
+++ b/doc/stdlibref/ctype-byname.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>ctype_byname</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="ctype.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="deque-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>ctype_byname</H2>
diff --git a/doc/stdlibref/ctype.html b/doc/stdlibref/ctype.html
index bb82b59..7eb8e84 100644
--- a/doc/stdlibref/ctype.html
+++ b/doc/stdlibref/ctype.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>ctype</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="cout.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="ctype-byname.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>ctype</H2>
diff --git a/doc/stdlibref/deque-h.html b/doc/stdlibref/deque-h.html
index b5fb4c6..8d8ad47 100644
--- a/doc/stdlibref/deque-h.html
+++ b/doc/stdlibref/deque-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;deque&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="ctype-byname.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="deque.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;deque&gt;</H2>
diff --git a/doc/stdlibref/deque.html b/doc/stdlibref/deque.html
index a0a711c..204a69a 100644
--- a/doc/stdlibref/deque.html
+++ b/doc/stdlibref/deque.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>deque</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="deque-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="distance.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>deque</H2>
diff --git a/doc/stdlibref/distance.html b/doc/stdlibref/distance.html
index a79e2c4..373f060 100644
--- a/doc/stdlibref/distance.html
+++ b/doc/stdlibref/distance.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>distance()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="deque.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="divides.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>distance()</H2>
diff --git a/doc/stdlibref/divides.html b/doc/stdlibref/divides.html
index 7a51f6a..8dd5ac4 100644
--- a/doc/stdlibref/divides.html
+++ b/doc/stdlibref/divides.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>divides</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="distance.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="domain-error.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>divides</H2>
diff --git a/doc/stdlibref/domain-error.html b/doc/stdlibref/domain-error.html
index 12a3bf2..c905a58 100644
--- a/doc/stdlibref/domain-error.html
+++ b/doc/stdlibref/domain-error.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>domain_error</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="divides.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="equal.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>domain_error</H2>
diff --git a/doc/stdlibref/equal-range.html b/doc/stdlibref/equal-range.html
index c4865fd..57704f4 100644
--- a/doc/stdlibref/equal-range.html
+++ b/doc/stdlibref/equal-range.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>equal_range()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="equal.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="equal-to.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>equal_range()</H2>
diff --git a/doc/stdlibref/equal-to.html b/doc/stdlibref/equal-to.html
index e5b72bd..77d4dd4 100644
--- a/doc/stdlibref/equal-to.html
+++ b/doc/stdlibref/equal-to.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>equal_to</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="equal-range.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="exception.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>equal_to</H2>
diff --git a/doc/stdlibref/equal.html b/doc/stdlibref/equal.html
index b25e9d5..b4070f8 100644
--- a/doc/stdlibref/equal.html
+++ b/doc/stdlibref/equal.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>equal()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="domain-error.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="equal-range.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>equal()</H2>
diff --git a/doc/stdlibref/exception-h.html b/doc/stdlibref/exception-h.html
index 3850be8..5632813 100644
--- a/doc/stdlibref/exception-h.html
+++ b/doc/stdlibref/exception-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;exception&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="exception.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="exceptions.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;exception&gt;</H2>
diff --git a/doc/stdlibref/exception.html b/doc/stdlibref/exception.html
index d88b3f9..124f260 100644
--- a/doc/stdlibref/exception.html
+++ b/doc/stdlibref/exception.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>exception</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="equal-to.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="exception-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>exception</H2>
diff --git a/doc/stdlibref/exceptions.html b/doc/stdlibref/exceptions.html
index 54d8a59..2ccba34 100644
--- a/doc/stdlibref/exceptions.html
+++ b/doc/stdlibref/exceptions.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Exceptions</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="exception-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="facets.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>Exceptions</H2>
diff --git a/doc/stdlibref/facets.html b/doc/stdlibref/facets.html
index 37aa8a7..db6bdad 100644
--- a/doc/stdlibref/facets.html
+++ b/doc/stdlibref/facets.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Facets</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="exceptions.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="fill.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>Facets</H2>
diff --git a/doc/stdlibref/fill.html b/doc/stdlibref/fill.html
index e9fdd38..3dc3092 100644
--- a/doc/stdlibref/fill.html
+++ b/doc/stdlibref/fill.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>fill(), fill_n()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="facets.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="find.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>fill(), fill_n()</H2>
diff --git a/doc/stdlibref/find-end.html b/doc/stdlibref/find-end.html
index 33706fe..e830b3a 100644
--- a/doc/stdlibref/find-end.html
+++ b/doc/stdlibref/find-end.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>find_end()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="find.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="find-first-of.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>find_end()</H2>
diff --git a/doc/stdlibref/find-first-of.html b/doc/stdlibref/find-first-of.html
index 27644d1..0752d66 100644
--- a/doc/stdlibref/find-first-of.html
+++ b/doc/stdlibref/find-first-of.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>find_first_of()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="find-end.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="find-if.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>find_first_of()</H2>
diff --git a/doc/stdlibref/find-if.html b/doc/stdlibref/find-if.html
index 89e9cd7..127fe0c 100644
--- a/doc/stdlibref/find-if.html
+++ b/doc/stdlibref/find-if.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>find_if()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="find-first-of.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="for-each.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>find_if()</H2>
diff --git a/doc/stdlibref/find.html b/doc/stdlibref/find.html
index f66e6e6..e341ae9 100644
--- a/doc/stdlibref/find.html
+++ b/doc/stdlibref/find.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>find()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="fill.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="find-end.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>find()</H2>
diff --git a/doc/stdlibref/for-each.html b/doc/stdlibref/for-each.html
index ff445a0..297a5c0 100644
--- a/doc/stdlibref/for-each.html
+++ b/doc/stdlibref/for-each.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>for_each()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="find-if.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="forwarditerators.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>for_each()</H2>
diff --git a/doc/stdlibref/forwarditerators.html b/doc/stdlibref/forwarditerators.html
index 104dfc0..e3f0a2d 100644
--- a/doc/stdlibref/forwarditerators.html
+++ b/doc/stdlibref/forwarditerators.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Forward Iterators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="for-each.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="fpos.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>Forward Iterators</H2>
diff --git a/doc/stdlibref/fpos.html b/doc/stdlibref/fpos.html
index d1f64fb..6c2af0d 100644
--- a/doc/stdlibref/fpos.html
+++ b/doc/stdlibref/fpos.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>fpos</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="forwarditerators.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="front-insert-iterator.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>fpos</H2>
diff --git a/doc/stdlibref/frames-banner.html b/doc/stdlibref/frames-banner.html
index 8f54e5f..6d369f9 100644
--- a/doc/stdlibref/frames-banner.html
+++ b/doc/stdlibref/frames-banner.html
@@ -4,15 +4,26 @@
         <link rel=StyleSheet
               href="../rwbanner.css"
               type="text/css"
-              title="Rogue Wave Standard Stylesheet">
-        <base target="toc">
+              title="Apache stdcxx Stylesheet"/>
+        <base target="toc"/>
+
+        <style type="text/css">
+            body {
+                background: url("http://apache.org/images/asf_logo.gif");
+                background-repeat: no-repeat
+            }
+        </style>
     </head>
-    <body bgcolor=#FFFFFF>
+    <body>
         <table border=0 cellpadding=4 cellspacing=0 width=100%>
             <tr>
                 <td align=center>
-                    <h2>Apache C++ Standard Library Reference Guide</h2>
-                    <h4>
+                    <h2>
+                        <a href="http://incubator.apache.org/stdcxx"
+                           target="_top">
+                        Apache C++ Standard Library</a> Reference Guide
+                    </h2>
+                    <h5>
                         <a href="frames-displayarea.html"
                            target="display">Top</a>
                         |
@@ -20,13 +31,15 @@
                            target="display">Member Index</a>
                         |
                         <a href="noframes.html"
-                           target="_top">No Frames</a>
+                           target="_top">
+                            No Frames
+                        </a>
                         <br>
                         Class Indexes:
                         <a href="frames-classes-alpha.html">Alphabetical</a>
                         or
                         <a href="frames-classes-func.html">Functional Groups</a>
-                    </h4>
+                    </h5>
                 </td>
            </tr>
         </table>
diff --git a/doc/stdlibref/frames-classes-alpha.html b/doc/stdlibref/frames-classes-alpha.html
index 385405d..43bb4e6 100644
--- a/doc/stdlibref/frames-classes-alpha.html
+++ b/doc/stdlibref/frames-classes-alpha.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Alphabetical List of Descriptions</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"><BASE TARGET="text"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"><BASE TARGET="text"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <H2>Alphabetical List<BR>of Descriptions</H2>
 <TABLE BORDER=0 CELLPADDING=4 CELLSPACING=0 WIDTH=100%>
diff --git a/doc/stdlibref/frames-classes-func.html b/doc/stdlibref/frames-classes-func.html
index 7f9d42a..532b2be 100644
--- a/doc/stdlibref/frames-classes-func.html
+++ b/doc/stdlibref/frames-classes-func.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Functional List of Descriptions</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"><BASE TARGET="text">
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"><BASE TARGET="text">
 </HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <H2>Functional List<BR>of Descriptions</H2>
diff --git a/doc/stdlibref/frames-displayarea.html b/doc/stdlibref/frames-displayarea.html
index b370cbe..ca357f1 100644
--- a/doc/stdlibref/frames-displayarea.html
+++ b/doc/stdlibref/frames-displayarea.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Display area frameset</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet">
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet">
 </HEAD>
 
 <FRAMESET COLS="20%,*">
diff --git a/doc/stdlibref/frames-intro-contents.html b/doc/stdlibref/frames-intro-contents.html
index f81913f..3b8d27c 100644
--- a/doc/stdlibref/frames-intro-contents.html
+++ b/doc/stdlibref/frames-intro-contents.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Introduction Contents</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet">
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet">
 <BASE TARGET="text">
 </HEAD>
 <BODY BGCOLOR=#FFFFFF>
@@ -20,7 +20,7 @@
 <B><A HREF="III.html">III: Obsolete Classes Reference</A></B><BR>
 <B><A HREF="IV.html">IV: Appendixes</A></B><BR>
 &nbsp;&nbsp;<B><A HREF="A.html">A: Implementation Details</A></B><BR>
-&nbsp;&nbsp;<B><A HREF="B.html">B: Rogue Wave Extensions to the Standard</A></B><BR>
+&nbsp;&nbsp;<B><A HREF="B.html">B: Extensions to the C++ Standard</A></B><BR>
 </P></TD>
 </TR></TABLE>
 
diff --git a/doc/stdlibref/frames-intro-text.html b/doc/stdlibref/frames-intro-text.html
index e30f5f4..49a60eb 100644
--- a/doc/stdlibref/frames-intro-text.html
+++ b/doc/stdlibref/frames-intro-text.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Welcome</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet">
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet">
 </HEAD>
 <BODY BGCOLOR=#FFFFFF>
 
diff --git a/doc/stdlibref/frames-tindex-contents.html b/doc/stdlibref/frames-tindex-contents.html
index 64505aa..7455ca7 100644
--- a/doc/stdlibref/frames-tindex-contents.html
+++ b/doc/stdlibref/frames-tindex-contents.html
@@ -2,7 +2,7 @@
 <HEAD>
 <TITLE>Frame-based index contents frame</TITLE>
 <BASE TARGET="text">
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet">
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet">
 <BASE TARGET="text">
 </HEAD>
 <BODY BGCOLOR=#FFFFFF>
diff --git a/doc/stdlibref/frames-tindex.html b/doc/stdlibref/frames-tindex.html
index e0b59d7..7333a0a 100644
--- a/doc/stdlibref/frames-tindex.html
+++ b/doc/stdlibref/frames-tindex.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Index frameset</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet">
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet">
 </HEAD>
 
 <FRAMESET COLS="20%,*">
diff --git a/doc/stdlibref/front-insert-iterator.html b/doc/stdlibref/front-insert-iterator.html
index 5dcdf86..397d67c 100644
--- a/doc/stdlibref/front-insert-iterator.html
+++ b/doc/stdlibref/front-insert-iterator.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>front_insert_iterator, front_inserter()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="fpos.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="fstream-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>front_insert_iterator, front_inserter()</H2>
diff --git a/doc/stdlibref/fstream-h.html b/doc/stdlibref/fstream-h.html
index bd22cd5..e0d21ec 100644
--- a/doc/stdlibref/fstream-h.html
+++ b/doc/stdlibref/fstream-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;fstream&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="front-insert-iterator.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="functionobjects.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;fstream&gt;</H2>
diff --git a/doc/stdlibref/functional-h.html b/doc/stdlibref/functional-h.html
index 2e9b284..467b8a3 100644
--- a/doc/stdlibref/functional-h.html
+++ b/doc/stdlibref/functional-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;functional&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="functionobjects.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="generate.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;functional&gt;</H2>
diff --git a/doc/stdlibref/functionobjects.html b/doc/stdlibref/functionobjects.html
index 16f5c8f..af31b90 100644
--- a/doc/stdlibref/functionobjects.html
+++ b/doc/stdlibref/functionobjects.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Function Objects</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="fstream-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="functional-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>Function Objects</H2>
diff --git a/doc/stdlibref/functoc.html b/doc/stdlibref/functoc.html
index 7ef8487..29091df 100644
--- a/doc/stdlibref/functoc.html
+++ b/doc/stdlibref/functoc.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Functional List of Class Descriptions</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <IMG SRC="images/bnoprev.gif" WIDTH=20 HEIGHT=21 ALT="No previous file" BORDER=O><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><IMG SRC="images/bnonext.gif" WIDTH=25 HEIGHT=21 ALT="No next file" BORDER=O><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H1>Functional List of Descriptions</H1>
diff --git a/doc/stdlibref/generate.html b/doc/stdlibref/generate.html
index 46167cc..aba0953 100644
--- a/doc/stdlibref/generate.html
+++ b/doc/stdlibref/generate.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>generate(), generate_n()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="functional-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="get-temporary-buffer.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>generate(), generate_n()</H2>
diff --git a/doc/stdlibref/get-temporary-buffer.html b/doc/stdlibref/get-temporary-buffer.html
index fad6dd3..684498a 100644
--- a/doc/stdlibref/get-temporary-buffer.html
+++ b/doc/stdlibref/get-temporary-buffer.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>get_temporary_buffer()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="generate.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="greater.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>get_temporary_buffer()</H2>
diff --git a/doc/stdlibref/greater-equal.html b/doc/stdlibref/greater-equal.html
index 9f8f002..81ba7bb 100644
--- a/doc/stdlibref/greater-equal.html
+++ b/doc/stdlibref/greater-equal.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>greater_equal</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="greater.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="gslice.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>greater_equal</H2>
diff --git a/doc/stdlibref/greater.html b/doc/stdlibref/greater.html
index 779e067..6e6afd4 100644
--- a/doc/stdlibref/greater.html
+++ b/doc/stdlibref/greater.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>greater</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="get-temporary-buffer.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="greater-equal.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>greater</H2>
diff --git a/doc/stdlibref/gslice-array.html b/doc/stdlibref/gslice-array.html
index 0be4829..fa5593f 100644
--- a/doc/stdlibref/gslice-array.html
+++ b/doc/stdlibref/gslice-array.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>gslice_array</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="gslice.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="has-facet.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>gslice_array</H2>
diff --git a/doc/stdlibref/gslice.html b/doc/stdlibref/gslice.html
index 0e3bbc3..23aa24c 100644
--- a/doc/stdlibref/gslice.html
+++ b/doc/stdlibref/gslice.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>gslice</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="greater-equal.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="gslice-array.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>gslice</H2>
diff --git a/doc/stdlibref/has-facet.html b/doc/stdlibref/has-facet.html
index 9593ca5..541f199 100644
--- a/doc/stdlibref/has-facet.html
+++ b/doc/stdlibref/has-facet.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>has_facet()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="gslice-array.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="heapoperations.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>has_facet()</H2>
diff --git a/doc/stdlibref/heapoperations.html b/doc/stdlibref/heapoperations.html
index 6f73d9f..99ea5c1 100644
--- a/doc/stdlibref/heapoperations.html
+++ b/doc/stdlibref/heapoperations.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Heap Operations</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="has-facet.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="includes.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>Heap Operations</H2><UL>
diff --git a/doc/stdlibref/includes.html b/doc/stdlibref/includes.html
index 873dfe3..ac02c92 100644
--- a/doc/stdlibref/includes.html
+++ b/doc/stdlibref/includes.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>includes()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="heapoperations.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="indirect-array.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>includes()</H2>
diff --git a/doc/stdlibref/index.html b/doc/stdlibref/index.html
index d110a25..1e0aff4 100644
--- a/doc/stdlibref/index.html
+++ b/doc/stdlibref/index.html
@@ -4,7 +4,7 @@
         <link rel=StyleSheet
               href="../rw.css"
               type="text/css"
-              title="Rogue Wave Standard Stylesheet">
+              title="Apache stdcxx Stylesheet">
     </head>
 
     <frameset rows="110,*">
diff --git a/doc/stdlibref/indirect-array.html b/doc/stdlibref/indirect-array.html
index fc2e55e..be3773c 100644
--- a/doc/stdlibref/indirect-array.html
+++ b/doc/stdlibref/indirect-array.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>indirect_array</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="includes.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="inner-product.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>indirect_array</H2>
diff --git a/doc/stdlibref/inner-product.html b/doc/stdlibref/inner-product.html
index 88821d1..a0af263 100644
--- a/doc/stdlibref/inner-product.html
+++ b/doc/stdlibref/inner-product.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>inner_product()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="indirect-array.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="inplace-merge.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>inner_product()</H2>
diff --git a/doc/stdlibref/inplace-merge.html b/doc/stdlibref/inplace-merge.html
index e67192b..a78efa3 100644
--- a/doc/stdlibref/inplace-merge.html
+++ b/doc/stdlibref/inplace-merge.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>inplace_merge()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="inner-product.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="inputiterators.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>inplace_merge()</H2>
diff --git a/doc/stdlibref/inputiterators.html b/doc/stdlibref/inputiterators.html
index 8497947..ea077e4 100644
--- a/doc/stdlibref/inputiterators.html
+++ b/doc/stdlibref/inputiterators.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Input Iterators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="inplace-merge.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="insertiterators.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>Input Iterators</H2>
diff --git a/doc/stdlibref/insert-iterator.html b/doc/stdlibref/insert-iterator.html
index b6de6ea..cca149a 100644
--- a/doc/stdlibref/insert-iterator.html
+++ b/doc/stdlibref/insert-iterator.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>insert_iterator, inserter()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="insertiterators.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="invalid-argument.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>insert_iterator, inserter()</H2>
diff --git a/doc/stdlibref/insertiterators.html b/doc/stdlibref/insertiterators.html
index 29747f1..c319861 100644
--- a/doc/stdlibref/insertiterators.html
+++ b/doc/stdlibref/insertiterators.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Insert Iterators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="inputiterators.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="insert-iterator.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>Insert Iterators</H2>
diff --git a/doc/stdlibref/invalid-argument.html b/doc/stdlibref/invalid-argument.html
index 258bbf1..0f079f3 100644
--- a/doc/stdlibref/invalid-argument.html
+++ b/doc/stdlibref/invalid-argument.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>invalid_argument</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="insert-iterator.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="iomanip-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>invalid_argument</H2>
diff --git a/doc/stdlibref/iomanip-h.html b/doc/stdlibref/iomanip-h.html
index e341e12..6551bd1 100644
--- a/doc/stdlibref/iomanip-h.html
+++ b/doc/stdlibref/iomanip-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;iomanip&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="invalid-argument.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="ios-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;iomanip&gt;</H2>
diff --git a/doc/stdlibref/ios-base--failure.html b/doc/stdlibref/ios-base--failure.html
index 051576f..1fc7432 100644
--- a/doc/stdlibref/ios-base--failure.html
+++ b/doc/stdlibref/ios-base--failure.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>ios_base::failure</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="ios-base.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="iosfwd-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>ios_base::failure</H2>
diff --git a/doc/stdlibref/ios-base.html b/doc/stdlibref/ios-base.html
index a35972b..eea23bb 100644
--- a/doc/stdlibref/ios-base.html
+++ b/doc/stdlibref/ios-base.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>ios_base</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="ios-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="ios-base--failure.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>ios_base</H2>
@@ -307,7 +307,7 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- The nocreate and noreplace elements are not part of the C++ Standard, but are provided as an extension. See <A HREF="B.html">Appendix&nbsp;B</A>, for a complete list of Rogue Wave extensions.
+NOTE -- The nocreate and noreplace elements are not part of the C++ Standard, but are provided as an extension. See <A HREF="B.html">Appendix&nbsp;B</A>, for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx672"></A><PRE><B>seekdir</B></PRE>
diff --git a/doc/stdlibref/ios-h.html b/doc/stdlibref/ios-h.html
index 6f75d61..5777d7b 100644
--- a/doc/stdlibref/ios-h.html
+++ b/doc/stdlibref/ios-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;ios&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="iomanip-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="ios-base.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;ios&gt;</H2>
diff --git a/doc/stdlibref/iosfwd-h.html b/doc/stdlibref/iosfwd-h.html
index c2a6f99..3d17e6d 100644
--- a/doc/stdlibref/iosfwd-h.html
+++ b/doc/stdlibref/iosfwd-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;iosfwd&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="ios-base--failure.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="iostream-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;iosfwd&gt;</H2>
diff --git a/doc/stdlibref/iostream-h.html b/doc/stdlibref/iostream-h.html
index b9b4ee8..6a3213d 100644
--- a/doc/stdlibref/iostream-h.html
+++ b/doc/stdlibref/iostream-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;iostream&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="iosfwd-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="isalnum.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;iostream&gt;</H2>
diff --git a/doc/stdlibref/isalnum.html b/doc/stdlibref/isalnum.html
index bd6e336..b3011b0 100644
--- a/doc/stdlibref/isalnum.html
+++ b/doc/stdlibref/isalnum.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>isalnum()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="iostream-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="isalpha.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>isalnum()</H2>
diff --git a/doc/stdlibref/isalpha.html b/doc/stdlibref/isalpha.html
index 7dbffdf..a8debcc 100644
--- a/doc/stdlibref/isalpha.html
+++ b/doc/stdlibref/isalpha.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>isalpha()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="isalnum.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="iscntrl.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>isalpha()</H2>
diff --git a/doc/stdlibref/iscntrl.html b/doc/stdlibref/iscntrl.html
index e05cc09..16c9eff 100644
--- a/doc/stdlibref/iscntrl.html
+++ b/doc/stdlibref/iscntrl.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>iscntrl()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="isalpha.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="isdigit.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>iscntrl()</H2>
diff --git a/doc/stdlibref/isdigit.html b/doc/stdlibref/isdigit.html
index d4ab99f..78b4aa2 100644
--- a/doc/stdlibref/isdigit.html
+++ b/doc/stdlibref/isdigit.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>isdigit()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="iscntrl.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="isgraph.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>isdigit()</H2>
diff --git a/doc/stdlibref/isgraph.html b/doc/stdlibref/isgraph.html
index 935994b..a8b7588 100644
--- a/doc/stdlibref/isgraph.html
+++ b/doc/stdlibref/isgraph.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>isgraph()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="isdigit.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="islower.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>isgraph()</H2>
diff --git a/doc/stdlibref/islower.html b/doc/stdlibref/islower.html
index 10d6f3a..a78ba11 100644
--- a/doc/stdlibref/islower.html
+++ b/doc/stdlibref/islower.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>islower()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="isgraph.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="isprint.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>islower()</H2>
diff --git a/doc/stdlibref/isprint.html b/doc/stdlibref/isprint.html
index bcc3cd6..d2b6d91 100644
--- a/doc/stdlibref/isprint.html
+++ b/doc/stdlibref/isprint.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>isprint()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="islower.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="ispunct.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>isprint()</H2>
diff --git a/doc/stdlibref/ispunct.html b/doc/stdlibref/ispunct.html
index 6289cd3..21b537d 100644
--- a/doc/stdlibref/ispunct.html
+++ b/doc/stdlibref/ispunct.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>ispunct()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="isprint.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="isspace.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>ispunct()</H2>
diff --git a/doc/stdlibref/isspace.html b/doc/stdlibref/isspace.html
index 1c15413..a787881 100644
--- a/doc/stdlibref/isspace.html
+++ b/doc/stdlibref/isspace.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>isspace()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="ispunct.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="istream-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>isspace()</H2>
diff --git a/doc/stdlibref/istream-h.html b/doc/stdlibref/istream-h.html
index 37fe295..c0159ad 100644
--- a/doc/stdlibref/istream-h.html
+++ b/doc/stdlibref/istream-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;istream&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="isspace.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="istream-iterator.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;istream&gt;</H2>
diff --git a/doc/stdlibref/istream-iterator.html b/doc/stdlibref/istream-iterator.html
index e587bee..9fb38aa 100644
--- a/doc/stdlibref/istream-iterator.html
+++ b/doc/stdlibref/istream-iterator.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>istream_iterator</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="istream-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="istreambuf-iterator.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>istream_iterator</H2>
diff --git a/doc/stdlibref/istreambuf-iterator.html b/doc/stdlibref/istreambuf-iterator.html
index 7d436e5..dd0cfb5 100644
--- a/doc/stdlibref/istreambuf-iterator.html
+++ b/doc/stdlibref/istreambuf-iterator.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>istreambuf_iterator</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="istream-iterator.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="istrstream.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>istreambuf_iterator</H2>
diff --git a/doc/stdlibref/istrstream.html b/doc/stdlibref/istrstream.html
index d65f9ca..df923d5 100644
--- a/doc/stdlibref/istrstream.html
+++ b/doc/stdlibref/istrstream.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>istrstream</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="istreambuf-iterator.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="isupper.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>istrstream</H2>
diff --git a/doc/stdlibref/isupper.html b/doc/stdlibref/isupper.html
index d250e4f..63580cd 100644
--- a/doc/stdlibref/isupper.html
+++ b/doc/stdlibref/isupper.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>isupper()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="istrstream.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="isxdigit.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>isupper()</H2>
diff --git a/doc/stdlibref/isxdigit.html b/doc/stdlibref/isxdigit.html
index 5343627..a9e1d61 100644
--- a/doc/stdlibref/isxdigit.html
+++ b/doc/stdlibref/isxdigit.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>isxdigit()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="isupper.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="iter-swap.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>isxdigit()</H2>
diff --git a/doc/stdlibref/iter-swap.html b/doc/stdlibref/iter-swap.html
index 6880d2d..83d96ca 100644
--- a/doc/stdlibref/iter-swap.html
+++ b/doc/stdlibref/iter-swap.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>iter_swap()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="isxdigit.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="iterator-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>iter_swap()</H2>
diff --git a/doc/stdlibref/iterator-h.html b/doc/stdlibref/iterator-h.html
index 39783b3..4cb35c4 100644
--- a/doc/stdlibref/iterator-h.html
+++ b/doc/stdlibref/iterator-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;iterator&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="iter-swap.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="iterator.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;iterator&gt;</H2>
diff --git a/doc/stdlibref/iterator-traits.html b/doc/stdlibref/iterator-traits.html
index f40a26b..d8944ec 100644
--- a/doc/stdlibref/iterator-traits.html
+++ b/doc/stdlibref/iterator-traits.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>iterator_traits</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="iterator.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="iterators.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>iterator_traits</H2>
diff --git a/doc/stdlibref/iterator.html b/doc/stdlibref/iterator.html
index c808c54..a0795e6 100644
--- a/doc/stdlibref/iterator.html
+++ b/doc/stdlibref/iterator.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>iterator</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="iterator-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="iterator-traits.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>iterator</H2>
diff --git a/doc/stdlibref/iterators.html b/doc/stdlibref/iterators.html
index 1bc5720..7496a27 100644
--- a/doc/stdlibref/iterators.html
+++ b/doc/stdlibref/iterators.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Iterators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="iterator-traits.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="length-error.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>Iterators</H2>
diff --git a/doc/stdlibref/length-error.html b/doc/stdlibref/length-error.html
index 9125366..36d83a1 100644
--- a/doc/stdlibref/length-error.html
+++ b/doc/stdlibref/length-error.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>length_error</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="iterators.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="less.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>length_error</H2>
diff --git a/doc/stdlibref/less-equal.html b/doc/stdlibref/less-equal.html
index 1933456..229bd5f 100644
--- a/doc/stdlibref/less-equal.html
+++ b/doc/stdlibref/less-equal.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>less_equal</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="less.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="lexicographical-compare.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>less_equal</H2>
diff --git a/doc/stdlibref/less.html b/doc/stdlibref/less.html
index 186c055..1aecf24 100644
--- a/doc/stdlibref/less.html
+++ b/doc/stdlibref/less.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>less</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="length-error.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="less-equal.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>less</H2>
diff --git a/doc/stdlibref/lexicographical-compare.html b/doc/stdlibref/lexicographical-compare.html
index eea8ddf..1d84a5e 100644
--- a/doc/stdlibref/lexicographical-compare.html
+++ b/doc/stdlibref/lexicographical-compare.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>lexicographical_compare()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="less-equal.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="limits-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>lexicographical_compare()</H2>
diff --git a/doc/stdlibref/limits-h.html b/doc/stdlibref/limits-h.html
index da28b3a..70ea269 100644
--- a/doc/stdlibref/limits-h.html
+++ b/doc/stdlibref/limits-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;limits&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="lexicographical-compare.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="list-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;limits&gt;</H2>
diff --git a/doc/stdlibref/list-h.html b/doc/stdlibref/list-h.html
index d4d3be0..4243b05 100644
--- a/doc/stdlibref/list-h.html
+++ b/doc/stdlibref/list-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;list&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="limits-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="list.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;list&gt;</H2>
diff --git a/doc/stdlibref/list.html b/doc/stdlibref/list.html
index 99410dc..b161bde 100644
--- a/doc/stdlibref/list.html
+++ b/doc/stdlibref/list.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>list</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="list-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="locale-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>list</H2>
diff --git a/doc/stdlibref/lists.html b/doc/stdlibref/lists.html
index f9ce0ad..05c77a7 100644
--- a/doc/stdlibref/lists.html
+++ b/doc/stdlibref/lists.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Table, Figure, and Examples List</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <IMG SRC="images/bnoprev.gif" WIDTH=20 HEIGHT=21 ALT="No previous file" BORDER=O><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><IMG SRC="images/bnonext.gif" WIDTH=25 HEIGHT=21 ALT="No next file" BORDER=O><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 
@@ -51,7 +51,7 @@
 <A HREF="time-put.html#Table&nbsp;36">Table&nbsp;36: Recognized formatting characters. Struct tm members used to produce the format are noted [in brackets].&nbsp;</A><BR>
 <A HREF="time-put.html#Table&nbsp;37">Table&nbsp;37: Recognized modified formatting characters&nbsp;.</A><BR>
 <A HREF="wcout.html#Table&nbsp;38">Table&nbsp;38: Formatting functions and manipulators in wcout</A><BR>
-<A HREF="B.html#Table&nbsp;39">Table&nbsp;39: Rogue Wave extensions to the C++ Standard Library&nbsp;</A><BR>
+<A HREF="B.html#Table&nbsp;39">Table&nbsp;39: Extensions of this implementation to the C++ Standard Library&nbsp;</A><BR>
 </UL>
 
 
diff --git a/doc/stdlibref/locale-h.html b/doc/stdlibref/locale-h.html
index b3e3a5a..3b86715 100644
--- a/doc/stdlibref/locale-h.html
+++ b/doc/stdlibref/locale-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;locale&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="list.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="locale.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;locale&gt;</H2>
diff --git a/doc/stdlibref/locale.html b/doc/stdlibref/locale.html
index 2eccff1..e6dd240 100644
--- a/doc/stdlibref/locale.html
+++ b/doc/stdlibref/locale.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>locale</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="locale-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="localeutility.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>locale</H2>
diff --git a/doc/stdlibref/localedefutility.html b/doc/stdlibref/localedefutility.html
index 455aa0c..d3f9a67 100644
--- a/doc/stdlibref/localedefutility.html
+++ b/doc/stdlibref/localedefutility.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>localedef utility</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="localeutility.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="logic-error.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>localedef utility</H2><PRE><HR><B><I>Utility Program</I></B><HR></PRE>
@@ -36,14 +36,14 @@
 
 <PRE>localedef [-c][-f <I>charmap</I>][-i <I>sourcefile</I>][-u <I>code_set_name</I>]         <I>name</I>
 </PRE>
-<P>Rogue Wave Extensions:</P>
+<P>Extensions of this implementation:</P>
 
 <PRE>
 localedef [-w][-w<I>N</I>][-f <I>charmap</I>][-i <I>sourcefile</I>][--help][--ucs]         <I>name</I>
 localedef -g [-m <I>locale_list</I>][-r <I>charmap_dir</I>][-s <I>source_dir</I>]         [-d <I>output_dir</I>]
 </PRE>
 <A NAME="sec4"><H3>Description</H3></A>
-<P>The <SAMP>localedef</SAMP> utility reads one or more locale definition files and character set description files and translates them into binary files suitable for interpretation by the Rogue Wave implementation of the C++ Standard library. The binary files produced by <SAMP>localedef</SAMP> are referred to in this document as <I>locale databases</I>. In particular, the localization library makes use of this information to implement its behavior. The behavior of the utility is affected by the environment variable <SAMP>${RWSTD_SRC_ROOT}</SAMP>.</P>
+<P>The <SAMP>localedef</SAMP> utility reads one or more locale definition files and character set description files and translates them into binary files suitable for interpretation by this implementation of the C++ Standard Library. The binary files produced by <SAMP>localedef</SAMP> are referred to in this document as <I>locale databases</I>. In particular, the localization library makes use of this information to implement its behavior. The behavior of the utility is affected by the environment variable <SAMP>${RWSTD_SRC_ROOT}</SAMP>.</P>
 <A NAME="sec5"><H3>Options</H3></A>
 <P><A HREF="localedefutility.html#Table&nbsp;25">Table&nbsp;25</A> illustrates options that conform to the requirements of the IEEE Std 1003.1-2001 (POSIX) standard. </P>
 <H4><A NAME="Table&nbsp;25">Table&nbsp;25: localedef option requirements of the IEEE Std. 1003.1-2001 (POSIX) standard&nbsp;</A></H4>
@@ -150,9 +150,9 @@
 <P>The required format of the locale definition file follows that described in section 7.3, Locale Definition, of IEEE Std 1003.1-2001. </P>
 <P>Any files that conform to the required format can be used with <SAMP>localedef</SAMP> to produce binary locale database files suitable for use with the C++ Standard Library Module.</P>
 <P>A limited number of character set description files and locale definition files in the conforming format can be purchased from The Open Group. See   <SAMP>http://www.opengroup.org/pubs/catalog/lo.htm</SAMP>.</P>
-<P>Character set description files and locale definition files in an extended format can be obtained without charge from the JTC1/SC22/WG15 -- POSIX pages at <SAMP>ftp://dkuug.dk/i18n/WG15-collection/</SAMP>. These files are distributed with the Rogue Wave C++ Standard Library Module sources.</P>
-<P>Additionally, the <SAMP>localedef</SAMP> utility also accepts files in an extended format used by GNU C library, glibc 2<br><SAMP>(http://www.gnu.org/software/libc/libc.html)</SAMP>. The locale definition files that accompany glibc 2.2.5 are distributed with the Rogue Wave C++ Standard Library Module sources. </P>
-<P>Finally, <SAMP>localedef</SAMP> utility accepts files shipped with HP-UX 11.00 and later. The character set description files are installed in<br><SAMP>/usr/lib/nls/loc/charmaps</SAMP>, the locale definition files are in <br><SAMP>/usr/lib/nls/loc/src</SAMP>. These files are not distributed with the Rogue Wave C++ Standard Library Module sources.</P>
+<P>Character set description files and locale definition files in an extended format can be obtained without charge from the JTC1/SC22/WG15 -- POSIX pages at <SAMP>ftp://dkuug.dk/i18n/WG15-collection/</SAMP>. These files are distributed with the Apache C++ Standard Library sources.</P>
+<P>Additionally, the <SAMP>localedef</SAMP> utility also accepts files in an extended format used by GNU C library, glibc 2<br><SAMP>(http://www.gnu.org/software/libc/libc.html)</SAMP>. The locale definition files that accompany glibc 2.2.5 are distributed with the Apache C++ Standard Library sources. </P>
+<P>Finally, <SAMP>localedef</SAMP> utility accepts files shipped with HP-UX 11.00 and later. The character set description files are installed in<br><SAMP>/usr/lib/nls/loc/charmaps</SAMP>, the locale definition files are in <br><SAMP>/usr/lib/nls/loc/src</SAMP>. These files are not distributed with the Apache C++ Standard Library sources.</P>
 <A NAME="sec9"><H3>Output</H3></A>
 <P>On success, <SAMP>localedef</SAMP> will create one or more files. If the <SAMP>name</SAMP> argument does not contain the slash character, files are created in the current working directory. Otherwise, the output files will be created in the directory specified by <SAMP>name</SAMP>. The following directory tree describes the organization of the output files:</P>
 
@@ -191,7 +191,7 @@
 </tr>
 </TABLE>
 <A NAME="sec11"><H3>Examples</H3></A>
-<P>Please note that the examples in this section use Rogue Wave extensions to the <SAMP>localedef</SAMP> utility.</P>
+<P>Please note that the examples in this section use extensions of this implementation to the <SAMP>localedef</SAMP> utility.</P>
 <P>The following command tries to create a locale database called <SAMP>german</SAMP> for the German locale <SAMP>de_DE</SAMP> using the ISO 8859-1 character set, and the locale definition file <SAMP>de_DE</SAMP>:</P>
 
 <UL><PRE>$ localedef -f nls/charmaps/ISO-8859-1 \
diff --git a/doc/stdlibref/localeutility.html b/doc/stdlibref/localeutility.html
index 29d1da4..8625086 100644
--- a/doc/stdlibref/localeutility.html
+++ b/doc/stdlibref/localeutility.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>locale utility</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="locale.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="localedefutility.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>locale utility</H2><PRE><HR><B><I>Utility Program</I></B><HR></PRE>
@@ -48,7 +48,7 @@
 <PRE>locale [-a|-m]
 locale [-c][-k] name...
 </PRE>
-<P>Rogue Wave Extensions:</P>
+<P>Extensions of this implementation:</P>
 
 <PRE>
 locale [-c][-h][-k][-l][-w][-wN][--help] name...
@@ -215,7 +215,7 @@
 </tr>
 </TABLE>
 <A NAME="sec11"><H3>Examples</H3></A>
-<P>The first of the following two commands, <SAMP>localedef</SAMP>, will create a locale database named <SAMP>french@euro</SAMP> in the directory <SAMP>/tmp</SAMP>. The second, <SAMP>locale</SAMP>, will write to <SAMP>stdout</SAMP> the names and values of the keywords for the <SAMP>LC_TIME</SAMP> locale category for the just created locale database. Since <SAMP>-c</SAMP> is specified, <SAMP>locale</SAMP> also writes out the name of the category. Please note that the following example uses Rogue Wave extensions to the <SAMP>locale</SAMP> utility.</P>
+<P>The first of the following two commands, <SAMP>localedef</SAMP>, will create a locale database named <SAMP>french@euro</SAMP> in the directory <SAMP>/tmp</SAMP>. The second, <SAMP>locale</SAMP>, will write to <SAMP>stdout</SAMP> the names and values of the keywords for the <SAMP>LC_TIME</SAMP> locale category for the just created locale database. Since <SAMP>-c</SAMP> is specified, <SAMP>locale</SAMP> also writes out the name of the category. Please note that the following example uses extensions of this implementation to the <SAMP>locale</SAMP> utility.</P>
 
 <UL><PRE>
 $ localedef -c -f -w nls/charmaps/ISO-8859-15 \<br>   -i nls/src fr_FR.euro/tmp/french@euro
diff --git a/doc/stdlibref/logic-error.html b/doc/stdlibref/logic-error.html
index ed0eff5..88fc036 100644
--- a/doc/stdlibref/logic-error.html
+++ b/doc/stdlibref/logic-error.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>logic_error</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="localedefutility.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="logical-and.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>logic_error</H2>
diff --git a/doc/stdlibref/logical-and.html b/doc/stdlibref/logical-and.html
index 466f87e..9464bcf 100644
--- a/doc/stdlibref/logical-and.html
+++ b/doc/stdlibref/logical-and.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>logical_and</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="logic-error.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="logical-not.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>logical_and</H2>
diff --git a/doc/stdlibref/logical-not.html b/doc/stdlibref/logical-not.html
index c44bc72..9b39abe 100644
--- a/doc/stdlibref/logical-not.html
+++ b/doc/stdlibref/logical-not.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>logical_not</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="logical-and.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="logical-or.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>logical_not</H2>
diff --git a/doc/stdlibref/logical-or.html b/doc/stdlibref/logical-or.html
index 17eefde..ed7f3d6 100644
--- a/doc/stdlibref/logical-or.html
+++ b/doc/stdlibref/logical-or.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>logical_or</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="logical-not.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="lower-bound.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>logical_or</H2>
diff --git a/doc/stdlibref/lower-bound.html b/doc/stdlibref/lower-bound.html
index 810732e..c99a501 100644
--- a/doc/stdlibref/lower-bound.html
+++ b/doc/stdlibref/lower-bound.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>lower_bound()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="logical-or.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="make-heap.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>lower_bound()</H2>
diff --git a/doc/stdlibref/make-heap.html b/doc/stdlibref/make-heap.html
index c6be27c..51ed7e7 100644
--- a/doc/stdlibref/make-heap.html
+++ b/doc/stdlibref/make-heap.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>make_heap()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="lower-bound.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="map-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>make_heap()</H2>
diff --git a/doc/stdlibref/map-h.html b/doc/stdlibref/map-h.html
index 92ed9d7..9d5de29 100644
--- a/doc/stdlibref/map-h.html
+++ b/doc/stdlibref/map-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;map&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="make-heap.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="map.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;map&gt;</H2>
diff --git a/doc/stdlibref/map.html b/doc/stdlibref/map.html
index 6f019e2..07a0e36 100644
--- a/doc/stdlibref/map.html
+++ b/doc/stdlibref/map.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>map</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="map-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="mask-array.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>map</H2>
diff --git a/doc/stdlibref/mask-array.html b/doc/stdlibref/mask-array.html
index bf5a1bf..db2b203 100644
--- a/doc/stdlibref/mask-array.html
+++ b/doc/stdlibref/mask-array.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>mask_array</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="map.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="max.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>mask_array</H2>
diff --git a/doc/stdlibref/max-element.html b/doc/stdlibref/max-element.html
index f25ab6a..ed47fc6 100644
--- a/doc/stdlibref/max-element.html
+++ b/doc/stdlibref/max-element.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>max_element()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="max.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="mem-fun.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>max_element()</H2>
diff --git a/doc/stdlibref/max.html b/doc/stdlibref/max.html
index b7f0c45..952c7ea 100644
--- a/doc/stdlibref/max.html
+++ b/doc/stdlibref/max.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>max()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="mask-array.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="max-element.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>max()</H2>
diff --git a/doc/stdlibref/mem-fun.html b/doc/stdlibref/mem-fun.html
index 0d41d5e..36a3999 100644
--- a/doc/stdlibref/mem-fun.html
+++ b/doc/stdlibref/mem-fun.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>mem_fun, mem_fun_ref</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="max-element.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="memory-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>mem_fun, mem_fun_ref</H2>
diff --git a/doc/stdlibref/memory-h.html b/doc/stdlibref/memory-h.html
index db4efc8..6bc20e4 100644
--- a/doc/stdlibref/memory-h.html
+++ b/doc/stdlibref/memory-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;memory&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="mem-fun.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="merge.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;memory&gt;</H2>
diff --git a/doc/stdlibref/merge.html b/doc/stdlibref/merge.html
index 5b0ba00..da66f09 100644
--- a/doc/stdlibref/merge.html
+++ b/doc/stdlibref/merge.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>merge()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="memory-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="messages.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>merge()</H2>
diff --git a/doc/stdlibref/messages.html b/doc/stdlibref/messages.html
index 16707e7..ee0db82 100644
--- a/doc/stdlibref/messages.html
+++ b/doc/stdlibref/messages.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>messages, messages_byname</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="merge.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="min.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>messages, messages_byname</H2>
diff --git a/doc/stdlibref/min-element.html b/doc/stdlibref/min-element.html
index 9077ea3..43cce48 100644
--- a/doc/stdlibref/min-element.html
+++ b/doc/stdlibref/min-element.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>min_element()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="min.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="minus.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>min_element()</H2>
diff --git a/doc/stdlibref/min.html b/doc/stdlibref/min.html
index d035965..5ffb6ec 100644
--- a/doc/stdlibref/min.html
+++ b/doc/stdlibref/min.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>min()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="messages.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="min-element.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>min()</H2>
diff --git a/doc/stdlibref/minus.html b/doc/stdlibref/minus.html
index d0b8f26..091efbc 100644
--- a/doc/stdlibref/minus.html
+++ b/doc/stdlibref/minus.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>minus</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="min-element.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="mismatch.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>minus</H2>
diff --git a/doc/stdlibref/mismatch.html b/doc/stdlibref/mismatch.html
index 9d9dd09..4c6283e 100644
--- a/doc/stdlibref/mismatch.html
+++ b/doc/stdlibref/mismatch.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>mismatch()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="minus.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="modulus.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>mismatch()</H2>
diff --git a/doc/stdlibref/modulus.html b/doc/stdlibref/modulus.html
index ee1c1a0..2147a12 100644
--- a/doc/stdlibref/modulus.html
+++ b/doc/stdlibref/modulus.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>modulus</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="mismatch.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="money-get.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>modulus</H2>
diff --git a/doc/stdlibref/money-get.html b/doc/stdlibref/money-get.html
index d57224f..cdff5a4 100644
--- a/doc/stdlibref/money-get.html
+++ b/doc/stdlibref/money-get.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>money_get</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="modulus.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="moneypunct.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>money_get</H2>
@@ -165,54 +165,53 @@
 #include &lt;iostream&gt;   // for cout, endl
 #include &lt;iterator&gt;   // for istreambuf_iterator
 
-#include &lt;examples.h&gt;
-
-
-int main ()
+int main (int argc, char *argv[])
 {
-    typedef std::istreambuf_iterator&lt;char,
-            std::char_traits&lt;char&gt; &gt; Iter;
-  
-    const std::string buffer ("$100.02");
-    std::string dest;
-    long double ldest;
-    std::ios_base::iostate state;
-    Iter end;
+    // Get the monetary string and locale from the argument vector.
+    const char* const buffer  = 1 &lt; argc ? argv [1] : "$1,234.6789";
+    const char* const locname = 2 &lt; argc ? argv [2] : "en_US";
+    const bool        intl    = 3 &lt; argc;
 
-    // Retrieve the money_get facet from the global locale.
-    const std::money_get&lt;char, Iter&gt; &amp;mgf =
-        std::use_facet&lt;std::money_get&lt;char, Iter&gt; &gt;(std::locale
-             ());
+    std::string smon;
+    long double fmon = 0.0;
+
+    std::ios_base::iostate state = std::ios_base::goodbit;
+
+    // Retrieve the money_get facet from the named locale.
+    const std::locale loc (locname);
+
+    typedef std::istreambuf_iterator&lt;char&gt; Iter;
+    typedef std::money_get&lt;char, Iter&gt;     MoneyGet;
+
+    const MoneyGet &mgf = std::use_facet&lt;MoneyGet&gt;(loc);
 
     {
-        // Build an istringstream from the buffer and construct
-        // a beginning iterator on it.
+        // Build an istringstream object from the buffer
+        // and imbue the locale in it.
         std::istringstream ins (buffer);
-        Iter begin (ins);
+        ins.imbue (loc);
 
-        // Get a string representation of the monetary value
-        mgf.get (begin, end, false, ins, state, dest);
+        // Get a string representation of the monetary value.
+        mgf.get (ins, Iter (), intl, ins, state, smon);
     }
     {
-        // Build another istringstream from the buffer, etc.
-        // so we have an iterator pointing to the beginning
         std::istringstream ins (buffer);
-        Iter begin (ins);
+        ins.imbue (loc);
 
-        // Get a a long double representation of the monetary
-           value
-        mgf.get (begin, end, false, ins, state, ldest);
+        // Get a floating point representation of the monetary value.
+        mgf.get (ins, Iter (), intl, ins, state, fmon);
     }
 
-    std::cout &lt;&lt; buffer &lt;&lt; " --&gt; "
-              &lt;&lt; dest &lt;&lt; " --&gt; " &lt;&lt; ldest &lt;&lt; std::endl;
+    // Output the original sequence and its string and floating point
+    // representations.
+    std::cout &lt;&lt; buffer &lt;&lt; " --&gt; \"" &lt;&lt; smon &lt;&lt; "\" --&gt; " &lt;&lt; fmon &lt;&lt; '\n';
 
-    // return 0 on success, non-zero on failure
+    // Return 0 on success, non-zero on failure.
     return !(std::ios_base::eofbit == state);
 }
 
 Program Output:
-$100.02 --&gt; 10002 --&gt; 10002
+$1,234.6789 --&gt; "123467" --&gt; 123467
 </PRE></UL>
 <A NAME="sec13"><H3>See Also</H3></A>
 <P><B><I><A HREF="locale.html">locale</A></I></B>, <A HREF="facets.html">Facets</A>, <B><I><A HREF="money-put.html">money_put</A></I></B>, <B><I><A HREF="moneypunct.html">moneypunct</A></I></B></P>
diff --git a/doc/stdlibref/money-put.html b/doc/stdlibref/money-put.html
index 3e94533..bf0b93b 100644
--- a/doc/stdlibref/money-put.html
+++ b/doc/stdlibref/money-put.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>money_put</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="moneypunct.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="multimap.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>money_put</H2>
diff --git a/doc/stdlibref/moneypunct.html b/doc/stdlibref/moneypunct.html
index 73f2c43..0a1926e 100644
--- a/doc/stdlibref/moneypunct.html
+++ b/doc/stdlibref/moneypunct.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>moneypunct, moneypunct_byname</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="money-get.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="money-put.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>moneypunct, moneypunct_byname</H2>
diff --git a/doc/stdlibref/multimap.html b/doc/stdlibref/multimap.html
index 0237a4c..df4076f 100644
--- a/doc/stdlibref/multimap.html
+++ b/doc/stdlibref/multimap.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>multimap</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="money-put.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="multiplies.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>multimap</H2>
diff --git a/doc/stdlibref/multiplies.html b/doc/stdlibref/multiplies.html
index ad77873..987b6d6 100644
--- a/doc/stdlibref/multiplies.html
+++ b/doc/stdlibref/multiplies.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>multiplies</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="multimap.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="multiset.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>multiplies</H2>
diff --git a/doc/stdlibref/multiset.html b/doc/stdlibref/multiset.html
index faaf6cc..a7aa95a 100644
--- a/doc/stdlibref/multiset.html
+++ b/doc/stdlibref/multiset.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>multiset</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="multiplies.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="negate.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>multiset</H2>
diff --git a/doc/stdlibref/negate.html b/doc/stdlibref/negate.html
index b1a87d8..bf054fd 100644
--- a/doc/stdlibref/negate.html
+++ b/doc/stdlibref/negate.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>negate</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="multiset.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="negators.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>negate</H2>
diff --git a/doc/stdlibref/negators.html b/doc/stdlibref/negators.html
index 8f8c9fe..c2f259e 100644
--- a/doc/stdlibref/negators.html
+++ b/doc/stdlibref/negators.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Negators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="negate.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="new-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>Negators</H2>
diff --git a/doc/stdlibref/new-h.html b/doc/stdlibref/new-h.html
index 894d054..666168f 100644
--- a/doc/stdlibref/new-h.html
+++ b/doc/stdlibref/new-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;new&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="negators.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="next-permutation.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;new&gt;</H2>
diff --git a/doc/stdlibref/next-permutation.html b/doc/stdlibref/next-permutation.html
index 0c5fcc8..37fdeee 100644
--- a/doc/stdlibref/next-permutation.html
+++ b/doc/stdlibref/next-permutation.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>next_permutation()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="new-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="not1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>next_permutation()</H2>
diff --git a/doc/stdlibref/noframes.html b/doc/stdlibref/noframes.html
index 800a951..4394589 100644
--- a/doc/stdlibref/noframes.html
+++ b/doc/stdlibref/noframes.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>C++ Standard Library Module Reference Guide</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <H1>C++ Standard Library Module Reference Guide</H1>
 <P>Welcome to the <I>C++ Standard Library Module Reference Guide</I>.</P>
@@ -24,7 +24,7 @@
 <H3><A HREF="III.html">Part III: Obsolete Classes Reference</A></H3>
 <H3><A HREF="IV.html">Part IV: Appendixes</A></H3>
 <H4><A HREF="A.html">Appendix A: Implementation Details</A></H4>
-<H4><A HREF="B.html">Appendix B: Rogue Wave Extensions to the Standard</A></H4>
+<H4><A HREF="B.html">Appendix B: Extensions to the C++ Standard</A></H4>
 </UL>
 
 
diff --git a/doc/stdlibref/not-equal-to.html b/doc/stdlibref/not-equal-to.html
index e42e5ba..74a6e3d 100644
--- a/doc/stdlibref/not-equal-to.html
+++ b/doc/stdlibref/not-equal-to.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>not_equal_to</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="not2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="nth-element.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>not_equal_to</H2>
diff --git a/doc/stdlibref/not1.html b/doc/stdlibref/not1.html
index ae9ccb7..0fd4404 100644
--- a/doc/stdlibref/not1.html
+++ b/doc/stdlibref/not1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>not1()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="next-permutation.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="not2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>not1()</H2>
diff --git a/doc/stdlibref/not2.html b/doc/stdlibref/not2.html
index c351528..0c87ca6 100644
--- a/doc/stdlibref/not2.html
+++ b/doc/stdlibref/not2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>not2()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="not1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="not-equal-to.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>not2()</H2>
diff --git a/doc/stdlibref/nth-element.html b/doc/stdlibref/nth-element.html
index 94960db..4f2ba82 100644
--- a/doc/stdlibref/nth-element.html
+++ b/doc/stdlibref/nth-element.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>nth_element()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="not-equal-to.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="num-get.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>nth_element()</H2>
diff --git a/doc/stdlibref/num-get.html b/doc/stdlibref/num-get.html
index fa7ec65..c0cb1c9 100644
--- a/doc/stdlibref/num-get.html
+++ b/doc/stdlibref/num-get.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>num_get</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="nth-element.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="num-put.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>num_get</H2>
diff --git a/doc/stdlibref/num-put.html b/doc/stdlibref/num-put.html
index 36b678b..b2c76e8 100644
--- a/doc/stdlibref/num-put.html
+++ b/doc/stdlibref/num-put.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>num_put</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="num-get.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="numeric-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>num_put</H2>
diff --git a/doc/stdlibref/numeric-h.html b/doc/stdlibref/numeric-h.html
index d476c0d..6f886af 100644
--- a/doc/stdlibref/numeric-h.html
+++ b/doc/stdlibref/numeric-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;numeric&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="num-put.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="numeric-limits.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;numeric&gt;</H2>
diff --git a/doc/stdlibref/numeric-limits.html b/doc/stdlibref/numeric-limits.html
index 844946f..2652c4f 100644
--- a/doc/stdlibref/numeric-limits.html
+++ b/doc/stdlibref/numeric-limits.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>numeric_limits</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="numeric-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="numpunct.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>numeric_limits</H2>
diff --git a/doc/stdlibref/numpunct.html b/doc/stdlibref/numpunct.html
index 1689100..bd0f2ae 100644
--- a/doc/stdlibref/numpunct.html
+++ b/doc/stdlibref/numpunct.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>numpunct, numpunct_byname</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="numeric-limits.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="operatordelete.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>numpunct, numpunct_byname</H2>
diff --git a/doc/stdlibref/operatordelete.html b/doc/stdlibref/operatordelete.html
index 25fd40a..4f78441 100644
--- a/doc/stdlibref/operatordelete.html
+++ b/doc/stdlibref/operatordelete.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>operator delete</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="numpunct.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="operatornew.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>operator delete</H2>
diff --git a/doc/stdlibref/operatornew.html b/doc/stdlibref/operatornew.html
index 8ce54fe..16c5655 100644
--- a/doc/stdlibref/operatornew.html
+++ b/doc/stdlibref/operatornew.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>operator new</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="operatordelete.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="operators.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>operator new</H2>
diff --git a/doc/stdlibref/operators.html b/doc/stdlibref/operators.html
index b3d6468..76d8c49 100644
--- a/doc/stdlibref/operators.html
+++ b/doc/stdlibref/operators.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Operators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="operatornew.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="ostream-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>Operators</H2>
diff --git a/doc/stdlibref/ostream-h.html b/doc/stdlibref/ostream-h.html
index 1efd6b8..749a451 100644
--- a/doc/stdlibref/ostream-h.html
+++ b/doc/stdlibref/ostream-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;ostream&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="operators.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="ostream-iterator.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;ostream&gt;</H2>
diff --git a/doc/stdlibref/ostream-iterator.html b/doc/stdlibref/ostream-iterator.html
index fb9c1ee..306bb02 100644
--- a/doc/stdlibref/ostream-iterator.html
+++ b/doc/stdlibref/ostream-iterator.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>ostream_iterator</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="ostream-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="ostreambuf-iterator.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>ostream_iterator</H2>
diff --git a/doc/stdlibref/ostreambuf-iterator.html b/doc/stdlibref/ostreambuf-iterator.html
index 01a30ee..d8b8498 100644
--- a/doc/stdlibref/ostreambuf-iterator.html
+++ b/doc/stdlibref/ostreambuf-iterator.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>ostreambuf_iterator</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="ostream-iterator.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="ostrstream.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>ostreambuf_iterator</H2>
diff --git a/doc/stdlibref/ostrstream.html b/doc/stdlibref/ostrstream.html
index 4bd9bc2..47afd09 100644
--- a/doc/stdlibref/ostrstream.html
+++ b/doc/stdlibref/ostrstream.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>ostrstream</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="ostreambuf-iterator.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="out-of-range.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>ostrstream</H2>
diff --git a/doc/stdlibref/out-of-range.html b/doc/stdlibref/out-of-range.html
index 51a63b0..3b55292 100644
--- a/doc/stdlibref/out-of-range.html
+++ b/doc/stdlibref/out-of-range.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>out_of_range</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="ostrstream.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="outputiterators.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>out_of_range</H2>
diff --git a/doc/stdlibref/outputiterators.html b/doc/stdlibref/outputiterators.html
index e123190..e9919b3 100644
--- a/doc/stdlibref/outputiterators.html
+++ b/doc/stdlibref/outputiterators.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Output Iterators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="out-of-range.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="overflow-error.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>Output Iterators</H2>
diff --git a/doc/stdlibref/overflow-error.html b/doc/stdlibref/overflow-error.html
index 1900660..7c5ad30 100644
--- a/doc/stdlibref/overflow-error.html
+++ b/doc/stdlibref/overflow-error.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>overflow_error</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="outputiterators.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="pair.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>overflow_error</H2>
diff --git a/doc/stdlibref/pair.html b/doc/stdlibref/pair.html
index 7130367..90acc95 100644
--- a/doc/stdlibref/pair.html
+++ b/doc/stdlibref/pair.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>pair</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="overflow-error.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="partial-sort.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>pair</H2>
diff --git a/doc/stdlibref/partial-sort-copy.html b/doc/stdlibref/partial-sort-copy.html
index 71d0494..6f4b31f 100644
--- a/doc/stdlibref/partial-sort-copy.html
+++ b/doc/stdlibref/partial-sort-copy.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>partial_sort_copy()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="partial-sort.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="partial-sum.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>partial_sort_copy()</H2>
diff --git a/doc/stdlibref/partial-sort.html b/doc/stdlibref/partial-sort.html
index 8267017..3c424a6 100644
--- a/doc/stdlibref/partial-sort.html
+++ b/doc/stdlibref/partial-sort.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>partial_sort()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="pair.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="partial-sort-copy.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>partial_sort()</H2>
@@ -43,7 +43,7 @@
 <A NAME="sec4"><H3>Description</H3></A>
 <P>The <SAMP>partial_sort()</SAMP> algorithm takes the range <SAMP>[start,finish)</SAMP> and sorts the first <SAMP>mid - start</SAMP> values in ascending order. The remaining elements in the range (those in <SAMP>[mid, finish)</SAMP>) are not in any defined order. The first version of the algorithm uses <SAMP>operator&lt;()</SAMP> as the comparison operator for the sort. The second version uses the function object <SAMP>comp</SAMP>.</P>
 <A NAME="sec5"><H3>Complexity</H3></A>
-<P><SAMP>partial_sort()</SAMP> does approximately<SAMP> (finish  - start) * log(mid-start) </SAMP>comparisons. The Rogue Wave implementation of <SAMP>partial_sort()</SAMP> is implemented using heapsort, which is <SAMP>O(N * log(N))</SAMP> in the worst case. </P>
+<P><SAMP>partial_sort()</SAMP> does approximately<SAMP> (finish  - start) * log(mid-start) </SAMP>comparisons. This implementation of <SAMP>partial_sort()</SAMP> is implemented using heapsort, which is <SAMP>O(N * log(N))</SAMP> in the worst case. </P>
 <A NAME="sec6"><H3>Example</H3></A>
 
 <UL><PRE>//
diff --git a/doc/stdlibref/partial-sum.html b/doc/stdlibref/partial-sum.html
index 27d339a..ba71fc8 100644
--- a/doc/stdlibref/partial-sum.html
+++ b/doc/stdlibref/partial-sum.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>partial_sum()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="partial-sort-copy.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="partition.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>partial_sum()</H2>
diff --git a/doc/stdlibref/partition.html b/doc/stdlibref/partition.html
index b23ddc9..a13a1f9 100644
--- a/doc/stdlibref/partition.html
+++ b/doc/stdlibref/partition.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>partition()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="partial-sum.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="plus.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>partition()</H2>
diff --git a/doc/stdlibref/plus.html b/doc/stdlibref/plus.html
index d66f9de..b83c6c4 100644
--- a/doc/stdlibref/plus.html
+++ b/doc/stdlibref/plus.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>plus</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="partition.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="pointer-to-binary-function.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>plus</H2>
diff --git a/doc/stdlibref/pointer-to-binary-function.html b/doc/stdlibref/pointer-to-binary-function.html
index bfb3491..166a87f 100644
--- a/doc/stdlibref/pointer-to-binary-function.html
+++ b/doc/stdlibref/pointer-to-binary-function.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>pointer_to_binary_function</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="plus.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="pointer-to-unary-function.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>pointer_to_binary_function</H2>
diff --git a/doc/stdlibref/pointer-to-unary-function.html b/doc/stdlibref/pointer-to-unary-function.html
index ce39728..ab21564 100644
--- a/doc/stdlibref/pointer-to-unary-function.html
+++ b/doc/stdlibref/pointer-to-unary-function.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>pointer_to_unary_function</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="pointer-to-binary-function.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="pop-heap.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>pointer_to_unary_function</H2>
diff --git a/doc/stdlibref/pop-heap.html b/doc/stdlibref/pop-heap.html
index 1d8fe30..56662ca 100644
--- a/doc/stdlibref/pop-heap.html
+++ b/doc/stdlibref/pop-heap.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>pop_heap()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="pointer-to-unary-function.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="predicates.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>pop_heap()</H2>
diff --git a/doc/stdlibref/predicates.html b/doc/stdlibref/predicates.html
index b91c6d7..059233c 100644
--- a/doc/stdlibref/predicates.html
+++ b/doc/stdlibref/predicates.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Predicates</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="pop-heap.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="prev-permutation.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>Predicates</H2><UL>
diff --git a/doc/stdlibref/prev-permutation.html b/doc/stdlibref/prev-permutation.html
index 2321f00..2e9427f 100644
--- a/doc/stdlibref/prev-permutation.html
+++ b/doc/stdlibref/prev-permutation.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>prev_permutation()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="predicates.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="priority-queue.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>prev_permutation()</H2>
diff --git a/doc/stdlibref/priority-queue.html b/doc/stdlibref/priority-queue.html
index 6470928..c8f0dce 100644
--- a/doc/stdlibref/priority-queue.html
+++ b/doc/stdlibref/priority-queue.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>priority_queue</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="prev-permutation.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="ptr-fun.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>priority_queue</H2>
diff --git a/doc/stdlibref/ptr-fun.html b/doc/stdlibref/ptr-fun.html
index ece8b0e..9617883 100644
--- a/doc/stdlibref/ptr-fun.html
+++ b/doc/stdlibref/ptr-fun.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>ptr_fun()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="priority-queue.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="push-heap.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>ptr_fun()</H2>
diff --git a/doc/stdlibref/push-heap.html b/doc/stdlibref/push-heap.html
index 12f92b4..db4b47c 100644
--- a/doc/stdlibref/push-heap.html
+++ b/doc/stdlibref/push-heap.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>push_heap()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="ptr-fun.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="queue-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>push_heap()</H2>
diff --git a/doc/stdlibref/queue-h.html b/doc/stdlibref/queue-h.html
index f671e02..3b40f3a 100644
--- a/doc/stdlibref/queue-h.html
+++ b/doc/stdlibref/queue-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;queue&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="push-heap.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="queue.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;queue&gt;</H2>
diff --git a/doc/stdlibref/queue.html b/doc/stdlibref/queue.html
index f5bf36d..6823fa2 100644
--- a/doc/stdlibref/queue.html
+++ b/doc/stdlibref/queue.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>queue</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="queue-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="randomaccessiterators.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>queue</H2>
diff --git a/doc/stdlibref/random-shuffle.html b/doc/stdlibref/random-shuffle.html
index 02892c9..e84dee0 100644
--- a/doc/stdlibref/random-shuffle.html
+++ b/doc/stdlibref/random-shuffle.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>random_shuffle()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="randomaccessiterators.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="range-error.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>random_shuffle()</H2>
diff --git a/doc/stdlibref/randomaccessiterators.html b/doc/stdlibref/randomaccessiterators.html
index ff4c20b..1cc038a 100644
--- a/doc/stdlibref/randomaccessiterators.html
+++ b/doc/stdlibref/randomaccessiterators.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Random Access Iterators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="queue.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="random-shuffle.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>Random Access Iterators</H2>
diff --git a/doc/stdlibref/range-error.html b/doc/stdlibref/range-error.html
index 278b3f1..fb95262 100644
--- a/doc/stdlibref/range-error.html
+++ b/doc/stdlibref/range-error.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>range_error</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="random-shuffle.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="raw-storage-iterator.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>range_error</H2>
diff --git a/doc/stdlibref/raw-storage-iterator.html b/doc/stdlibref/raw-storage-iterator.html
index 1d34dc8..2e0a271 100644
--- a/doc/stdlibref/raw-storage-iterator.html
+++ b/doc/stdlibref/raw-storage-iterator.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>raw_storage_iterator</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="range-error.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="remove.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>raw_storage_iterator</H2>
diff --git a/doc/stdlibref/remove-copy-if.html b/doc/stdlibref/remove-copy-if.html
index 41d9142..2d660de 100644
--- a/doc/stdlibref/remove-copy-if.html
+++ b/doc/stdlibref/remove-copy-if.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>remove_copy_if()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="remove-copy.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="remove-if.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>remove_copy_if()</H2>
diff --git a/doc/stdlibref/remove-copy.html b/doc/stdlibref/remove-copy.html
index 51504e3..a91b97b 100644
--- a/doc/stdlibref/remove-copy.html
+++ b/doc/stdlibref/remove-copy.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>remove_copy()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="remove.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="remove-copy-if.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>remove_copy()</H2>
diff --git a/doc/stdlibref/remove-if.html b/doc/stdlibref/remove-if.html
index d85719e..11cb7bf 100644
--- a/doc/stdlibref/remove-if.html
+++ b/doc/stdlibref/remove-if.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>remove_if()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="remove-copy-if.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="replace.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>remove_if()</H2>
diff --git a/doc/stdlibref/remove.html b/doc/stdlibref/remove.html
index fb34709..7ebf80f 100644
--- a/doc/stdlibref/remove.html
+++ b/doc/stdlibref/remove.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>remove()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="raw-storage-iterator.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="remove-copy.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>remove()</H2>
diff --git a/doc/stdlibref/replace-copy-if.html b/doc/stdlibref/replace-copy-if.html
index 06c6bd8..a60aad9 100644
--- a/doc/stdlibref/replace-copy-if.html
+++ b/doc/stdlibref/replace-copy-if.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>replace_copy_if()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="replace-copy.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="replace-if.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>replace_copy_if()</H2>
diff --git a/doc/stdlibref/replace-copy.html b/doc/stdlibref/replace-copy.html
index 07bcf28..dead03f 100644
--- a/doc/stdlibref/replace-copy.html
+++ b/doc/stdlibref/replace-copy.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>replace_copy()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="replace.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="replace-copy-if.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>replace_copy()</H2>
diff --git a/doc/stdlibref/replace-if.html b/doc/stdlibref/replace-if.html
index 1397049..7685d92 100644
--- a/doc/stdlibref/replace-if.html
+++ b/doc/stdlibref/replace-if.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>replace_if()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="replace-copy-if.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="return-temporary-buffer.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>replace_if()</H2>
diff --git a/doc/stdlibref/replace.html b/doc/stdlibref/replace.html
index 57eaa99..bc82f47 100644
--- a/doc/stdlibref/replace.html
+++ b/doc/stdlibref/replace.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>replace()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="remove-if.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="replace-copy.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>replace()</H2>
diff --git a/doc/stdlibref/return-temporary-buffer.html b/doc/stdlibref/return-temporary-buffer.html
index c87b926..9719ae0 100644
--- a/doc/stdlibref/return-temporary-buffer.html
+++ b/doc/stdlibref/return-temporary-buffer.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>return_temporary_buffer()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="replace-if.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="reverse.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>return_temporary_buffer()</H2>
diff --git a/doc/stdlibref/reverse-copy.html b/doc/stdlibref/reverse-copy.html
index 173b229..75b03cc 100644
--- a/doc/stdlibref/reverse-copy.html
+++ b/doc/stdlibref/reverse-copy.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>reverse_copy()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="reverse.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="reverse-iterator.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>reverse_copy()</H2>
diff --git a/doc/stdlibref/reverse-iterator.html b/doc/stdlibref/reverse-iterator.html
index fad3e2f..1f3aa03 100644
--- a/doc/stdlibref/reverse-iterator.html
+++ b/doc/stdlibref/reverse-iterator.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>reverse_iterator</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="reverse-copy.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="rotate.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>reverse_iterator</H2>
diff --git a/doc/stdlibref/reverse.html b/doc/stdlibref/reverse.html
index 670efa8..25c5f5f 100644
--- a/doc/stdlibref/reverse.html
+++ b/doc/stdlibref/reverse.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>reverse()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="return-temporary-buffer.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="reverse-copy.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>reverse()</H2>
diff --git a/doc/stdlibref/rotate.html b/doc/stdlibref/rotate.html
index 05bb5b7..f2b3f51 100644
--- a/doc/stdlibref/rotate.html
+++ b/doc/stdlibref/rotate.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>rotate(), rotate_copy()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="reverse-iterator.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="runtime-error.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>rotate(), rotate_copy()</H2>
diff --git a/doc/stdlibref/runtime-error.html b/doc/stdlibref/runtime-error.html
index 1a95a2d..ada8741 100644
--- a/doc/stdlibref/runtime-error.html
+++ b/doc/stdlibref/runtime-error.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>runtime_error</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="rotate.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="search.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>runtime_error</H2>
diff --git a/doc/stdlibref/search.html b/doc/stdlibref/search.html
index 33ad5e3..51486a8 100644
--- a/doc/stdlibref/search.html
+++ b/doc/stdlibref/search.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>search(), search_n()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="runtime-error.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="sequences.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>search(), search_n()</H2>
diff --git a/doc/stdlibref/sequences.html b/doc/stdlibref/sequences.html
index 177825a..59245ff 100644
--- a/doc/stdlibref/sequences.html
+++ b/doc/stdlibref/sequences.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Sequences</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="search.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="set-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>Sequences</H2>
diff --git a/doc/stdlibref/set-difference.html b/doc/stdlibref/set-difference.html
index a4d9b0f..856bfe4 100644
--- a/doc/stdlibref/set-difference.html
+++ b/doc/stdlibref/set-difference.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>set_difference()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="set.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="set-intersection.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>set_difference()</H2>
diff --git a/doc/stdlibref/set-h.html b/doc/stdlibref/set-h.html
index c9baa78..992c162 100644
--- a/doc/stdlibref/set-h.html
+++ b/doc/stdlibref/set-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;set&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="sequences.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="set.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;set&gt;</H2>
diff --git a/doc/stdlibref/set-intersection.html b/doc/stdlibref/set-intersection.html
index 34051b6..ffb264c 100644
--- a/doc/stdlibref/set-intersection.html
+++ b/doc/stdlibref/set-intersection.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>set_intersection()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="set-difference.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="set-symmetric-difference.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>set_intersection()</H2>
diff --git a/doc/stdlibref/set-symmetric-difference.html b/doc/stdlibref/set-symmetric-difference.html
index 6342d2e..f2284a0 100644
--- a/doc/stdlibref/set-symmetric-difference.html
+++ b/doc/stdlibref/set-symmetric-difference.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>set_symmetric_difference()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="set-intersection.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="set-union.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>set_symmetric_difference()</H2>
diff --git a/doc/stdlibref/set-union.html b/doc/stdlibref/set-union.html
index 35544c8..03edf8f 100644
--- a/doc/stdlibref/set-union.html
+++ b/doc/stdlibref/set-union.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>set_union()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="set-symmetric-difference.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="slice.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>set_union()</H2>
diff --git a/doc/stdlibref/set.html b/doc/stdlibref/set.html
index 8cfde77..d859ca6 100644
--- a/doc/stdlibref/set.html
+++ b/doc/stdlibref/set.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>set</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="set-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="set-difference.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>set</H2>
diff --git a/doc/stdlibref/slice-array.html b/doc/stdlibref/slice-array.html
index dc42c69..54b6203 100644
--- a/doc/stdlibref/slice-array.html
+++ b/doc/stdlibref/slice-array.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>slice_array</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="slice.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="sort.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>slice_array</H2>
diff --git a/doc/stdlibref/slice.html b/doc/stdlibref/slice.html
index 3942323..309da57 100644
--- a/doc/stdlibref/slice.html
+++ b/doc/stdlibref/slice.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>slice</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="set-union.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="slice-array.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>slice</H2>
diff --git a/doc/stdlibref/sort-heap.html b/doc/stdlibref/sort-heap.html
index a53be8c..26afa1e 100644
--- a/doc/stdlibref/sort-heap.html
+++ b/doc/stdlibref/sort-heap.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>sort_heap()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="sort.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="sstream-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>sort_heap()</H2>
diff --git a/doc/stdlibref/sort.html b/doc/stdlibref/sort.html
index 3bceca9..88e3e22 100644
--- a/doc/stdlibref/sort.html
+++ b/doc/stdlibref/sort.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>sort()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="slice-array.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="sort-heap.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>sort()</H2>
diff --git a/doc/stdlibref/sstream-h.html b/doc/stdlibref/sstream-h.html
index 1440eb3..b340065 100644
--- a/doc/stdlibref/sstream-h.html
+++ b/doc/stdlibref/sstream-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;sstream&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="sort-heap.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="stable-partition.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;sstream&gt;</H2>
diff --git a/doc/stdlibref/stable-partition.html b/doc/stdlibref/stable-partition.html
index 57bf5d9..35f2bca 100644
--- a/doc/stdlibref/stable-partition.html
+++ b/doc/stdlibref/stable-partition.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>stable_partition()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="sstream-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="stable-sort.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>stable_partition()</H2>
diff --git a/doc/stdlibref/stable-sort.html b/doc/stdlibref/stable-sort.html
index 694e17c..9ebaf29 100644
--- a/doc/stdlibref/stable-sort.html
+++ b/doc/stdlibref/stable-sort.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>stable_sort()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="stable-partition.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="stack-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>stable_sort()</H2>
diff --git a/doc/stdlibref/stack-h.html b/doc/stdlibref/stack-h.html
index ef5d45c..4fb05a6 100644
--- a/doc/stdlibref/stack-h.html
+++ b/doc/stdlibref/stack-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;stack&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="stable-sort.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="stack.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;stack&gt;</H2>
diff --git a/doc/stdlibref/stack.html b/doc/stdlibref/stack.html
index d2a6ad3..9b9dc5e 100644
--- a/doc/stdlibref/stack.html
+++ b/doc/stdlibref/stack.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>stack</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="stack-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="stdexcept-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>stack</H2>
diff --git a/doc/stdlibref/stdexcept-h.html b/doc/stdlibref/stdexcept-h.html
index a6a8c43..3dc9b4e 100644
--- a/doc/stdlibref/stdexcept-h.html
+++ b/doc/stdlibref/stdexcept-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;stdexcept&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="stack.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="streamiterators.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;stdexcept&gt;</H2>
diff --git a/doc/stdlibref/streambuf-h.html b/doc/stdlibref/streambuf-h.html
index 149e00b..35a87c5 100644
--- a/doc/stdlibref/streambuf-h.html
+++ b/doc/stdlibref/streambuf-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;streambuf&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="streamiterators.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="string-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;streambuf&gt;</H2>
diff --git a/doc/stdlibref/streamiterators.html b/doc/stdlibref/streamiterators.html
index ed0b5f7..59f133d 100644
--- a/doc/stdlibref/streamiterators.html
+++ b/doc/stdlibref/streamiterators.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Stream Iterators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="stdexcept-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="streambuf-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>Stream Iterators</H2>
diff --git a/doc/stdlibref/string-h.html b/doc/stdlibref/string-h.html
index 6b426d7..4079af9 100644
--- a/doc/stdlibref/string-h.html
+++ b/doc/stdlibref/string-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;string&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="streambuf-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="string.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;string&gt;</H2>
diff --git a/doc/stdlibref/string.html b/doc/stdlibref/string.html
index 5e51637..905fc03 100644
--- a/doc/stdlibref/string.html
+++ b/doc/stdlibref/string.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>string</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="string-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="strstream-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>string</H2>
diff --git a/doc/stdlibref/strstream-h.html b/doc/stdlibref/strstream-h.html
index 9466b96..b1b65c8 100644
--- a/doc/stdlibref/strstream-h.html
+++ b/doc/stdlibref/strstream-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;strstream&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="string.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="strstream.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;strstream&gt;</H2>
diff --git a/doc/stdlibref/strstream.html b/doc/stdlibref/strstream.html
index 936e91d..d31a0a1 100644
--- a/doc/stdlibref/strstream.html
+++ b/doc/stdlibref/strstream.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>strstream</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="strstream-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="strstreambuf.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>strstream</H2>
diff --git a/doc/stdlibref/strstreambuf.html b/doc/stdlibref/strstreambuf.html
index 3ad9354..91cc92a 100644
--- a/doc/stdlibref/strstreambuf.html
+++ b/doc/stdlibref/strstreambuf.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>strstreambuf</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="strstream.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="swap.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>strstreambuf</H2>
diff --git a/doc/stdlibref/swap-ranges.html b/doc/stdlibref/swap-ranges.html
index f50176b..3ca2e94 100644
--- a/doc/stdlibref/swap-ranges.html
+++ b/doc/stdlibref/swap-ranges.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>swap_ranges()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="swap.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="time-get.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>swap_ranges()</H2>
diff --git a/doc/stdlibref/swap.html b/doc/stdlibref/swap.html
index 03b4276..5ea15b9 100644
--- a/doc/stdlibref/swap.html
+++ b/doc/stdlibref/swap.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>swap()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="strstreambuf.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="swap-ranges.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>swap()</H2>
diff --git a/doc/stdlibref/time-get-byname.html b/doc/stdlibref/time-get-byname.html
index 4b79993..1ce03c0 100644
--- a/doc/stdlibref/time-get-byname.html
+++ b/doc/stdlibref/time-get-byname.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>time_get_byname</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="time-get.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="time-put.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>time_get_byname</H2>
diff --git a/doc/stdlibref/time-get.html b/doc/stdlibref/time-get.html
index a9f55a0..8b67e12 100644
--- a/doc/stdlibref/time-get.html
+++ b/doc/stdlibref/time-get.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>time_get</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="swap-ranges.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="time-get-byname.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>time_get</H2>
diff --git a/doc/stdlibref/time-put-byname.html b/doc/stdlibref/time-put-byname.html
index 68c018d..c6a66ce 100644
--- a/doc/stdlibref/time-put-byname.html
+++ b/doc/stdlibref/time-put-byname.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>time_put_byname</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="time-put.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="tolower.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>time_put_byname</H2>
diff --git a/doc/stdlibref/time-put.html b/doc/stdlibref/time-put.html
index fc47086..85d2c4e 100644
--- a/doc/stdlibref/time-put.html
+++ b/doc/stdlibref/time-put.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>time_put</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="time-get-byname.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="time-put-byname.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>time_put</H2>
diff --git a/doc/stdlibref/tindex.html b/doc/stdlibref/tindex.html
index 47f4a07..d50c7d9 100644
--- a/doc/stdlibref/tindex.html
+++ b/doc/stdlibref/tindex.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Function and Datatype Index</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <IMG SRC="images/bnoprev.gif" WIDTH=20 HEIGHT=21 ALT="No previous file" BORDER=O><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><IMG SRC="images/bnoindex.gif" WIDTH=56 HEIGHT=21 ALT="No link" BORDER=O><IMG SRC="images/bnonext.gif" WIDTH=25 HEIGHT=21 ALT="No next file" BORDER=O><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>Function and Datatype Index</H2>
diff --git a/doc/stdlibref/tolower.html b/doc/stdlibref/tolower.html
index a23faf3..456809c 100644
--- a/doc/stdlibref/tolower.html
+++ b/doc/stdlibref/tolower.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>tolower()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="time-put-byname.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="toupper.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>tolower()</H2>
diff --git a/doc/stdlibref/toupper.html b/doc/stdlibref/toupper.html
index 024f00d..bf5a8ea 100644
--- a/doc/stdlibref/toupper.html
+++ b/doc/stdlibref/toupper.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>toupper()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="tolower.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="transform.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>toupper()</H2>
diff --git a/doc/stdlibref/transform.html b/doc/stdlibref/transform.html
index c938f5f..6826bd9 100644
--- a/doc/stdlibref/transform.html
+++ b/doc/stdlibref/transform.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>transform()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="toupper.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="typeinfo-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>transform()</H2>
diff --git a/doc/stdlibref/typeinfo-h.html b/doc/stdlibref/typeinfo-h.html
index ec3fc40..3961cba 100644
--- a/doc/stdlibref/typeinfo-h.html
+++ b/doc/stdlibref/typeinfo-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;typeinfo&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="transform.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="unary-function.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;typeinfo&gt;</H2>
diff --git a/doc/stdlibref/unary-function.html b/doc/stdlibref/unary-function.html
index d7f97a8..f542bae 100644
--- a/doc/stdlibref/unary-function.html
+++ b/doc/stdlibref/unary-function.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>unary_function</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="typeinfo-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="unary-negate.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>unary_function</H2>
diff --git a/doc/stdlibref/unary-negate.html b/doc/stdlibref/unary-negate.html
index c28e665..ddeb4e6 100644
--- a/doc/stdlibref/unary-negate.html
+++ b/doc/stdlibref/unary-negate.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>unary_negate</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="unary-function.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="underflow-error.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>unary_negate</H2>
diff --git a/doc/stdlibref/underflow-error.html b/doc/stdlibref/underflow-error.html
index 675dede..ad0c6e5 100644
--- a/doc/stdlibref/underflow-error.html
+++ b/doc/stdlibref/underflow-error.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>underflow_error</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="unary-negate.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="uninitialized-copy.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>underflow_error</H2>
diff --git a/doc/stdlibref/uninitialized-copy.html b/doc/stdlibref/uninitialized-copy.html
index 43dc0d3..7617c83 100644
--- a/doc/stdlibref/uninitialized-copy.html
+++ b/doc/stdlibref/uninitialized-copy.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>uninitialized_copy()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="underflow-error.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="uninitialized-fill.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>uninitialized_copy()</H2>
diff --git a/doc/stdlibref/uninitialized-fill-n.html b/doc/stdlibref/uninitialized-fill-n.html
index a2ca7ca..6896e00 100644
--- a/doc/stdlibref/uninitialized-fill-n.html
+++ b/doc/stdlibref/uninitialized-fill-n.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>uninitialized_fill_n()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="uninitialized-fill.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="unique.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>uninitialized_fill_n()</H2>
diff --git a/doc/stdlibref/uninitialized-fill.html b/doc/stdlibref/uninitialized-fill.html
index 74ec029..104d316 100644
--- a/doc/stdlibref/uninitialized-fill.html
+++ b/doc/stdlibref/uninitialized-fill.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>uninitialized_fill()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="uninitialized-copy.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="uninitialized-fill-n.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>uninitialized_fill()</H2>
diff --git a/doc/stdlibref/unique.html b/doc/stdlibref/unique.html
index 1f04c63..842e88b 100644
--- a/doc/stdlibref/unique.html
+++ b/doc/stdlibref/unique.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>unique(), unique_copy()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="uninitialized-fill-n.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="upper-bound.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>unique(), unique_copy()</H2>
diff --git a/doc/stdlibref/upper-bound.html b/doc/stdlibref/upper-bound.html
index b580b4c..4445608 100644
--- a/doc/stdlibref/upper-bound.html
+++ b/doc/stdlibref/upper-bound.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>upper_bound()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="unique.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="use-facet.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>upper_bound()</H2>
diff --git a/doc/stdlibref/use-facet.html b/doc/stdlibref/use-facet.html
index df3a68d..2dd31bb 100644
--- a/doc/stdlibref/use-facet.html
+++ b/doc/stdlibref/use-facet.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>use_facet()</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="upper-bound.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="utility-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>use_facet()</H2>
diff --git a/doc/stdlibref/utility-h.html b/doc/stdlibref/utility-h.html
index 9f6b19c..c53ab1a 100644
--- a/doc/stdlibref/utility-h.html
+++ b/doc/stdlibref/utility-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;utility&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="use-facet.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="valarray-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;utility&gt;</H2>
diff --git a/doc/stdlibref/valarray-h.html b/doc/stdlibref/valarray-h.html
index fe82bd1..b01781d 100644
--- a/doc/stdlibref/valarray-h.html
+++ b/doc/stdlibref/valarray-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;valarray&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="utility-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="valarray.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;valarray&gt;</H2>
diff --git a/doc/stdlibref/valarray.html b/doc/stdlibref/valarray.html
index a88e51e..55d3626 100644
--- a/doc/stdlibref/valarray.html
+++ b/doc/stdlibref/valarray.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>valarray</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="valarray-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="vector-h.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>valarray</H2>
diff --git a/doc/stdlibref/vector-h.html b/doc/stdlibref/vector-h.html
index 6871615..19a6837 100644
--- a/doc/stdlibref/vector-h.html
+++ b/doc/stdlibref/vector-h.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>&lt;vector&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="valarray.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="vector.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>&lt;vector&gt;</H2>
diff --git a/doc/stdlibref/vector.html b/doc/stdlibref/vector.html
index 4c526ce..f43e18d 100644
--- a/doc/stdlibref/vector.html
+++ b/doc/stdlibref/vector.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>vector</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="vector-h.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="wcerr.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>vector</H2>
diff --git a/doc/stdlibref/wcerr.html b/doc/stdlibref/wcerr.html
index fdeaf41..9e3bff5 100644
--- a/doc/stdlibref/wcerr.html
+++ b/doc/stdlibref/wcerr.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>wcerr</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="vector.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="wcin.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>wcerr</H2>
diff --git a/doc/stdlibref/wcin.html b/doc/stdlibref/wcin.html
index 850a163..091691a 100644
--- a/doc/stdlibref/wcin.html
+++ b/doc/stdlibref/wcin.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>wcin</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="wcerr.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="wclog.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>wcin</H2>
diff --git a/doc/stdlibref/wclog.html b/doc/stdlibref/wclog.html
index 6d2db30..586d5bf 100644
--- a/doc/stdlibref/wclog.html
+++ b/doc/stdlibref/wclog.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>wclog</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="wcin.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="wcout.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>wclog</H2>
diff --git a/doc/stdlibref/wcout.html b/doc/stdlibref/wcout.html
index 3996273..208d7c0 100644
--- a/doc/stdlibref/wcout.html
+++ b/doc/stdlibref/wcout.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>wcout</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="wclog.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="wstring.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>wcout</H2>
diff --git a/doc/stdlibref/wstring.html b/doc/stdlibref/wstring.html
index b8d2088..1d6973e 100644
--- a/doc/stdlibref/wstring.html
+++ b/doc/stdlibref/wstring.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>wstring</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="wcout.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="III.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library Reference Guide</B></DIV>
 <H2>wstring</H2>
diff --git a/doc/stdlibug/1-1.html b/doc/stdlibug/1-1.html
index e881017..0a0da68 100644
--- a/doc/stdlibug/1-1.html
+++ b/doc/stdlibug/1-1.html
@@ -1,11 +1,11 @@
 <HTML>
 <HEAD>
 <TITLE>Welcome</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="1-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>1.1 Welcome</H2>
-<P>Congratulations on choosing the C++ Standard Library Module, the Rogue Wave implementation of the C++ Standard Library. This module is part of  SourcePro Core, an extensive set of fundamental C++ components. You can use this product with confidence: it is based on the final standard for the C++ language and library ratified in 1998 by the American National Standards Institute (ANSI) and the International Standards Organization (ISO).</P>
+<P>Congratulations on choosing the Apache C++ Standard Library, developed and donated to the Apache Software Foundation by <a href="www.roguewave.com">Rogue Wave Software</a>. This module is part of  SourcePro Core, an extensive set of fundamental C++ components. You can use this product with confidence: it is based on the final standard for the C++ language and library ratified in 1998 by the American National Standards Institute (ANSI) and the International Standards Organization (ISO).</P>
 <A NAME="idx1"><!></A>
 <P>Since its development by Dr. Bjarne Stroustrup in the 1980s, the C++ language has been widely used by professional programmers for the world's big, complex applications in telecommunications, finance, business, embedded systems, and computer-aided design. The final standardization of the C++ library now makes it easier to learn C++ and to use it across a wide variety of platforms. </P>
 <P>Standardization improves portability and stability. You can build reliable applications faster, and maintain them with less cost and effort, using the C++ Standard Library.</P>
diff --git a/doc/stdlibug/1-2.html b/doc/stdlibug/1-2.html
index b4903a3..64baa76 100644
--- a/doc/stdlibug/1-2.html
+++ b/doc/stdlibug/1-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Product Overview</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="1-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="1-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>1.2 Product Overview</H2>
@@ -27,7 +27,7 @@
 <P>The main disadvantage of using the C++ Standard Library directly is increased risk of error. For example, the library's iterators must not be mismatched or invalidated, and iterators in multithreaded environments should be wrapped before being shared among threads. The templates can cause less precise diagnostics, and code that grows unexpectedly large. Experience with the library and your own compiler will help diminish these problems.</P>
 <A NAME="123"><H3>1.2.3 Relationship to the Essential Tools Module</H3></A>
 <A NAME="idx4"><!></A>
-<P>This Rogue Wave implementation of the C++ Standard Library is certified for use with the  Essential Tools Module of SourcePro Core, which encapsulates the C++ Standard Library with an object-oriented interface. Used together, the Essential Tools and C++ Standard Library Modules are designed to provide the benefits of both low-level generic programming and object-orientation. </P>
+<P>This implementation of the C++ Standard Library is certified for use with the  Essential Tools Module of SourcePro Core, which encapsulates the C++ Standard Library with an object-oriented interface. Used together, the Essential Tools and C++ Standard Library Modules are designed to provide the benefits of both low-level generic programming and object-orientation. </P>
 <P>The Essential Tools Module also contains features not included in the standard, such as time, date, and regular expression classes, enhanced strings, hash containers, object persistence, and virtual streams. The Essential Networking Module of SourcePro Net extends the functionality of the Essential Tools Module with classes for network programming. For some programming tasks, you may find it easier and more convenient to use the Essential Tools and Essential Networking Modules without accessing the C++ Standard Library directly. </P>
 
 <BR>
diff --git a/doc/stdlibug/1-3.html b/doc/stdlibug/1-3.html
index b8b0d58..73f810c 100644
--- a/doc/stdlibug/1-3.html
+++ b/doc/stdlibug/1-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Usage Notes</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="1-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="1-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>1.3 Usage Notes</H2>
diff --git a/doc/stdlibug/1-4.html b/doc/stdlibug/1-4.html
index f4c82d3..da85696 100644
--- a/doc/stdlibug/1-4.html
+++ b/doc/stdlibug/1-4.html
@@ -1,15 +1,15 @@
 <HTML>
 <HEAD>
 <TITLE>Documentation Overview</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="1-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="1-5.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>1.4 Documentation Overview</H2>
 <A NAME="141"><H3>1.4.1 Locations of Online Documentation</H3></A>
 <A NAME="idx5"><!></A>
-<P>To help you learn to use the <B>C++ Standard Library Module</B> quickly and effectively, Rogue Wave provides the documentation described in <A HREF="1-4.html#Table&nbsp;1">Table&nbsp;1</A>. </P>
-<P><B>All Rogue Wave documentation is installed online when you install your product. In addition, printed copies of user's guides may be purchased from your sales representative. </B></P>
-<P><B>For easiest access to the Rogue Wave online documentation, open the file </B><SAMP><A HREF="../../index.html" TARGET="_top"><I>buildspace</I>\docs\index.html</A></SAMP><B> with your favorite browser, and follow the links to the documents you need.</B></P>
+<P>To help you learn to use the <B>C++ Standard Library Module</B> quickly and effectively, Apache C++ Standard Library comes with the documentation described in <A HREF="1-4.html#Table&nbsp;1">Table&nbsp;1</A>. </P>
+<P><B>All Apache C++ Standard Library documentation is installed online when you install your product. In addition, printed copies of user's guides may be purchased from your sales representative. </B></P>
+<P><B>For easiest access to the Apache C++ Standard Library online documentation, open the file </B><SAMP><A HREF="../../index.html" TARGET="_top"><I>buildspace</I>\docs\index.html</A></SAMP><B> with your favorite browser, and follow the links to the documents you need.</B></P>
 <P>Online documentation for the C++ Standard Library Module is available at the locations shown in <A HREF="1-4.html#Table&nbsp;1">Table&nbsp;1</A>.</P>
 <A NAME="idx6"><!></A>
 <H4><A NAME="Table&nbsp;1">Table&nbsp;1: Locations of online documentation&nbsp;</A></H4>
@@ -21,7 +21,7 @@
 </td><td valign=top><P CLASS="TABLE"><SAMP><I>buildspace</I></SAMP><SAMP>\docs\readmes\sourcepro-core\stdlib\readme.txt</SAMP></P>
 </td></tr>
 <tr><td valign=top><P CLASS="TABLE">HTML documentation</P>
-</td><td valign=top><P CLASS="TABLE">Single-point access to Rogue Wave HTML documentation:</P>
+</td><td valign=top><P CLASS="TABLE">Single-point access to Apache C++ Standard Library HTML documentation:</P>
 <P CLASS="TABLE"><SAMP><A HREF="../../index.html" TARGET="_top"><I>buildspace</I>\docs\index.html</A></SAMP></P>
 <P CLASS="TABLE">SourcePro documentation:</P>
 <P CLASS="TABLE"><I>Introduction to SourcePro C++:</I> <SAMP><A HREF="../startug/index.html" TARGET="_top"><I>buildspace</I>\docs\html\startug\index.html</A></SAMP></P>
diff --git a/doc/stdlibug/1-5.html b/doc/stdlibug/1-5.html
index cdfc821..7ab069e 100644
--- a/doc/stdlibug/1-5.html
+++ b/doc/stdlibug/1-5.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>About This Manual</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="1-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="1-6.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>1.5 About This Manual</H2>
@@ -55,7 +55,7 @@
 <LI><P CLASS="LIST"><B><A HREF="V.html">Part&nbsp;V, "Special Techniques,"</A></B> describes techniques such as using allocators, building containers and generic algorithms, using the traits technique, and dealing with exceptions.</P></LI>
 <LI><P CLASS="LIST"><B><A HREF="VI.html">Part&nbsp;VI, "Special Classes,"</A></B> devotes a chapter to each of the four unique classes <B><I><A HREF="../stdlibref/auto-ptr.html">auto_ptr</A></I></B>, <B><I><A HREF="../stdlibref/complex.html">complex</A></I></B>, <B><I><A HREF="../stdlibref/numeric-limits.html">numeric_limits</A></I></B>, and <B><I><A HREF="../stdlibref/valarray.html">valarray</A></I></B>.</P></LI>
 <LI><P CLASS="LIST"><B><A HREF="VII.html">Part&nbsp;VII, "Locales,"</A></B> describes the basics of internationalization.  It explains the differences between the C locale and the C++ locale. It defines a C++ locale and a facet, and tells how locales are created, composed, used, and replaced. It includes a complex example of a user-defined facet, which demonstrates how facets can be built and used in conjunction with iostreams.</P></LI>
-<LI><P CLASS="LIST"><B><A HREF="VIII.html">Part&nbsp;VIII, "Iostreams,"</A></B> explains the C++ stream input and output facilities commonly called <I>iostreams</I>. Beginning chapters cover the iostreams facility, how it works, and how it should be used; also, the iostreams architecture, its components, and class hierarchy. Middle chapters cover the basic operation of iostreams, and both simple and advanced techniques for extending the iostreams framework. Final chapters describe the main differences between the C++ Standard Library iostreams, the traditional iostreams, and the Rogue Wave implementation of iostreams in the C++ Standard Library Module. </P></LI>
+<LI><P CLASS="LIST"><B><A HREF="VIII.html">Part&nbsp;VIII, "Iostreams,"</A></B> explains the C++ stream input and output facilities commonly called <I>iostreams</I>. Beginning chapters cover the iostreams facility, how it works, and how it should be used; also, the iostreams architecture, its components, and class hierarchy. Middle chapters cover the basic operation of iostreams, and both simple and advanced techniques for extending the iostreams framework. Final chapters describe the main differences between the C++ Standard Library iostreams, the traditional iostreams, and the implementation of iostreams in the Apache C++ Standard Library. </P></LI>
 </UL>
 <A NAME="154"><H3>1.5.4 Reading Suggestion</H3></A>
 <P>The first time you read this manual it may be hard to know where to start. The container definitions form the heart of the library, but you can't really appreciate them without understanding the algorithms that so greatly extend their functionality. On the other hand, you can't really understand the algorithms without some appreciation of the containers. </P>
diff --git a/doc/stdlibug/1-6.html b/doc/stdlibug/1-6.html
index 2f671b5..343b006 100644
--- a/doc/stdlibug/1-6.html
+++ b/doc/stdlibug/1-6.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Consulting Services and Training</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="1-5.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="1-7.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>1.6 Consulting Services and Training</H2>
diff --git a/doc/stdlibug/1-7.html b/doc/stdlibug/1-7.html
index 94f209c..1a37641 100644
--- a/doc/stdlibug/1-7.html
+++ b/doc/stdlibug/1-7.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Technical Support</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="1-6.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="II.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>1.7 Technical Support</H2>
diff --git a/doc/stdlibug/1.html b/doc/stdlibug/1.html
index 056483a..b37c2c1 100644
--- a/doc/stdlibug/1.html
+++ b/doc/stdlibug/1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="I.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="1-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 1: Overview</H1>
diff --git a/doc/stdlibug/10-1.html b/doc/stdlibug/10-1.html
index 9e27419..cd4d6ff 100644
--- a/doc/stdlibug/10-1.html
+++ b/doc/stdlibug/10-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="10.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="10-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>10.1 Overview</H2>
diff --git a/doc/stdlibug/10-2.html b/doc/stdlibug/10-2.html
index f7f261c..e9731a8 100644
--- a/doc/stdlibug/10-2.html
+++ b/doc/stdlibug/10-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The stack Data Abstraction</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="10-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="10-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>10.2 The stack Data Abstraction</H2>
diff --git a/doc/stdlibug/10-3.html b/doc/stdlibug/10-3.html
index 48fe88f..0b71348 100644
--- a/doc/stdlibug/10-3.html
+++ b/doc/stdlibug/10-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The queue Data Abstraction</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="10-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="11.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>10.3 The queue Data Abstraction</H2>
diff --git a/doc/stdlibug/10.html b/doc/stdlibug/10.html
index 18e76ed..663530e 100644
--- a/doc/stdlibug/10.html
+++ b/doc/stdlibug/10.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The Container Adaptors  stack and queue</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="9-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="10-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 10: The Container Adaptors  stack and queue</H1>
diff --git a/doc/stdlibug/11-1.html b/doc/stdlibug/11-1.html
index 5374abd..7e32998 100644
--- a/doc/stdlibug/11-1.html
+++ b/doc/stdlibug/11-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The priority queue Data Abstraction</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="11.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="11-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>11.1 The priority queue Data Abstraction</H2>
diff --git a/doc/stdlibug/11-2.html b/doc/stdlibug/11-2.html
index ca00bba..8ac1864 100644
--- a/doc/stdlibug/11-2.html
+++ b/doc/stdlibug/11-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The priority queue Operations</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="11-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="11-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>11.2 The priority queue Operations</H2>
diff --git a/doc/stdlibug/11-3.html b/doc/stdlibug/11-3.html
index 7f037e2..7e6727f 100644
--- a/doc/stdlibug/11-3.html
+++ b/doc/stdlibug/11-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Example Program: Event-Driven Simulation</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="11-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="12.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>11.3 Example Program: Event-Driven Simulation</H2>
diff --git a/doc/stdlibug/11.html b/doc/stdlibug/11.html
index d957186..8fed8a2 100644
--- a/doc/stdlibug/11.html
+++ b/doc/stdlibug/11.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The Container Adaptor priority queue</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="10-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="11-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 11: The Container Adaptor priority queue</H1>
diff --git a/doc/stdlibug/12-1.html b/doc/stdlibug/12-1.html
index 3653b4a..d1f598d 100644
--- a/doc/stdlibug/12-1.html
+++ b/doc/stdlibug/12-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The string Abstraction</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="12.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="12-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>12.1 The string Abstraction</H2>
diff --git a/doc/stdlibug/12-2.html b/doc/stdlibug/12-2.html
index 3b04a80..0d1f592 100644
--- a/doc/stdlibug/12-2.html
+++ b/doc/stdlibug/12-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>string Operations</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="12-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="12-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>12.2 string Operations</H2>
diff --git a/doc/stdlibug/12-3.html b/doc/stdlibug/12-3.html
index fc321dd..4b16b6b 100644
--- a/doc/stdlibug/12-3.html
+++ b/doc/stdlibug/12-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Example Function: Split a Line into Words</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="12-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="IV.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>12.3 Example Function: Split a Line into Words</H2>
diff --git a/doc/stdlibug/12.html b/doc/stdlibug/12.html
index 400dbd3..7092e1a 100644
--- a/doc/stdlibug/12.html
+++ b/doc/stdlibug/12.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>string</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="11-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="12-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 12: string</H1>
diff --git a/doc/stdlibug/13-1.html b/doc/stdlibug/13-1.html
index 2986d55..81f2039 100644
--- a/doc/stdlibug/13-1.html
+++ b/doc/stdlibug/13-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="13.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="13-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>13.1 Overview</H2>
diff --git a/doc/stdlibug/13-2.html b/doc/stdlibug/13-2.html
index c9c5b68..320a661 100644
--- a/doc/stdlibug/13-2.html
+++ b/doc/stdlibug/13-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Initialization Algorithms</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="13-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="13-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>13.2 Initialization Algorithms</H2>
diff --git a/doc/stdlibug/13-3.html b/doc/stdlibug/13-3.html
index 54f02dd..68a8a31 100644
--- a/doc/stdlibug/13-3.html
+++ b/doc/stdlibug/13-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Searching Operations</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="13-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="13-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>13.3 Searching Operations</H2>
diff --git a/doc/stdlibug/13-4.html b/doc/stdlibug/13-4.html
index e82c3e2..93a6426 100644
--- a/doc/stdlibug/13-4.html
+++ b/doc/stdlibug/13-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>In-Place Transformations</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="13-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="13-5.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>13.4 In-Place Transformations</H2>
diff --git a/doc/stdlibug/13-5.html b/doc/stdlibug/13-5.html
index 0add285..28d1f79 100644
--- a/doc/stdlibug/13-5.html
+++ b/doc/stdlibug/13-5.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Removal Algorithms</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="13-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="13-6.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>13.5 Removal Algorithms</H2>
diff --git a/doc/stdlibug/13-6.html b/doc/stdlibug/13-6.html
index 378366c..b4cd075 100644
--- a/doc/stdlibug/13-6.html
+++ b/doc/stdlibug/13-6.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Scalar-Producing Algorithms</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="13-5.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="13-7.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>13.6 Scalar-Producing Algorithms</H2>
diff --git a/doc/stdlibug/13-7.html b/doc/stdlibug/13-7.html
index caa7304..7c9020e 100644
--- a/doc/stdlibug/13-7.html
+++ b/doc/stdlibug/13-7.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Sequence-Generating Algorithms</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="13-6.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="13-8.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>13.7 Sequence-Generating Algorithms</H2>
diff --git a/doc/stdlibug/13-8.html b/doc/stdlibug/13-8.html
index 340d0bf..c594ba7 100644
--- a/doc/stdlibug/13-8.html
+++ b/doc/stdlibug/13-8.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The for_each() Algorithm</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="13-7.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="14.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>13.8 The for_each() Algorithm</H2>
diff --git a/doc/stdlibug/13.html b/doc/stdlibug/13.html
index 3e03025..e45848e 100644
--- a/doc/stdlibug/13.html
+++ b/doc/stdlibug/13.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Generic Algorithms</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="IV.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="13-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 13: Generic Algorithms</H1>
diff --git a/doc/stdlibug/14-1.html b/doc/stdlibug/14-1.html
index 61cbe04..5753875 100644
--- a/doc/stdlibug/14-1.html
+++ b/doc/stdlibug/14-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="14.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="14-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>14.1 Overview</H2>
diff --git a/doc/stdlibug/14-2.html b/doc/stdlibug/14-2.html
index 105c13d..c2238dd 100644
--- a/doc/stdlibug/14-2.html
+++ b/doc/stdlibug/14-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Sorting Algorithms</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="14-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="14-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>14.2 Sorting Algorithms</H2>
diff --git a/doc/stdlibug/14-3.html b/doc/stdlibug/14-3.html
index 1a52f48..b86561d 100644
--- a/doc/stdlibug/14-3.html
+++ b/doc/stdlibug/14-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>nth Element</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="14-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="14-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>14.3 nth Element</H2>
diff --git a/doc/stdlibug/14-4.html b/doc/stdlibug/14-4.html
index b1b6791..32cf4f2 100644
--- a/doc/stdlibug/14-4.html
+++ b/doc/stdlibug/14-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Binary Search</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="14-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="14-5.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>14.4 Binary Search</H2>
diff --git a/doc/stdlibug/14-5.html b/doc/stdlibug/14-5.html
index 8c6bddb..41320c5 100644
--- a/doc/stdlibug/14-5.html
+++ b/doc/stdlibug/14-5.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Merge Ordered Sequences</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="14-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="14-6.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>14.5 Merge Ordered Sequences</H2>
diff --git a/doc/stdlibug/14-6.html b/doc/stdlibug/14-6.html
index 67345e1..41c2573 100644
--- a/doc/stdlibug/14-6.html
+++ b/doc/stdlibug/14-6.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>set Operations</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="14-5.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="14-7.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>14.6 set Operations</H2>
diff --git a/doc/stdlibug/14-7.html b/doc/stdlibug/14-7.html
index 18bf38f..84e787a 100644
--- a/doc/stdlibug/14-7.html
+++ b/doc/stdlibug/14-7.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>heap Operations</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="14-6.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="V.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>14.7 heap Operations</H2>
diff --git a/doc/stdlibug/14.html b/doc/stdlibug/14.html
index 1f66650..03cf59e 100644
--- a/doc/stdlibug/14.html
+++ b/doc/stdlibug/14.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Ordered Collection  Algorithms</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="13-8.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="14-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 14: Ordered Collection  Algorithms</H1>
diff --git a/doc/stdlibug/15-1.html b/doc/stdlibug/15-1.html
index a53c9af..6e0bd13 100644
--- a/doc/stdlibug/15-1.html
+++ b/doc/stdlibug/15-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="15.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="15-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>15.1 Overview</H2>
diff --git a/doc/stdlibug/15-2.html b/doc/stdlibug/15-2.html
index 0f8fd45..f7ccc60 100644
--- a/doc/stdlibug/15-2.html
+++ b/doc/stdlibug/15-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Using Allocators with Existing C++ Standard Library Containers</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="15-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="15-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>15.2 Using Allocators with Existing C++ Standard Library Containers</H2>
diff --git a/doc/stdlibug/15-3.html b/doc/stdlibug/15-3.html
index 8528bc5..b814126 100644
--- a/doc/stdlibug/15-3.html
+++ b/doc/stdlibug/15-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Building Your Own Allocators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="15-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="16.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>15.3 Building Your Own Allocators</H2>
diff --git a/doc/stdlibug/15.html b/doc/stdlibug/15.html
index 05fb1f6..4276799 100644
--- a/doc/stdlibug/15.html
+++ b/doc/stdlibug/15.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Using Allocators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="V.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="15-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 15: Using Allocators</H1>
diff --git a/doc/stdlibug/16-1.html b/doc/stdlibug/16-1.html
index 75cf5ae..07cddbd 100644
--- a/doc/stdlibug/16-1.html
+++ b/doc/stdlibug/16-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Extending the C++ Standard Library</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="16.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="16-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>16.1 Extending the C++ Standard Library</H2>
diff --git a/doc/stdlibug/16-2.html b/doc/stdlibug/16-2.html
index c0ac18d..ed39ccd 100644
--- a/doc/stdlibug/16-2.html
+++ b/doc/stdlibug/16-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Building on the Standard Containers</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="16-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="16-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>16.2 Building on the Standard Containers</H2>
diff --git a/doc/stdlibug/16-3.html b/doc/stdlibug/16-3.html
index cbdeab2..8790433 100644
--- a/doc/stdlibug/16-3.html
+++ b/doc/stdlibug/16-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Creating Your Own Containers</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="16-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="16-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>16.3 Creating Your Own Containers</H2>
diff --git a/doc/stdlibug/16-4.html b/doc/stdlibug/16-4.html
index 553ce72..43f7314 100644
--- a/doc/stdlibug/16-4.html
+++ b/doc/stdlibug/16-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Tips and Techniques for Building Algorithms</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="16-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="17.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>16.4 Tips and Techniques for Building Algorithms</H2>
diff --git a/doc/stdlibug/16.html b/doc/stdlibug/16.html
index ae3e7e5..91a2a5f 100644
--- a/doc/stdlibug/16.html
+++ b/doc/stdlibug/16.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Building Containers and Algorithms</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="15-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="16-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 16: Building Containers and Algorithms</H1>
diff --git a/doc/stdlibug/17-1.html b/doc/stdlibug/17-1.html
index 0b81087..8b4762f 100644
--- a/doc/stdlibug/17-1.html
+++ b/doc/stdlibug/17-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Defining the Problem</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="17.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="17-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>17.1 Defining the Problem</H2>
diff --git a/doc/stdlibug/17-2.html b/doc/stdlibug/17-2.html
index 55c3599..957e902 100644
--- a/doc/stdlibug/17-2.html
+++ b/doc/stdlibug/17-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Using the Traits Technique</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="17-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="18.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>17.2 Using the Traits Technique</H2>
diff --git a/doc/stdlibug/17.html b/doc/stdlibug/17.html
index f3858cc..2c687d3 100644
--- a/doc/stdlibug/17.html
+++ b/doc/stdlibug/17.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The Traits Parameter</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="16-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="17-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 17: The Traits Parameter</H1>
diff --git a/doc/stdlibug/18-1.html b/doc/stdlibug/18-1.html
index 868d1ee..b8a2e2a 100644
--- a/doc/stdlibug/18-1.html
+++ b/doc/stdlibug/18-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="18.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="18-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>18.1 Overview</H2>
diff --git a/doc/stdlibug/18-2.html b/doc/stdlibug/18-2.html
index 775f619..b0abfb8 100644
--- a/doc/stdlibug/18-2.html
+++ b/doc/stdlibug/18-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The Standard Exception Hierarchy</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="18-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="18-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>18.2 The Standard Exception Hierarchy</H2>
diff --git a/doc/stdlibug/18-3.html b/doc/stdlibug/18-3.html
index a2f32a0..d65f80b 100644
--- a/doc/stdlibug/18-3.html
+++ b/doc/stdlibug/18-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Using Exceptions</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="18-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="18-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>18.3 Using Exceptions</H2>
diff --git a/doc/stdlibug/18-4.html b/doc/stdlibug/18-4.html
index 18fe454..b1ca427 100644
--- a/doc/stdlibug/18-4.html
+++ b/doc/stdlibug/18-4.html
@@ -1,59 +1,70 @@
 <HTML>
 <HEAD>
 <TITLE>Example Program: Exceptions</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="18-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="VI.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>18.4 Example Program: Exceptions</H2>
 <BLOCKQUOTE><HR><B>
-NOTE -- This program is in the file exceptn.cpp.
+NOTE -- This program is in the file <code>tutorial/stdexcept.cpp</code>.
 </B><HR></BLOCKQUOTE>
 <A NAME="idx428"><!></A>
 <P>This following example program demonstrates the use of exceptions:</P>
 
 <UL><PRE>
-#include &lt;stdexcept&gt;
-#include &lt;string&gt;
+#include &lt;string&gt;      // for string
+#include &lt;stdexcept&gt;   // for exception, runtime_error, out_of_range
+#include &lt;iostream&gt;    // for cout
 
-static void f() { throw std::runtime_error("a runtime error"); }
 
 int main ()
 {
-  std::string s;
-  
-  // First we'll try to incite then catch an exception 
-  // from the C++ Standard Library string class.
-  // We'll try to replace at a position that is non-existent.
-  //
-  // By wrapping the body of main in a try-catch block we can be
-  // assured that we'll catch all exceptions in the exception
-  // hierarchy. You can simply catch an exception as is done 
-  // below, or you can catch each of the exceptions in which 
-  // you have an interest.
-  try
-  {
-    s.replace(100,1,1,'c');
-  }
-  catch (const std::exception&amp; e)
-  {
-    std::cout &lt;&lt; "Got an exception: " &lt;&lt; e.what() &lt;&lt; std::endl;
-  }
+    // First we'll incite and catch an exception from the C++ Standard
+    // library class std::string by attempting to replace a substring
+    // starting at a position beyond the end of the string object.
+    try {
+        std::string ().replace (100, 1, 1, 'c');
+    }
+    catch (std::out_of_range &amp;e) {
 
-  // Now we'll throw our own exception using the function 
-  // defined above.
-  try
-  {
-    f();
-  }
-  catch (const std::exception&amp; e)
-  {
-    std::cout &lt;&lt; "Got an exception: " &lt;&lt; e.what() &lt;&lt; std::endl;
-  }
- 
-  return 0;
+        // Print out the exception string, which in this implementation
+        // includes the location and the name of the function that threw
+        // the exception along with the reason for the exception.
+        std::cout &lt;&lt; "Caught an out_of_range exception: "
+                  &lt;&lt; e.what () &lt;&lt; '\n';
+    }
+    catch (std::exception &amp;e) {
+
+        std::cout &lt;&lt; "Caught an exception of an unexpected type: "
+                  &lt;&lt; e.what () &lt;&lt; '\n';
+    }
+    catch (...) {
+        std::cout &lt;&lt; "Caught an unknown exception\n";
+    }
+    
+    // Throw another exception.
+    try {
+        throw std::runtime_error ("a runtime error");
+    }
+    catch (std::runtime_error &amp;e) {
+        std::cout &lt;&lt; "Caught a runtime_error exception: "
+                  &lt;&lt; e.what () &lt;&lt; '\n';
+    }
+    catch (std::exception &amp;e) {
+        std::cout &lt;&lt; "Caught an exception of an unexpected type: "
+                  &lt;&lt; e.what () &lt;&lt; '\n';
+    } 
+    catch (...) {
+        std::cout &lt;&lt; "Caught an unknown exception\n";
+    }
+   
+    return 0;
 }
 </PRE></UL>
-
+<P>The exact output of the program is specific to the compiler used to compile it and to the location of the library headers but may look something like this:</P><UL><PRE>
+Caught an out_of_range exception: /usr/local/stdcxx/include/string.cc:422: std::string& std::string::replace(size_type, size_type, size_type, char_type): argument value 100 out of range [0, 0)
+Caught a runtime_error exception: a runtime error
+</UL></PRE>
 
 <BR>
 <HR>
diff --git a/doc/stdlibug/18.html b/doc/stdlibug/18.html
index 9ba1a9b..c530d09 100644
--- a/doc/stdlibug/18.html
+++ b/doc/stdlibug/18.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Exception Handling</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="17-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="18-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 18: Exception Handling</H1>
diff --git a/doc/stdlibug/19-1.html b/doc/stdlibug/19-1.html
index d4feab8..99c15b5 100644
--- a/doc/stdlibug/19-1.html
+++ b/doc/stdlibug/19-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="19.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="19-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>19.1 Overview</H2>
diff --git a/doc/stdlibug/19-2.html b/doc/stdlibug/19-2.html
index d3dabfc..e77cb59 100644
--- a/doc/stdlibug/19-2.html
+++ b/doc/stdlibug/19-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Declaration and Initialization of Autopointers</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="19-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="20.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>19.2 Declaration and Initialization of Autopointers</H2>
diff --git a/doc/stdlibug/19.html b/doc/stdlibug/19.html
index 6c27bd7..976f781 100644
--- a/doc/stdlibug/19.html
+++ b/doc/stdlibug/19.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>auto_ptr</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="VI.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="19-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 19: auto_ptr</H1>
diff --git a/doc/stdlibug/2-1.html b/doc/stdlibug/2-1.html
index 55fa858..c2cd903 100644
--- a/doc/stdlibug/2-1.html
+++ b/doc/stdlibug/2-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Introduction to Iterators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="2-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>2.1 Introduction to Iterators</H2>
diff --git a/doc/stdlibug/2-2.html b/doc/stdlibug/2-2.html
index 40f1fb3..d5dad50 100644
--- a/doc/stdlibug/2-2.html
+++ b/doc/stdlibug/2-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Varieties of Iterators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="2-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="2-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>2.2 Varieties of Iterators</H2>
diff --git a/doc/stdlibug/2-3.html b/doc/stdlibug/2-3.html
index f3dab35..86ffbef 100644
--- a/doc/stdlibug/2-3.html
+++ b/doc/stdlibug/2-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Stream Iterators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="2-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="2-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>2.3 Stream Iterators</H2>
diff --git a/doc/stdlibug/2-4.html b/doc/stdlibug/2-4.html
index d2fae0a..88d9305 100644
--- a/doc/stdlibug/2-4.html
+++ b/doc/stdlibug/2-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Insert Iterators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="2-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="2-5.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>2.4 Insert Iterators</H2>
diff --git a/doc/stdlibug/2-5.html b/doc/stdlibug/2-5.html
index 9ed7d61..012a2b6 100644
--- a/doc/stdlibug/2-5.html
+++ b/doc/stdlibug/2-5.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Iterator Operations</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="2-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>2.5 Iterator Operations</H2>
diff --git a/doc/stdlibug/2.html b/doc/stdlibug/2.html
index e370c9a..13bf3f1 100644
--- a/doc/stdlibug/2.html
+++ b/doc/stdlibug/2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Iterators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="II.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="2-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 2: Iterators</H1>
diff --git a/doc/stdlibug/20-1.html b/doc/stdlibug/20-1.html
index 556947f..6b107c4 100644
--- a/doc/stdlibug/20-1.html
+++ b/doc/stdlibug/20-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="20.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="20-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>20.1 Overview</H2>
diff --git a/doc/stdlibug/20-2.html b/doc/stdlibug/20-2.html
index ef21cae..45ec399 100644
--- a/doc/stdlibug/20-2.html
+++ b/doc/stdlibug/20-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Creating and Using Complex Numbers</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="20-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="20-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>20.2 Creating and Using Complex Numbers</H2>
diff --git a/doc/stdlibug/20-3.html b/doc/stdlibug/20-3.html
index 57752c4..e2a180d 100644
--- a/doc/stdlibug/20-3.html
+++ b/doc/stdlibug/20-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Example Program: Roots of a Polynomial</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="20-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="21.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>20.3 Example Program: Roots of a Polynomial</H2>
diff --git a/doc/stdlibug/20.html b/doc/stdlibug/20.html
index b1107b3..4e85945 100644
--- a/doc/stdlibug/20.html
+++ b/doc/stdlibug/20.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>complex</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="19-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="20-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 20: complex</H1>
diff --git a/doc/stdlibug/21-1.html b/doc/stdlibug/21-1.html
index d73973c..f66601e 100644
--- a/doc/stdlibug/21-1.html
+++ b/doc/stdlibug/21-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="21.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="21-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>21.1 Overview</H2>
diff --git a/doc/stdlibug/21-2.html b/doc/stdlibug/21-2.html
index 8cff36e..10c10ef 100644
--- a/doc/stdlibug/21-2.html
+++ b/doc/stdlibug/21-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Fundamental Datatypes</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="21-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="21-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>21.2 Fundamental Datatypes</H2>
diff --git a/doc/stdlibug/21-3.html b/doc/stdlibug/21-3.html
index 86a6142..6530351 100644
--- a/doc/stdlibug/21-3.html
+++ b/doc/stdlibug/21-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>numeric_limits Members</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="21-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="22.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>21.3 numeric_limits Members</H2>
diff --git a/doc/stdlibug/21.html b/doc/stdlibug/21.html
index 0c7f24a..86db080 100644
--- a/doc/stdlibug/21.html
+++ b/doc/stdlibug/21.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>numeric_limits</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="20-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="21-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 21: numeric_limits</H1>
diff --git a/doc/stdlibug/22-1.html b/doc/stdlibug/22-1.html
index 40a7959..a775915 100644
--- a/doc/stdlibug/22-1.html
+++ b/doc/stdlibug/22-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="22.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="22-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>22.1 Overview</H2>
diff --git a/doc/stdlibug/22-2.html b/doc/stdlibug/22-2.html
index bb70f72..0d9d199 100644
--- a/doc/stdlibug/22-2.html
+++ b/doc/stdlibug/22-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Declaring a valarray</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="22-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="22-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>22.2 Declaring a valarray</H2>
diff --git a/doc/stdlibug/22-3.html b/doc/stdlibug/22-3.html
index f65517c..c73b871 100644
--- a/doc/stdlibug/22-3.html
+++ b/doc/stdlibug/22-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Assignment Operators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="22-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="22-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>22.3 Assignment Operators</H2>
diff --git a/doc/stdlibug/22-4.html b/doc/stdlibug/22-4.html
index 0badfd4..417b872 100644
--- a/doc/stdlibug/22-4.html
+++ b/doc/stdlibug/22-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Element and Subset Access</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="22-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="22-5.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>22.4 Element and Subset Access</H2>
diff --git a/doc/stdlibug/22-5.html b/doc/stdlibug/22-5.html
index a101dc5..15b2272 100644
--- a/doc/stdlibug/22-5.html
+++ b/doc/stdlibug/22-5.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Computed Assignment Operators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="22-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="22-6.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>22.5 Computed Assignment Operators</H2>
diff --git a/doc/stdlibug/22-6.html b/doc/stdlibug/22-6.html
index c6e49b3..566c816 100644
--- a/doc/stdlibug/22-6.html
+++ b/doc/stdlibug/22-6.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Member Functions</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="22-5.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="22-7.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>22.6 Member Functions</H2>
diff --git a/doc/stdlibug/22-7.html b/doc/stdlibug/22-7.html
index 88c9c6c..d72fec0 100644
--- a/doc/stdlibug/22-7.html
+++ b/doc/stdlibug/22-7.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Non-Member Functions</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="22-6.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="VII.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>22.7 Non-Member Functions</H2>
diff --git a/doc/stdlibug/22.html b/doc/stdlibug/22.html
index cc37175..73e9fdd 100644
--- a/doc/stdlibug/22.html
+++ b/doc/stdlibug/22.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>valarray</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="21-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="22-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 22: valarray</H1>
diff --git a/doc/stdlibug/23-1.html b/doc/stdlibug/23-1.html
index 8d978c5..8c05154 100644
--- a/doc/stdlibug/23-1.html
+++ b/doc/stdlibug/23-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Defining the Terms</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="23.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="23-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>23.1 Defining the Terms</H2>
diff --git a/doc/stdlibug/23-2.html b/doc/stdlibug/23-2.html
index 47b2397..21b70e8 100644
--- a/doc/stdlibug/23-2.html
+++ b/doc/stdlibug/23-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Localizing Cultural Conventions</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="23-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="23-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>23.2 Localizing Cultural Conventions</H2>
diff --git a/doc/stdlibug/23-3.html b/doc/stdlibug/23-3.html
index 638fae9..04f57d7 100644
--- a/doc/stdlibug/23-3.html
+++ b/doc/stdlibug/23-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Character Encodings for Localizing Alphabets</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="23-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="23-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>23.3 Character Encodings for Localizing Alphabets</H2>
diff --git a/doc/stdlibug/23-4.html b/doc/stdlibug/23-4.html
index cdab355..8037448 100644
--- a/doc/stdlibug/23-4.html
+++ b/doc/stdlibug/23-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Summary</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="23-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="24.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>23.4 Summary</H2>
diff --git a/doc/stdlibug/23.html b/doc/stdlibug/23.html
index d7f07b1..bcd0129 100644
--- a/doc/stdlibug/23.html
+++ b/doc/stdlibug/23.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Internationalization and Localization</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="VII.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="23-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 23: Internationalization and Localization</H1>
diff --git a/doc/stdlibug/24-1.html b/doc/stdlibug/24-1.html
index 9b89419..7636706 100644
--- a/doc/stdlibug/24-1.html
+++ b/doc/stdlibug/24-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The C Locale</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="24.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="24-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>24.1 The C Locale</H2>
diff --git a/doc/stdlibug/24-2.html b/doc/stdlibug/24-2.html
index 9897365..f683d4f 100644
--- a/doc/stdlibug/24-2.html
+++ b/doc/stdlibug/24-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The C++ Locales</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="24-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="24-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>24.2 The C++ Locales</H2>
diff --git a/doc/stdlibug/24-3.html b/doc/stdlibug/24-3.html
index 3744091..e2b8d45 100644
--- a/doc/stdlibug/24-3.html
+++ b/doc/stdlibug/24-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Differences between the C Locale and the C++ Locales</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="24-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="24-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>24.3 Differences between the C Locale and the C++ Locales</H2>
diff --git a/doc/stdlibug/24-4.html b/doc/stdlibug/24-4.html
index 9727adb..c257476 100644
--- a/doc/stdlibug/24-4.html
+++ b/doc/stdlibug/24-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The Locale Object</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="24-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="25.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>24.4 The Locale Object</H2>
diff --git a/doc/stdlibug/24.html b/doc/stdlibug/24.html
index 86a4abd..111dc27 100644
--- a/doc/stdlibug/24.html
+++ b/doc/stdlibug/24.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The C and C++ Locales</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="23-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="24-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 24: The C and C++ Locales</H1>
diff --git a/doc/stdlibug/25-1.html b/doc/stdlibug/25-1.html
index 01a2af5..e39d3d1 100644
--- a/doc/stdlibug/25-1.html
+++ b/doc/stdlibug/25-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Understanding Facet Types</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="25.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="25-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>25.1 Understanding Facet Types</H2>
diff --git a/doc/stdlibug/25-2.html b/doc/stdlibug/25-2.html
index 668fab2..9e6c229 100644
--- a/doc/stdlibug/25-2.html
+++ b/doc/stdlibug/25-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Facet Lifetimes</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="25-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="25-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>25.2 Facet Lifetimes</H2>
diff --git a/doc/stdlibug/25-3.html b/doc/stdlibug/25-3.html
index 1f2d7b4..b09420e 100644
--- a/doc/stdlibug/25-3.html
+++ b/doc/stdlibug/25-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Accessing a Locale's Facets</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="25-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="25-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>25.3 Accessing a Locale's Facets</H2>
diff --git a/doc/stdlibug/25-4.html b/doc/stdlibug/25-4.html
index 9058cc1..b976715 100644
--- a/doc/stdlibug/25-4.html
+++ b/doc/stdlibug/25-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Using a Stream's Facet</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="25-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="25-5.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>25.4 Using a Stream's Facet</H2>
diff --git a/doc/stdlibug/25-5.html b/doc/stdlibug/25-5.html
index 3c26bde..57c86e9 100644
--- a/doc/stdlibug/25-5.html
+++ b/doc/stdlibug/25-5.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Modifying a Standard Facet's Behavior</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="25-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="25-6.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>25.5 Modifying a Standard Facet's Behavior</H2>
diff --git a/doc/stdlibug/25-6.html b/doc/stdlibug/25-6.html
index f1c2d7e..baf2a19 100644
--- a/doc/stdlibug/25-6.html
+++ b/doc/stdlibug/25-6.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Creating a New Base Facet Class</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="25-5.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="26.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>25.6 Creating a New Base Facet Class</H2>
diff --git a/doc/stdlibug/25.html b/doc/stdlibug/25.html
index b3414c3..7e659fb 100644
--- a/doc/stdlibug/25.html
+++ b/doc/stdlibug/25.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Facets</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="24-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="25-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 25: Facets</H1>
diff --git a/doc/stdlibug/26-1.html b/doc/stdlibug/26-1.html
index d13db91..a20fb0b 100644
--- a/doc/stdlibug/26-1.html
+++ b/doc/stdlibug/26-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>An Example of Formatting Phone Numbers</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="26.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="26-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>26.1 An Example of Formatting Phone Numbers</H2>
diff --git a/doc/stdlibug/26-2.html b/doc/stdlibug/26-2.html
index c21354b..832279f 100644
--- a/doc/stdlibug/26-2.html
+++ b/doc/stdlibug/26-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>A Phone Number Class</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="26-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="26-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>26.2 A Phone Number Class</H2>
diff --git a/doc/stdlibug/26-3.html b/doc/stdlibug/26-3.html
index 2870e09..542b3c9 100644
--- a/doc/stdlibug/26-3.html
+++ b/doc/stdlibug/26-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>A Phone Number Formatting Facet Class</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="26-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="26-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>26.3 A Phone Number Formatting Facet Class</H2>
diff --git a/doc/stdlibug/26-4.html b/doc/stdlibug/26-4.html
index f833b63..de63e90 100644
--- a/doc/stdlibug/26-4.html
+++ b/doc/stdlibug/26-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>An Inserter for Phone Numbers</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="26-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="26-5.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>26.4 An Inserter for Phone Numbers</H2>
diff --git a/doc/stdlibug/26-5.html b/doc/stdlibug/26-5.html
index 9c636a4..a3bbd68 100644
--- a/doc/stdlibug/26-5.html
+++ b/doc/stdlibug/26-5.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The Phone Number Facet Class Revisited</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="26-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="26-6.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>26.5 The Phone Number Facet Class Revisited</H2>
diff --git a/doc/stdlibug/26-6.html b/doc/stdlibug/26-6.html
index 1789eb2..48294a0 100644
--- a/doc/stdlibug/26-6.html
+++ b/doc/stdlibug/26-6.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>An Example of a Derived Facet Class</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="26-5.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="26-7.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>26.6 An Example of a Derived Facet Class</H2>
diff --git a/doc/stdlibug/26-7.html b/doc/stdlibug/26-7.html
index 122a825..6960833 100644
--- a/doc/stdlibug/26-7.html
+++ b/doc/stdlibug/26-7.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Using Phone Number Facets</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="26-6.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="26-8.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>26.7 Using Phone Number Facets</H2>
diff --git a/doc/stdlibug/26-8.html b/doc/stdlibug/26-8.html
index 8786f08..298ff4b 100644
--- a/doc/stdlibug/26-8.html
+++ b/doc/stdlibug/26-8.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Formatting Phone Numbers</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="26-7.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="26-9.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>26.8 Formatting Phone Numbers</H2>
diff --git a/doc/stdlibug/26-9.html b/doc/stdlibug/26-9.html
index e6247a4..a9f581c 100644
--- a/doc/stdlibug/26-9.html
+++ b/doc/stdlibug/26-9.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Improving the Inserter Function</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="26-8.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="VIII.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>26.9 Improving the Inserter Function</H2>
diff --git a/doc/stdlibug/26.html b/doc/stdlibug/26.html
index e5d1541..cde5bd9 100644
--- a/doc/stdlibug/26.html
+++ b/doc/stdlibug/26.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Building Your Own Facet Class</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="25-6.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="26-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 26: Building Your Own Facet Class</H1>
diff --git a/doc/stdlibug/27-1.html b/doc/stdlibug/27-1.html
index 5b21375..56a8077 100644
--- a/doc/stdlibug/27-1.html
+++ b/doc/stdlibug/27-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The Standard Iostreams</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="27.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="27-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>27.1 The Standard Iostreams</H2>
diff --git a/doc/stdlibug/27-2.html b/doc/stdlibug/27-2.html
index e9386d2..0b031a6 100644
--- a/doc/stdlibug/27-2.html
+++ b/doc/stdlibug/27-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>How the Standard Iostreams Work</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="27-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="27-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>27.2 How the Standard Iostreams Work</H2>
diff --git a/doc/stdlibug/27-3.html b/doc/stdlibug/27-3.html
index 900a035..207b8eb 100644
--- a/doc/stdlibug/27-3.html
+++ b/doc/stdlibug/27-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>How the Standard Iostreams Help Solve Problems</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="27-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="27-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>27.3 How the Standard Iostreams Help Solve Problems</H2>
diff --git a/doc/stdlibug/27-4.html b/doc/stdlibug/27-4.html
index 9e2e8cb..dcb6934 100644
--- a/doc/stdlibug/27-4.html
+++ b/doc/stdlibug/27-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The Internal Structure of the Iostreams Layers</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="27-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="28.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>27.4 The Internal Structure of the Iostreams Layers</H2>
diff --git a/doc/stdlibug/27.html b/doc/stdlibug/27.html
index 58583a5..ce41bf4 100644
--- a/doc/stdlibug/27.html
+++ b/doc/stdlibug/27.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The Architecture of Iostreams</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="VIII.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="27-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 27: The Architecture of Iostreams</H1>
diff --git a/doc/stdlibug/28-1.html b/doc/stdlibug/28-1.html
index 3ca58ca..1fe486e 100644
--- a/doc/stdlibug/28-1.html
+++ b/doc/stdlibug/28-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The Predefined Streams</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="28.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="28-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>28.1 The Predefined Streams</H2>
diff --git a/doc/stdlibug/28-2.html b/doc/stdlibug/28-2.html
index 4249413..3902235 100644
--- a/doc/stdlibug/28-2.html
+++ b/doc/stdlibug/28-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Input and Output Operators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="28-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="28-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>28.2 Input and Output Operators</H2>
diff --git a/doc/stdlibug/28-3.html b/doc/stdlibug/28-3.html
index 07dada4..ff7b495 100644
--- a/doc/stdlibug/28-3.html
+++ b/doc/stdlibug/28-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Format Control Using the Stream's Format State</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="28-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="28-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>28.3 Format Control Using the Stream's Format State</H2>
diff --git a/doc/stdlibug/28-4.html b/doc/stdlibug/28-4.html
index bbf305e..3d06d88 100644
--- a/doc/stdlibug/28-4.html
+++ b/doc/stdlibug/28-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Localization Using the Stream's Locale</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="28-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="28-5.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>28.4 Localization Using the Stream's Locale</H2>
diff --git a/doc/stdlibug/28-5.html b/doc/stdlibug/28-5.html
index da2e479..abc9efb 100644
--- a/doc/stdlibug/28-5.html
+++ b/doc/stdlibug/28-5.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Formatted Input</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="28-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="29.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>28.5 Formatted Input</H2>
diff --git a/doc/stdlibug/28.html b/doc/stdlibug/28.html
index c5d6546..3874f00 100644
--- a/doc/stdlibug/28.html
+++ b/doc/stdlibug/28.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Formatted Input and Output</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="27-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="28-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 28: Formatted Input and Output</H1>
diff --git a/doc/stdlibug/29-1.html b/doc/stdlibug/29-1.html
index dc0f9d1..0673f56 100644
--- a/doc/stdlibug/29-1.html
+++ b/doc/stdlibug/29-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>About Flags</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="29.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="29-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>29.1 About Flags</H2>
diff --git a/doc/stdlibug/29-2.html b/doc/stdlibug/29-2.html
index 33819ca..1646f10 100644
--- a/doc/stdlibug/29-2.html
+++ b/doc/stdlibug/29-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Checking the Stream State</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="29-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="29-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>29.2 Checking the Stream State</H2>
diff --git a/doc/stdlibug/29-3.html b/doc/stdlibug/29-3.html
index 4fa369d..b8594ea 100644
--- a/doc/stdlibug/29-3.html
+++ b/doc/stdlibug/29-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Catching Exceptions</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="29-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="30.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>29.3 Catching Exceptions</H2>
diff --git a/doc/stdlibug/29.html b/doc/stdlibug/29.html
index 827759a..519a850 100644
--- a/doc/stdlibug/29.html
+++ b/doc/stdlibug/29.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Error State of Streams</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="28-5.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="29-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 29: Error State of Streams</H1>
diff --git a/doc/stdlibug/3-1.html b/doc/stdlibug/3-1.html
index 3396c7a..3cf0e14 100644
--- a/doc/stdlibug/3-1.html
+++ b/doc/stdlibug/3-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Functions</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="3-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>3.1 Functions</H2>
diff --git a/doc/stdlibug/3-2.html b/doc/stdlibug/3-2.html
index b70057e..aa984f9 100644
--- a/doc/stdlibug/3-2.html
+++ b/doc/stdlibug/3-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Function Objects</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="3-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="3-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>3.2 Function Objects</H2>
diff --git a/doc/stdlibug/3-3.html b/doc/stdlibug/3-3.html
index 4a9fd6b..7965f77 100644
--- a/doc/stdlibug/3-3.html
+++ b/doc/stdlibug/3-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Predicates</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="3-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="3-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>3.3 Predicates</H2>
diff --git a/doc/stdlibug/3-4.html b/doc/stdlibug/3-4.html
index a28a1d9..7a80f4d 100644
--- a/doc/stdlibug/3-4.html
+++ b/doc/stdlibug/3-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Function Adaptors</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="3-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="3-5.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>3.4 Function Adaptors</H2>
diff --git a/doc/stdlibug/3-5.html b/doc/stdlibug/3-5.html
index 526429c..1b36705 100644
--- a/doc/stdlibug/3-5.html
+++ b/doc/stdlibug/3-5.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Negators and Binders</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="3-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="III.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>3.5 Negators and Binders</H2>
diff --git a/doc/stdlibug/3.html b/doc/stdlibug/3.html
index 11f4d58..c330e1e 100644
--- a/doc/stdlibug/3.html
+++ b/doc/stdlibug/3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Functions and Predicates</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="2-5.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="3-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 3: Functions and Predicates</H1>
diff --git a/doc/stdlibug/30-1.html b/doc/stdlibug/30-1.html
index bf484b6..5a14451 100644
--- a/doc/stdlibug/30-1.html
+++ b/doc/stdlibug/30-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>About File Streams</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="30.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="30-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>30.1 About File Streams</H2>
diff --git a/doc/stdlibug/30-2.html b/doc/stdlibug/30-2.html
index 693a66c..b1feb87 100644
--- a/doc/stdlibug/30-2.html
+++ b/doc/stdlibug/30-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Working with File Streams</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="30-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="30-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>30.2 Working with File Streams</H2>
@@ -31,7 +31,7 @@
 <TR VALIGN="top"><TD><SAMP>//3</SAMP></TD><TD>Here the file is both opened and connected to the stream.
 </TABLE>
 <BLOCKQUOTE><HR><B>
-NOTE -- The traditional iostreams supported a constructor, taking a file descriptor, that allowed connection of a file stream to an already open file. This is not available in the standard iostreams. However, the Rogue Wave implementation of the standard iostreams provides a corresponding extension. See Appendix B of the <A HREF="../stdlibref/noframes.html"><I>C++ Standard Library Module Reference Guide</I></A> for more information.
+NOTE -- The traditional iostreams supported a constructor, taking a file descriptor, that allowed connection of a file stream to an already open file. This is not available in the standard iostreams. However, this implementation of the standard iostreams provides a corresponding extension. See Appendix B of the <A HREF="../stdlibref/noframes.html"><I>C++ Standard Library Module Reference Guide</I></A> for more information.
 </B><HR></BLOCKQUOTE>
 <A NAME="3022"><H3>30.2.2 Checking a File Stream's Status</H3></A>
 <A NAME="idx745"><!></A>
diff --git a/doc/stdlibug/30-3.html b/doc/stdlibug/30-3.html
index 2e7630f..06a15c0 100644
--- a/doc/stdlibug/30-3.html
+++ b/doc/stdlibug/30-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The Open Mode</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="30-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="30-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>30.3 The Open Mode</H2>
@@ -9,10 +9,12 @@
 <P>There may be times when you want to modify the way a file is opened or used in a program. For example, in some cases it is desirable that writes append to the end of a file rather than overwriting the existing values. The file stream constructor takes a second argument, the <I>open mode</I>, that allows such variations to be specified. Here is an example that creates a file stream object <SAMP>Str</SAMP>, connects it to the external file named <SAMP>"inout.txt"</SAMP>, and opens it for reading and for writing at the end of the file:</P>
 
 <UL><PRE>
-std::fstream Str("inout.txt",
-                 std::ios_base::in | std::ios_base::out |
-                 std::ios_base::app);
+std::fstream Str("inout.txt", std::ios_base::in | std::ios_base::out | std::ios_base::app);
 </PRE></UL>
+<P>
+Note that if the <SAMP>"inout.txt"</SAMP> file doesn't exist it will be
+created.
+</P>
 <A NAME="3031"><H3>30.3.1 The Open Mode Flags</H3></A>
 <A NAME="idx751"><!></A>
 <P>The open mode argument is of type <SAMP>std::ios_base::openmode</SAMP>, which is a bitmask type like the format flags and the stream state. <A HREF="30-3.html#Table&nbsp;32">Table&nbsp;32</A> defines the following bits:</P>
diff --git a/doc/stdlibug/30-4.html b/doc/stdlibug/30-4.html
index 6587e48..52574ef 100644
--- a/doc/stdlibug/30-4.html
+++ b/doc/stdlibug/30-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Binary and Text Mode</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="30-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="30-5.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>30.4 Binary and Text Mode</H2>
diff --git a/doc/stdlibug/30-5.html b/doc/stdlibug/30-5.html
index c33ef09..f45d43c 100644
--- a/doc/stdlibug/30-5.html
+++ b/doc/stdlibug/30-5.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>File Positioning</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="30-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="31.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>30.5 File Positioning</H2>
diff --git a/doc/stdlibug/30.html b/doc/stdlibug/30.html
index 7b11f4f..2160019 100644
--- a/doc/stdlibug/30.html
+++ b/doc/stdlibug/30.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>File Input and Output</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="29-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="30-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 30: File Input and Output</H1>
diff --git a/doc/stdlibug/31-1.html b/doc/stdlibug/31-1.html
index 92b9c65..65ca0da 100644
--- a/doc/stdlibug/31-1.html
+++ b/doc/stdlibug/31-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>About String Streams</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="31.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="31-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>31.1 About String Streams</H2>
diff --git a/doc/stdlibug/31-2.html b/doc/stdlibug/31-2.html
index 2fbead3..879218d 100644
--- a/doc/stdlibug/31-2.html
+++ b/doc/stdlibug/31-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The Internal Buffer</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="31-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="31-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>31.2 The Internal Buffer</H2>
diff --git a/doc/stdlibug/31-3.html b/doc/stdlibug/31-3.html
index 8098626..83979f7 100644
--- a/doc/stdlibug/31-3.html
+++ b/doc/stdlibug/31-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The Open Modes</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="31-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="32.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>31.3 The Open Modes</H2>
diff --git a/doc/stdlibug/31.html b/doc/stdlibug/31.html
index 23a3f9f..998d4f8 100644
--- a/doc/stdlibug/31.html
+++ b/doc/stdlibug/31.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Input and Output In Memory</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="30-5.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="31-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 31: Input and Output In Memory</H1>
diff --git a/doc/stdlibug/32-1.html b/doc/stdlibug/32-1.html
index 5dbae41..f76593b 100644
--- a/doc/stdlibug/32-1.html
+++ b/doc/stdlibug/32-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>A Note on User-Defined Types</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="32.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="32-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>32.1 A Note on User-Defined Types</H2>
diff --git a/doc/stdlibug/32-2.html b/doc/stdlibug/32-2.html
index f7d8709..1554c0d 100644
--- a/doc/stdlibug/32-2.html
+++ b/doc/stdlibug/32-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>An Example with a User-Defined Type</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="32-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="32-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>32.2 An Example with a User-Defined Type</H2>
diff --git a/doc/stdlibug/32-3.html b/doc/stdlibug/32-3.html
index fda175d..c9cfaa1 100644
--- a/doc/stdlibug/32-3.html
+++ b/doc/stdlibug/32-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>A Simple Extractor and Inserter for the Example</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="32-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="32-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>32.3 A Simple Extractor and Inserter for the Example</H2>
diff --git a/doc/stdlibug/32-4.html b/doc/stdlibug/32-4.html
index 1db7f30..7f2cd6e 100644
--- a/doc/stdlibug/32-4.html
+++ b/doc/stdlibug/32-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Improved Extractors and Inserters</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="32-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="32-5.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>32.4 Improved Extractors and Inserters</H2>
diff --git a/doc/stdlibug/32-5.html b/doc/stdlibug/32-5.html
index d377833..a79b329 100644
--- a/doc/stdlibug/32-5.html
+++ b/doc/stdlibug/32-5.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>More Improved Extractors and Inserters</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="32-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="32-6.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>32.5 More Improved Extractors and Inserters</H2>
diff --git a/doc/stdlibug/32-6.html b/doc/stdlibug/32-6.html
index 809e8bc..53929d0 100644
--- a/doc/stdlibug/32-6.html
+++ b/doc/stdlibug/32-6.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Patterns for Extractors and Inserters of User-Defined Types</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="32-5.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="33.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>32.6 Patterns for Extractors and Inserters of User-Defined Types</H2>
diff --git a/doc/stdlibug/32.html b/doc/stdlibug/32.html
index fdfd551..3f01d29 100644
--- a/doc/stdlibug/32.html
+++ b/doc/stdlibug/32.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Input and Output of User Types</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="31-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="32-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 32: Input and Output of User Types</H1>
diff --git a/doc/stdlibug/33-1.html b/doc/stdlibug/33-1.html
index 795e45d..4e6ff28 100644
--- a/doc/stdlibug/33-1.html
+++ b/doc/stdlibug/33-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>A Recap of Manipulators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="33.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="33-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>33.1 A Recap of Manipulators</H2>
diff --git a/doc/stdlibug/33-2.html b/doc/stdlibug/33-2.html
index ad2405e..b36b4c4 100644
--- a/doc/stdlibug/33-2.html
+++ b/doc/stdlibug/33-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Manipulators without Parameters</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="33-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="33-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>33.2 Manipulators without Parameters</H2>
diff --git a/doc/stdlibug/33-3.html b/doc/stdlibug/33-3.html
index 1126824..b33e1f7 100644
--- a/doc/stdlibug/33-3.html
+++ b/doc/stdlibug/33-3.html
@@ -1,16 +1,16 @@
 <HTML>
 <HEAD>
 <TITLE>Manipulators with Parameters</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="33-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="34.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>33.3 Manipulators with Parameters</H2>
 <P>Manipulators with parameters are more complex than those without because there are additional issues to consider. Before we explore these issues in detail and examine various techniques for implementing manipulators with parameters, let's take a look at one particular technique, the one that is used to implement standard manipulators such as <SAMP>std::setprecision(),</SAMP> <SAMP>std::setw()</SAMP>, etc.</P>
 <A NAME="3331"><H3>33.3.1 The Standard Manipulators</H3></A>
 <A NAME="idx810"><!></A>
-<P>The Rogue Wave implementation of the standard iostreams uses a certain technique for implementing most standard manipulators with parameters: the manipulator type <SAMP>manipT</SAMP> is a function pointer type; the manipulator object is the function pointed to; and the associated function <SAMP>f</SAMP><SAMP><SUB>manipT</SUB></SAMP><SAMP><SUB> </SUB></SAMP>is a non-member function. </P>
+<P>This implementation of the standard iostreams uses a certain technique for implementing most standard manipulators with parameters: the manipulator type <SAMP>manipT</SAMP> is a function pointer type; the manipulator object is the function pointed to; and the associated function <SAMP>f</SAMP><SAMP><SUB>manipT</SUB></SAMP><SAMP><SUB> </SUB></SAMP>is a non-member function. </P>
 <A NAME="idx811"><!></A>
-<P>The C++ standard informally refers to the manipulator type as <SAMP>smanip</SAMP>. The type itself is implementation-specified and may not be accessible to user code at all (i.e., it may be defined in some private namespace or called something entirely different); all you know is that it is returned by some of the standard manipulators. In the Rogue Wave implementation, the type referred to as <SAMP>smanip</SAMP> is a class template:</P>
+<P>The C++ standard informally refers to the manipulator type as <SAMP>smanip</SAMP>. The type itself is implementation-specified and may not be accessible to user code at all (i.e., it may be defined in some private namespace or called something entirely different); all you know is that it is returned by some of the standard manipulators. In this implementation, the type referred to as <SAMP>smanip</SAMP> is a class template:</P>
 
 <UL><PRE>
 template&lt;class T&gt;
@@ -140,7 +140,7 @@
 <LI><P CLASS="LIST">The associated function <SAMP>f</SAMP><SAMP><SUB>manipT</SUB></SAMP><SAMP><SUB> </SUB></SAMP>is a non-member function. </P></LI>
 </UL>
 <A NAME="idx825"><!></A>
-<P>The Rogue Wave implementation of the standard iostreams uses this technique for implementing most standard manipulators with parameters. See <A HREF="28-3.html#2832">Section&nbsp;28.3.2</A> for reference.</P>
+<P>This implementation of the standard iostreams uses this technique for implementing most standard manipulators with parameters. See <A HREF="28-3.html#2832">Section&nbsp;28.3.2</A> for reference.</P>
 <A NAME="idx826"><!></A>
 <P><B>Example 2: Unnamed Object and Static Member Function.</B> This example combines <B>2.)</B> and <B>b.)</B>, and thus:</P>
 <UL>
@@ -172,7 +172,7 @@
 </UL>
 <P>The idea here is that the associated function <SAMP>f</SAMP><SAMP><SUB>manipT</SUB></SAMP><SAMP><SUB> </SUB></SAMP>is a non-static member function of the manipulator type <SAMP>manipT</SAMP>. In such a model, the manipulator does not store a pointer to the associated function <SAMP>f</SAMP><SAMP><SUB>manipT</SUB></SAMP>, but defines the associated function as a pure virtual member function. Consequently, the manipulator type <SAMP>manipT</SAMP> is an abstract class, and concrete manipulator types are derived from this abstract manipulator type. They are required to implement the virtual member function that represents the associated function.</P>
 <A NAME="idx829"><!></A>
-<P>Clearly, we need a new manipulator type because the implementation-specific manipulator type <SAMP><I>smanip</I></SAMP> is implementation-defined. In the Rogue Wave C++ Standard Library, <SAMP><I>smanip</I></SAMP> has no virtual member functions, but stores a pointer to the associated function. Here is the abstract manipulator type we need:</P>
+<P>Clearly, we need a new manipulator type because the implementation-specific manipulator type <SAMP><I>smanip</I></SAMP> is implementation-defined. In thisimplementation of the C++ Standard Library, <SAMP><I>smanip</I></SAMP> has no virtual member functions, but stores a pointer to the associated function. Here is the abstract manipulator type we need:</P>
 
 <UL><PRE>
 template &lt;class Arg, class Ostream&gt;
diff --git a/doc/stdlibug/33.html b/doc/stdlibug/33.html
index f86f415..c787a5e 100644
--- a/doc/stdlibug/33.html
+++ b/doc/stdlibug/33.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Manipulators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="32-6.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="33-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 33: Manipulators</H1>
diff --git a/doc/stdlibug/34-1.html b/doc/stdlibug/34-1.html
index 98fcd0e..0b8fc96 100644
--- a/doc/stdlibug/34-1.html
+++ b/doc/stdlibug/34-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Streams as Objects</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="34.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="34-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>34.1 Streams as Objects</H2>
diff --git a/doc/stdlibug/34-2.html b/doc/stdlibug/34-2.html
index 59bfde6..3d2c433 100644
--- a/doc/stdlibug/34-2.html
+++ b/doc/stdlibug/34-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Copying and Assigning Stream Objects</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="34-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="34-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>34.2 Copying and Assigning Stream Objects</H2>
@@ -115,9 +115,9 @@
 </TABLE>
 <P>As in the original example, <SAMP>out</SAMP> inserts through the standard output stream's buffer, but lacks the special properties of a standard stream.</P>
 <A NAME="idx850"><!></A>
-<P>Here is an alternative solution that uses file descriptors, a nonstandard feature of the Rogue Wave implementation of the standard iostreams.</P>
+<P>Here is an alternative solution that uses file descriptors, a nonstandard feature of this implementation of the standard iostreams.</P>
 <BLOCKQUOTE><HR><B>
-NOTE -- This feature was available in the traditional iostreams, but is not offered by the standard iostreams. The Rogue Wave implementation of the standard iostreams retains the old feature for backward compatibility with the traditional iostreams, but it is nonstandard. Using it might make your application nonportable to other standard iostream libraries.
+NOTE -- This feature was available in the traditional iostreams, but is not offered by the standard iostreams. This implementation of the standard iostreams retains the old feature for backward compatibility with the traditional iostreams, but it is nonstandard. Using it might make your application nonportable to other standard iostream libraries.
 </B><HR></BLOCKQUOTE>
 
 <UL><PRE>int main(int argc, char *argv[])
diff --git a/doc/stdlibug/34-3.html b/doc/stdlibug/34-3.html
index aa8b46b..222c12b 100644
--- a/doc/stdlibug/34-3.html
+++ b/doc/stdlibug/34-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Sharing a Stream Buffer Among Streams</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="34-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="34-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>34.3 Sharing a Stream Buffer Among Streams</H2>
diff --git a/doc/stdlibug/34-4.html b/doc/stdlibug/34-4.html
index e45b392..9b628f2 100644
--- a/doc/stdlibug/34-4.html
+++ b/doc/stdlibug/34-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Copies of the Stream Buffer</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="34-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="35.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>34.4 Copies of the Stream Buffer</H2>
diff --git a/doc/stdlibug/34.html b/doc/stdlibug/34.html
index dd4b0a1..b7f9add 100644
--- a/doc/stdlibug/34.html
+++ b/doc/stdlibug/34.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Streams and Stream Buffers</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="33-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="34-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 34: Streams and Stream Buffers</H1>
diff --git a/doc/stdlibug/35-1.html b/doc/stdlibug/35-1.html
index 582f2fe..ed0be6a 100644
--- a/doc/stdlibug/35-1.html
+++ b/doc/stdlibug/35-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Sharing Files Among Streams</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="35.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="35-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>35.1 Sharing Files Among Streams</H2>
diff --git a/doc/stdlibug/35-2.html b/doc/stdlibug/35-2.html
index 016c6f6..bd34aff 100644
--- a/doc/stdlibug/35-2.html
+++ b/doc/stdlibug/35-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Explicit Synchronization</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="35-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="35-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>35.2 Explicit Synchronization</H2>
diff --git a/doc/stdlibug/35-3.html b/doc/stdlibug/35-3.html
index e335eca..0090c6b 100644
--- a/doc/stdlibug/35-3.html
+++ b/doc/stdlibug/35-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Implicit Synchronization Using the unitbuf Format Flag</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="35-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="35-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>35.3 Implicit Synchronization Using the unitbuf Format Flag</H2>
diff --git a/doc/stdlibug/35-4.html b/doc/stdlibug/35-4.html
index 5e055bd..7222f9c 100644
--- a/doc/stdlibug/35-4.html
+++ b/doc/stdlibug/35-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Implicit Synchronization by Tying Streams</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="35-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="35-5.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>35.4 Implicit Synchronization by Tying Streams</H2>
diff --git a/doc/stdlibug/35-5.html b/doc/stdlibug/35-5.html
index 47ed1e2..5b81c61 100644
--- a/doc/stdlibug/35-5.html
+++ b/doc/stdlibug/35-5.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Synchronizing the Standard Iostream Objects</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="35-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="35-6.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>35.5 Synchronizing the Standard Iostream Objects</H2>
diff --git a/doc/stdlibug/35-6.html b/doc/stdlibug/35-6.html
index 4b04fc7..8166655 100644
--- a/doc/stdlibug/35-6.html
+++ b/doc/stdlibug/35-6.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Synchronization with the C Standard I/O</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="35-5.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="36.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>35.6 Synchronization with the C Standard I/O</H2>
diff --git a/doc/stdlibug/35.html b/doc/stdlibug/35.html
index 5a15993..c1c5650 100644
--- a/doc/stdlibug/35.html
+++ b/doc/stdlibug/35.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Synchronizing Streams</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="34-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="35-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 35: Synchronizing Streams</H1>
diff --git a/doc/stdlibug/36-1.html b/doc/stdlibug/36-1.html
index 2b3221a..c6b41ca 100644
--- a/doc/stdlibug/36-1.html
+++ b/doc/stdlibug/36-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Adding Data to a Stream</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="36.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="36-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>36.1 Adding Data to a Stream</H2>
diff --git a/doc/stdlibug/36-2.html b/doc/stdlibug/36-2.html
index 461c78a..b595556 100644
--- a/doc/stdlibug/36-2.html
+++ b/doc/stdlibug/36-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>An Example: Storing a Date Format String</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="36-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="36-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>36.2 An Example: Storing a Date Format String</H2>
diff --git a/doc/stdlibug/36-3.html b/doc/stdlibug/36-3.html
index 092b361..53e4253 100644
--- a/doc/stdlibug/36-3.html
+++ b/doc/stdlibug/36-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Another Look at the Date Format String</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="36-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="36-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>36.3 Another Look at the Date Format String</H2>
diff --git a/doc/stdlibug/36-4.html b/doc/stdlibug/36-4.html
index 78cc7ee..3dbcb55 100644
--- a/doc/stdlibug/36-4.html
+++ b/doc/stdlibug/36-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Caveat</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="36-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="37.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>36.4 Caveat</H2>
diff --git a/doc/stdlibug/36.html b/doc/stdlibug/36.html
index 42237cc..96d64e0 100644
--- a/doc/stdlibug/36.html
+++ b/doc/stdlibug/36.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Stream Storage for Private Use</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="35-6.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="36-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 36: Stream Storage for Private Use</H1>
diff --git a/doc/stdlibug/37-1.html b/doc/stdlibug/37-1.html
index 0185e56..e59ed30 100644
--- a/doc/stdlibug/37-1.html
+++ b/doc/stdlibug/37-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Defining Callback Functions</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="37.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="37-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>37.1 Defining Callback Functions</H2>
diff --git a/doc/stdlibug/37-2.html b/doc/stdlibug/37-2.html
index d32b51e..f264941 100644
--- a/doc/stdlibug/37-2.html
+++ b/doc/stdlibug/37-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>An Example</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="37-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="38.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>37.2 An Example</H2>
diff --git a/doc/stdlibug/37.html b/doc/stdlibug/37.html
index e6cc501..1bfcd62 100644
--- a/doc/stdlibug/37.html
+++ b/doc/stdlibug/37.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Registration of Callback Functions</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="36-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="37-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 37: Registration of Callback Functions</H1>
diff --git a/doc/stdlibug/38-1.html b/doc/stdlibug/38-1.html
index 1476b9b..0049f96 100644
--- a/doc/stdlibug/38-1.html
+++ b/doc/stdlibug/38-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Deriving a New Stream Type</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="38.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="38-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>38.1 Deriving a New Stream Type</H2>
diff --git a/doc/stdlibug/38-2.html b/doc/stdlibug/38-2.html
index c06f524..a2cbb38 100644
--- a/doc/stdlibug/38-2.html
+++ b/doc/stdlibug/38-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Choosing a Base Class</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="38-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="38-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>38.2 Choosing a Base Class</H2>
diff --git a/doc/stdlibug/38-3.html b/doc/stdlibug/38-3.html
index 41b0ba7..2d70a26 100644
--- a/doc/stdlibug/38-3.html
+++ b/doc/stdlibug/38-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Construction and Initialization</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="38-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="38-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>38.3 Construction and Initialization</H2>
diff --git a/doc/stdlibug/38-4.html b/doc/stdlibug/38-4.html
index 1ba1170..7196529 100644
--- a/doc/stdlibug/38-4.html
+++ b/doc/stdlibug/38-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The Example</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="38-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="38-5.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>38.4 The Example</H2>
diff --git a/doc/stdlibug/38-5.html b/doc/stdlibug/38-5.html
index d0fe5bd..a3014bf 100644
--- a/doc/stdlibug/38-5.html
+++ b/doc/stdlibug/38-5.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Using iword/pword for RTTI in Derived Streams</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="38-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="39.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>38.5 Using iword/pword for RTTI in Derived Streams</H2>
diff --git a/doc/stdlibug/38.html b/doc/stdlibug/38.html
index cb1f0a3..fe6e17b 100644
--- a/doc/stdlibug/38.html
+++ b/doc/stdlibug/38.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Creating New Stream Classes by Derivation</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="37-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="38-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 38: Creating New Stream Classes by Derivation</H1>
diff --git a/doc/stdlibug/39-1.html b/doc/stdlibug/39-1.html
index ff3b8ea..7d1de3f 100644
--- a/doc/stdlibug/39-1.html
+++ b/doc/stdlibug/39-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Class basic_streambuf: the Sequence Abstraction</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="39.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="39-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>39.1 Class basic_streambuf: the Sequence Abstraction</H2>
diff --git a/doc/stdlibug/39-2.html b/doc/stdlibug/39-2.html
index 1a1361e..68b906a 100644
--- a/doc/stdlibug/39-2.html
+++ b/doc/stdlibug/39-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Deriving New Stream Buffer Classes</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="39-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="39-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>39.2 Deriving New Stream Buffer Classes</H2>
diff --git a/doc/stdlibug/39-3.html b/doc/stdlibug/39-3.html
index edf259c..ac40976 100644
--- a/doc/stdlibug/39-3.html
+++ b/doc/stdlibug/39-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Connecting iostream and streambuf Objects</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="39-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="40.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>39.3 Connecting iostream and streambuf Objects</H2>
diff --git a/doc/stdlibug/39.html b/doc/stdlibug/39.html
index ae9bd23..3b22abe 100644
--- a/doc/stdlibug/39.html
+++ b/doc/stdlibug/39.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Stream Buffers</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="38-5.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="39-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 39: Stream Buffers</H1>
diff --git a/doc/stdlibug/4-1.html b/doc/stdlibug/4-1.html
index c50bed9..a77174e 100644
--- a/doc/stdlibug/4-1.html
+++ b/doc/stdlibug/4-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="4-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>4.1 Overview</H2>
diff --git a/doc/stdlibug/4-2.html b/doc/stdlibug/4-2.html
index 7ae6a86..9e6e504 100644
--- a/doc/stdlibug/4-2.html
+++ b/doc/stdlibug/4-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Selecting a Container</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="4-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="4-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>4.2 Selecting a Container</H2>
diff --git a/doc/stdlibug/4-3.html b/doc/stdlibug/4-3.html
index 1c8de52..0830754 100644
--- a/doc/stdlibug/4-3.html
+++ b/doc/stdlibug/4-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Memory Management Issues</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="4-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="4-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>4.3 Memory Management Issues</H2>
diff --git a/doc/stdlibug/4-4.html b/doc/stdlibug/4-4.html
index 959d32f..20004a6 100644
--- a/doc/stdlibug/4-4.html
+++ b/doc/stdlibug/4-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Container Types Not Found in the C++ Standard Library</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="4-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="5.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>4.4 Container Types Not Found in the C++ Standard Library</H2>
diff --git a/doc/stdlibug/4.html b/doc/stdlibug/4.html
index a7d96b6..c8b3536 100644
--- a/doc/stdlibug/4.html
+++ b/doc/stdlibug/4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Container Classes</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="III.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="4-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 4: Container Classes</H1>
diff --git a/doc/stdlibug/40-1.html b/doc/stdlibug/40-1.html
index db43db1..21edeae 100644
--- a/doc/stdlibug/40-1.html
+++ b/doc/stdlibug/40-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="40.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="40-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>40.1 Overview</H2>
diff --git a/doc/stdlibug/40-2.html b/doc/stdlibug/40-2.html
index d034845..282eb53 100644
--- a/doc/stdlibug/40-2.html
+++ b/doc/stdlibug/40-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Categories of Code Conversions</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="40-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="40-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>40.2 Categories of Code Conversions</H2>
diff --git a/doc/stdlibug/40-3.html b/doc/stdlibug/40-3.html
index 6b31a88..2683917 100644
--- a/doc/stdlibug/40-3.html
+++ b/doc/stdlibug/40-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Example 1: Defining a Narrow Character Code Conversion (ASCII &lt;-&gt; EBCDIC)</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="40-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="40-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>40.3 Example 1: Defining a Narrow Character Code Conversion (ASCII &lt;-&gt; EBCDIC)</H2>
@@ -73,7 +73,7 @@
 
 };
 </PRE></UL>
-<P>For the sake of brevity, we implement only those functions used by the Rogue Wave implementation of file stream buffers. If you want to provide a code conversion facet that is more widely usable, you must also override the virtual member functions <SAMP>do_length()</SAMP> and <SAMP>do_max_length()</SAMP>. </P>
+<P>For the sake of brevity, we implement only those functions used by this implementation of file stream buffers. If you want to provide a code conversion facet that is more widely usable, you must also override the virtual member functions <SAMP>do_length()</SAMP> and <SAMP>do_max_length()</SAMP>. </P>
 <P>The implementation of the functions <SAMP>do_in()</SAMP> and <SAMP>do_out()</SAMP> is straightforward. Each of the functions translates a sequence of characters in the range <SAMP>[from,from_end)</SAMP> into the corresponding sequence <SAMP>[to,to_end)</SAMP>. The pointers <SAMP>from_next</SAMP> and <SAMP>to_next</SAMP> point one beyond the last character successfully converted. In principle, you can do whatever you want, or whatever it takes, in these functions. However, for effective communication with the file stream buffer, it is important to indicate success or failure properly.</P>
 <A NAME="4033"><H3>40.3.3 Use the New Code Conversion Facet</H3></A>
 <A NAME="idx957"><!></A>
diff --git a/doc/stdlibug/40-4.html b/doc/stdlibug/40-4.html
index 4a8f550..c809634 100644
--- a/doc/stdlibug/40-4.html
+++ b/doc/stdlibug/40-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Error Indication in Code Conversion Facets</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="40-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="40-5.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>40.4 Error Indication in Code Conversion Facets</H2>
diff --git a/doc/stdlibug/40-5.html b/doc/stdlibug/40-5.html
index f31402e..09b0122 100644
--- a/doc/stdlibug/40-5.html
+++ b/doc/stdlibug/40-5.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Example 2: Defining a Multibyte Character Code Conversion (JIS &lt;-&gt; Unicode)</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="40-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="41.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>40.5 Example 2: Defining a Multibyte Character Code Conversion (JIS &lt;-&gt; Unicode)</H2>
diff --git a/doc/stdlibug/40.html b/doc/stdlibug/40.html
index 802079d..4090b19 100644
--- a/doc/stdlibug/40.html
+++ b/doc/stdlibug/40.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Defining A Code Conversion Facet</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="39-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="40-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 40: Defining A Code Conversion Facet</H1>
diff --git a/doc/stdlibug/41-1.html b/doc/stdlibug/41-1.html
index 410a01b..733b420 100644
--- a/doc/stdlibug/41-1.html
+++ b/doc/stdlibug/41-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>User-Defined Character Types</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="41.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="41-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>41.1 User-Defined Character Types</H2>
diff --git a/doc/stdlibug/41-2.html b/doc/stdlibug/41-2.html
index 8b6ff5d..2ea1352 100644
--- a/doc/stdlibug/41-2.html
+++ b/doc/stdlibug/41-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Defining Traits and Facets for User-Defined Types</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="41-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="41-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>41.2 Defining Traits and Facets for User-Defined Types</H2>
diff --git a/doc/stdlibug/41-3.html b/doc/stdlibug/41-3.html
index 2abe758..db55042 100644
--- a/doc/stdlibug/41-3.html
+++ b/doc/stdlibug/41-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Creating and Using Streams Instantiated on User-Defined Types</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="41-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="42.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>41.3 Creating and Using Streams Instantiated on User-Defined Types</H2>
diff --git a/doc/stdlibug/41.html b/doc/stdlibug/41.html
index e4e46dd..9542093 100644
--- a/doc/stdlibug/41.html
+++ b/doc/stdlibug/41.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Defining Your Own Character Types</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="40-5.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="41-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 41: Defining Your Own Character Types</H1>
diff --git a/doc/stdlibug/42-1.html b/doc/stdlibug/42-1.html
index 3286e81..8eddb6b 100644
--- a/doc/stdlibug/42-1.html
+++ b/doc/stdlibug/42-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Locales and Iostreams</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="42.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="42-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>42.1 Locales and Iostreams</H2>
diff --git a/doc/stdlibug/42-2.html b/doc/stdlibug/42-2.html
index b048d04..c54e268 100644
--- a/doc/stdlibug/42-2.html
+++ b/doc/stdlibug/42-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>When to Imbue a New Locale</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="42-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="42-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>42.2 When to Imbue a New Locale</H2>
diff --git a/doc/stdlibug/42-3.html b/doc/stdlibug/42-3.html
index a13779e..2ab0c04 100644
--- a/doc/stdlibug/42-3.html
+++ b/doc/stdlibug/42-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>An Example</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="42-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="43.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>42.3 An Example</H2>
diff --git a/doc/stdlibug/42.html b/doc/stdlibug/42.html
index 08a41f7..18e17ac 100644
--- a/doc/stdlibug/42.html
+++ b/doc/stdlibug/42.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Imbuing Locales</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="41-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="42-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 42: Imbuing Locales</H1>
diff --git a/doc/stdlibug/43-1.html b/doc/stdlibug/43-1.html
index 9558f15..b52dffe 100644
--- a/doc/stdlibug/43-1.html
+++ b/doc/stdlibug/43-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Definition</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="43.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="43-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>43.1 Definition</H2>
diff --git a/doc/stdlibug/43-2.html b/doc/stdlibug/43-2.html
index 9d5974e..69308a1 100644
--- a/doc/stdlibug/43-2.html
+++ b/doc/stdlibug/43-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Differences between Stream Iterators and Container Iterators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="43-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="43-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>43.2 Differences between Stream Iterators and Container Iterators</H2>
diff --git a/doc/stdlibug/43-3.html b/doc/stdlibug/43-3.html
index b1ff85a..26e8f6f 100644
--- a/doc/stdlibug/43-3.html
+++ b/doc/stdlibug/43-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Error Indication by Stream Iterators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="43-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="43-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>43.3 Error Indication by Stream Iterators</H2>
diff --git a/doc/stdlibug/43-4.html b/doc/stdlibug/43-4.html
index 4a7f15c..c989184 100644
--- a/doc/stdlibug/43-4.html
+++ b/doc/stdlibug/43-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Several Iterators on One Stream</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="43-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="44.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>43.4 Several Iterators on One Stream</H2>
diff --git a/doc/stdlibug/43.html b/doc/stdlibug/43.html
index ce1b94b..f91d36c 100644
--- a/doc/stdlibug/43.html
+++ b/doc/stdlibug/43.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Stream Iterators</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="42-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="43-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 43: Stream Iterators</H1>
diff --git a/doc/stdlibug/44-1.html b/doc/stdlibug/44-1.html
index 7e37340..9cc713d 100644
--- a/doc/stdlibug/44-1.html
+++ b/doc/stdlibug/44-1.html
@@ -1,13 +1,13 @@
 <HTML>
 <HEAD>
 <TITLE>Multithread-Safe: Level 2</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="44.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="44-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>44.1 Multithread-Safe: Level 2</H2>
 <A NAME="idx980"><!></A>
 <A NAME="idx981"><!></A>
-<P>This Rogue Wave implementation of iostreams and locales provides Multithread-Safety Level 2 as an option. All public and protected functions are reentrant under certain conditions, and there is protection against multiple threads trying to modify static and global data. The library may also lock an iostream object before modifying it. When this level of multi-thread safety is enabled, client code is not required to explicitly lock or unlock a class object, whether static, global, or local, in order to perform a single operation on the object.</P>
+<P>This implementation of iostreams and locales provides Multithread-Safety Level 2 as an option. All public and protected functions are reentrant under certain conditions, and there is protection against multiple threads trying to modify static and global data. The library may also lock an iostream object before modifying it. When this level of multi-thread safety is enabled, client code is not required to explicitly lock or unlock a class object, whether static, global, or local, in order to perform a single operation on the object.</P>
 <P>This means that iostream objects, with the exception of stream buffers, can be shared between threads of execution using a simple mutex object without explicit locking. The locking mechanism is enforced at the stream level. Therefore, all operations carried out on the stream are multithread safe, including the following:</P>
 <TABLE BORDER="0" CELLPADDING="3" CELLSPACING="3">
 <tr><td valign=top><P CLASS="TABLE"><B>Thread 1:</B></P>
diff --git a/doc/stdlibug/44-2.html b/doc/stdlibug/44-2.html
index 00ee191..9ca198a 100644
--- a/doc/stdlibug/44-2.html
+++ b/doc/stdlibug/44-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The Locking Mechanism</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="44-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="45.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>44.2 The Locking Mechanism</H2>
diff --git a/doc/stdlibug/44.html b/doc/stdlibug/44.html
index f3dc196..b373815 100644
--- a/doc/stdlibug/44.html
+++ b/doc/stdlibug/44.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Iostreams and Multithreading</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="43-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="44-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 44: Iostreams and Multithreading</H1>
diff --git a/doc/stdlibug/45-1.html b/doc/stdlibug/45-1.html
index 9ee72aa..ad165e8 100644
--- a/doc/stdlibug/45-1.html
+++ b/doc/stdlibug/45-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The Character Type</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="45.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="45-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>45.1 The Character Type</H2>
diff --git a/doc/stdlibug/45-2.html b/doc/stdlibug/45-2.html
index 3136182..f79fec6 100644
--- a/doc/stdlibug/45-2.html
+++ b/doc/stdlibug/45-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Internationalization</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="45-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="45-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>45.2 Internationalization</H2>
diff --git a/doc/stdlibug/45-3.html b/doc/stdlibug/45-3.html
index 18c2f82..1166cd4 100644
--- a/doc/stdlibug/45-3.html
+++ b/doc/stdlibug/45-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>File Streams</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="45-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="45-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>45.3 File Streams</H2>
diff --git a/doc/stdlibug/45-4.html b/doc/stdlibug/45-4.html
index c809a5a..de78164 100644
--- a/doc/stdlibug/45-4.html
+++ b/doc/stdlibug/45-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>String Streams</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="45-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="45-5.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>45.4 String Streams</H2>
diff --git a/doc/stdlibug/45-5.html b/doc/stdlibug/45-5.html
index 0a7f5b8..d64fccb 100644
--- a/doc/stdlibug/45-5.html
+++ b/doc/stdlibug/45-5.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Streams with Assign</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="45-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="46.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>45.5 Streams with Assign</H2>
diff --git a/doc/stdlibug/45.html b/doc/stdlibug/45.html
index 8398df6..cea069f 100644
--- a/doc/stdlibug/45.html
+++ b/doc/stdlibug/45.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Standard vs. Traditional Iostreams</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="44-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="45-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 45: Standard vs. Traditional Iostreams</H1>
diff --git a/doc/stdlibug/46-1.html b/doc/stdlibug/46-1.html
index 2569a69..bb9d463 100644
--- a/doc/stdlibug/46-1.html
+++ b/doc/stdlibug/46-1.html
@@ -1,16 +1,16 @@
 <HTML>
 <HEAD>
 <TITLE>Extensions</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="46.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><IMG SRC="images/bnonext.gif" WIDTH=25 HEIGHT=21 ALT="No next file" BORDER=O><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>46.1 Extensions</H2>
 <A NAME="idx995"><!></A>
-<P>This section describes how the Rogue Wave implementation of the standard iostreams differs from the ISO/ANSI C++ Standard Library specification. You must be aware that whenever you use one of the features described here, the portability of your program is impaired. It will not conform to the standard.</P>
+<P>This section describes how this implementation of the standard iostreams differs from the ISO/ANSI C++ Standard Library specification. You must be aware that whenever you use one of the features described here, the portability of your program is impaired. It will not conform to the standard.</P>
 <A NAME="4611"><H3>46.1.1 File Descriptors</H3></A>
 <A NAME="idx996"><!></A>
 <P>The traditional iostreams allowed a file stream to connect to a file using a<I> file descriptor</I>. File descriptors are used by POSIX functions like <SAMP>open()</SAMP>, <SAMP>close()</SAMP>, <SAMP>read()</SAMP>, and <SAMP>write()</SAMP>. However, the ISO/ANSI standard for the programming language C and its library does not include these functions, nor does it mention file descriptors. In this sense, the use of file descriptors introduces platform and operating system dependencies into your program. This is exactly why the standard iostreams are not defined to use file descriptors.</P>
-<P>You may have existing programs that use the file descriptor features of the traditional iostreams. You may need to access system-specific files like pipes, which are accessible only through file descriptors. To address these concerns, the Rogue Wave implementation offers additional constructors and member functions in the file stream and file buffer classes that enable you to work with file descriptors.</P>
+<P>You may have existing programs that use the file descriptor features of the traditional iostreams. You may need to access system-specific files like pipes, which are accessible only through file descriptors. To address these concerns, this implementation offers additional constructors and member functions in the file stream and file buffer classes that enable you to work with file descriptors.</P>
 <P>The main additions are:</P>
 <UL>
 <LI><P CLASS="LIST">Constructors that take a file descriptor rather than a file name</P></LI>
diff --git a/doc/stdlibug/46.html b/doc/stdlibug/46.html
index ae2d555..e21c07d 100644
--- a/doc/stdlibug/46.html
+++ b/doc/stdlibug/46.html
@@ -1,10 +1,10 @@
 <HTML>
 <HEAD>
-<TITLE>Standard vs. Rogue Wave Iostreams</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<TITLE>Standard vs. Apache C++ Standard Library Iostreams</TITLE>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="45-5.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="46-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
-<H1>Chapter 46: Standard vs. Rogue Wave Iostreams</H1>
+<H1>Chapter 46: Standard vs. Apache C++ Standard Library Iostreams</H1>
 <UL>
 <UL><LI><A HREF="46-1.html">46.1 Extensions</A></LI></UL>
 <UL><UL><LI><A HREF="46-1.html#4611">46.1.1 File Descriptors</A></LI></UL></UL>
diff --git a/doc/stdlibug/5-1.html b/doc/stdlibug/5-1.html
index 57260b1..c773978 100644
--- a/doc/stdlibug/5-1.html
+++ b/doc/stdlibug/5-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The vector Data Abstraction</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="5.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="5-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>5.1 The vector Data Abstraction</H2>
diff --git a/doc/stdlibug/5-2.html b/doc/stdlibug/5-2.html
index 39256e5..160096a 100644
--- a/doc/stdlibug/5-2.html
+++ b/doc/stdlibug/5-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>vector Operations</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="5-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="5-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>5.2 vector Operations</H2>
diff --git a/doc/stdlibug/5-3.html b/doc/stdlibug/5-3.html
index 24175f4..c580784 100644
--- a/doc/stdlibug/5-3.html
+++ b/doc/stdlibug/5-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Boolean Vectors</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="5-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="5-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>5.3 Boolean Vectors</H2>
diff --git a/doc/stdlibug/5-4.html b/doc/stdlibug/5-4.html
index 2146c99..6401431 100644
--- a/doc/stdlibug/5-4.html
+++ b/doc/stdlibug/5-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Example Program: The Sieve of Eratosthenes</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="5-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="6.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>5.4 Example Program: The Sieve of Eratosthenes</H2>
diff --git a/doc/stdlibug/5.html b/doc/stdlibug/5.html
index 36eb240..4b01e53 100644
--- a/doc/stdlibug/5.html
+++ b/doc/stdlibug/5.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>vector and vector&lt;bool&gt;</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="4-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="5-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 5: vector and vector&lt;bool&gt;</H1>
diff --git a/doc/stdlibug/6-1.html b/doc/stdlibug/6-1.html
index ab7e6fc..d5926cd 100644
--- a/doc/stdlibug/6-1.html
+++ b/doc/stdlibug/6-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The list Data Abstraction</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="6.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="6-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>6.1 The list Data Abstraction</H2>
diff --git a/doc/stdlibug/6-2.html b/doc/stdlibug/6-2.html
index 63c0da7..fb0d7aa 100644
--- a/doc/stdlibug/6-2.html
+++ b/doc/stdlibug/6-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>list Operations</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="6-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="6-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>6.2 list Operations</H2>
diff --git a/doc/stdlibug/6-3.html b/doc/stdlibug/6-3.html
index 709845d..ab6c00b 100644
--- a/doc/stdlibug/6-3.html
+++ b/doc/stdlibug/6-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Example Program: An Inventory System</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="6-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="7.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>6.3 Example Program: An Inventory System</H2>
diff --git a/doc/stdlibug/6.html b/doc/stdlibug/6.html
index b0602cc..303a35f 100644
--- a/doc/stdlibug/6.html
+++ b/doc/stdlibug/6.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>list</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="5-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="6-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 6: list</H1>
diff --git a/doc/stdlibug/7-1.html b/doc/stdlibug/7-1.html
index 3c281e6..30a3696 100644
--- a/doc/stdlibug/7-1.html
+++ b/doc/stdlibug/7-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The deque Data Abstraction</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="7.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="7-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>7.1 The deque Data Abstraction</H2>
diff --git a/doc/stdlibug/7-2.html b/doc/stdlibug/7-2.html
index 9de3c98..e1622c7 100644
--- a/doc/stdlibug/7-2.html
+++ b/doc/stdlibug/7-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>deque Operations</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="7-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="7-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>7.2 deque Operations</H2>
diff --git a/doc/stdlibug/7-3.html b/doc/stdlibug/7-3.html
index 5e8cd25..3201b32 100644
--- a/doc/stdlibug/7-3.html
+++ b/doc/stdlibug/7-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Example Program: Radix Sort</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="7-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="8.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>7.3 Example Program: Radix Sort</H2>
diff --git a/doc/stdlibug/7.html b/doc/stdlibug/7.html
index c55a659..54ed289 100644
--- a/doc/stdlibug/7.html
+++ b/doc/stdlibug/7.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>deque</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="6-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="7-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 7: deque</H1>
diff --git a/doc/stdlibug/8-1.html b/doc/stdlibug/8-1.html
index aa6b447..09ea46a 100644
--- a/doc/stdlibug/8-1.html
+++ b/doc/stdlibug/8-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The set Data Abstraction</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="8.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="8-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>8.1 The set Data Abstraction</H2>
diff --git a/doc/stdlibug/8-2.html b/doc/stdlibug/8-2.html
index d053247..6c6f797 100644
--- a/doc/stdlibug/8-2.html
+++ b/doc/stdlibug/8-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>set and multiset Operations</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="8-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="8-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>8.2 set and multiset Operations</H2>
diff --git a/doc/stdlibug/8-3.html b/doc/stdlibug/8-3.html
index 7ace29e..d42db85 100644
--- a/doc/stdlibug/8-3.html
+++ b/doc/stdlibug/8-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Example Program: A Spelling Checker</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="8-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="8-4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>8.3 Example Program: A Spelling Checker</H2>
diff --git a/doc/stdlibug/8-4.html b/doc/stdlibug/8-4.html
index 7b920ac..83752a2 100644
--- a/doc/stdlibug/8-4.html
+++ b/doc/stdlibug/8-4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The bitset Abstraction</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="8-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="9.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>8.4 The bitset Abstraction</H2>
diff --git a/doc/stdlibug/8.html b/doc/stdlibug/8.html
index ff94ea4..ef7ef0d 100644
--- a/doc/stdlibug/8.html
+++ b/doc/stdlibug/8.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>set, multiset, and bitset</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="7-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="8-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 8: set, multiset, and bitset</H1>
diff --git a/doc/stdlibug/9-1.html b/doc/stdlibug/9-1.html
index 220a998..5d7b26c 100644
--- a/doc/stdlibug/9-1.html
+++ b/doc/stdlibug/9-1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>The map Data Abstraction</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="9.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="9-2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>9.1 The map Data Abstraction</H2>
diff --git a/doc/stdlibug/9-2.html b/doc/stdlibug/9-2.html
index ee689fb..97bc9b8 100644
--- a/doc/stdlibug/9-2.html
+++ b/doc/stdlibug/9-2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>map and multimap Operations</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="9-1.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="9-3.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>9.2 map and multimap Operations</H2>
diff --git a/doc/stdlibug/9-3.html b/doc/stdlibug/9-3.html
index 76b7767..1395760 100644
--- a/doc/stdlibug/9-3.html
+++ b/doc/stdlibug/9-3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Example Programs</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="9-2.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="10.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>9.3 Example Programs</H2>
diff --git a/doc/stdlibug/9.html b/doc/stdlibug/9.html
index 0abd133..1e48da2 100644
--- a/doc/stdlibug/9.html
+++ b/doc/stdlibug/9.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>map and multimap</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="8-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="9-1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Chapter 9: map and multimap</H1>
diff --git a/doc/stdlibug/I.html b/doc/stdlibug/I.html
index dbe1c40..9466d2a 100644
--- a/doc/stdlibug/I.html
+++ b/doc/stdlibug/I.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Introduction</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <IMG SRC="images/bnoprev.gif" WIDTH=20 HEIGHT=21 ALT="No previous file" BORDER=O><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="1.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Part I: Introduction</H1>
diff --git a/doc/stdlibug/II.html b/doc/stdlibug/II.html
index ff3e7e3..f44f3d0 100644
--- a/doc/stdlibug/II.html
+++ b/doc/stdlibug/II.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Fundamentals</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="1-7.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="2.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Part II: Fundamentals</H1>
diff --git a/doc/stdlibug/III.html b/doc/stdlibug/III.html
index 049c581..39de939 100644
--- a/doc/stdlibug/III.html
+++ b/doc/stdlibug/III.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Containers</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="3-5.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="4.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Part III: Containers</H1>
diff --git a/doc/stdlibug/IV.html b/doc/stdlibug/IV.html
index b1278c9..5066097 100644
--- a/doc/stdlibug/IV.html
+++ b/doc/stdlibug/IV.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Algorithms</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="12-3.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="13.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Part IV: Algorithms</H1>
diff --git a/doc/stdlibug/V.html b/doc/stdlibug/V.html
index 942cbab..61a32a2 100644
--- a/doc/stdlibug/V.html
+++ b/doc/stdlibug/V.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Special Techniques</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="14-7.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="15.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Part V: Special Techniques</H1>
diff --git a/doc/stdlibug/VI.html b/doc/stdlibug/VI.html
index de950e1..0f63498 100644
--- a/doc/stdlibug/VI.html
+++ b/doc/stdlibug/VI.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Special Classes</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="18-4.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="19.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Part VI: Special Classes</H1>
diff --git a/doc/stdlibug/VII.html b/doc/stdlibug/VII.html
index 06e42ca..1919e15 100644
--- a/doc/stdlibug/VII.html
+++ b/doc/stdlibug/VII.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Locales</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="22-7.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="23.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Part VII: Locales</H1>
diff --git a/doc/stdlibug/VIII.html b/doc/stdlibug/VIII.html
index 8a53d21..36405cd 100644
--- a/doc/stdlibug/VIII.html
+++ b/doc/stdlibug/VIII.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Iostreams</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="26-9.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="27.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H1>Part VIII: Iostreams</H1>
@@ -25,7 +25,7 @@
 <H3><A HREF="43.html">Chapter 43: Stream Iterators</A></H3>
 <H3><A HREF="44.html">Chapter 44: Iostreams and Multithreading</A></H3>
 <H3><A HREF="45.html">Chapter 45: Standard vs. Traditional Iostreams</A></H3>
-<H3><A HREF="46.html">Chapter 46: Standard vs. Rogue Wave Iostreams</A></H3>
+<H3><A HREF="46.html">Chapter 46: Standard vs. Apache C++ Standard Library Iostreams</A></H3>
 
 
 <BR>
diff --git a/doc/stdlibug/acknow.html b/doc/stdlibug/acknow.html
index d165041..956ca71 100644
--- a/doc/stdlibug/acknow.html
+++ b/doc/stdlibug/acknow.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Acknowledgments</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <IMG SRC="images/bnoprev.gif" WIDTH=20 HEIGHT=21 ALT="No previous file" BORDER=O><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><IMG SRC="images/bnonext.gif" WIDTH=25 HEIGHT=21 ALT="No next file" BORDER=O><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <P><EMPHASIS ROLE="bold">SourcePro Core Product Team</EMPHASIS>: Tim Adams, Andrew Black, Jeremy Dean, Erin Foley, Keith Hoaglin, Ravi Inampudi, Amit Jindal, Dennis Kennedy, Shannon Lewis, Liviu Nicoara, Martin Sebor, Nikki Sharma, Marcia Steele, Giai Truong</P><P><EMPHASIS ROLE="bold">Original Team</EMPHASIS>: Timothy Budd, Anna Dahan, Kevin Djang, Donald Fowler, Marlene Hart, <br>Angelika Langer, Phillipe LeMouel, Wendi Minne, Rodney Mishima, Tom Pearson, <br>Randi Prince, Randall Robinson, Randy Smithey, Chun Zhang</P>
diff --git a/doc/stdlibug/booktoc.html b/doc/stdlibug/booktoc.html
index ee807b2..3a8cd4c 100644
--- a/doc/stdlibug/booktoc.html
+++ b/doc/stdlibug/booktoc.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Comprehensive Table of Contents</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <IMG SRC="images/bnoprev.gif" WIDTH=20 HEIGHT=21 ALT="No previous file" BORDER=O><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><IMG SRC="images/bnotoc.gif" WIDTH=56 HEIGHT=21 ALT="No link" BORDER=O><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><IMG SRC="images/bnonext.gif" WIDTH=25 HEIGHT=21 ALT="No next file" BORDER=O><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>Table of Contents</H2>
@@ -510,7 +510,7 @@
 <UL><UL><LI><A HREF="45-3.html#4532">45.3.2 The File Buffer</A></LI></UL></UL>
 <UL><LI><A HREF="45-4.html">45.4 String Streams</A></LI></UL>
 <UL><LI><A HREF="45-5.html">45.5 Streams with Assign</A></LI></UL>
-<H2><A HREF="46.html">Chapter 46: Standard vs. Rogue Wave Iostreams</A></H2>
+<H2><A HREF="46.html">Chapter 46: Standard vs. Apache C++ Standard Library Iostreams</A></H2>
 <UL><LI><A HREF="46-1.html">46.1 Extensions</A></LI></UL>
 <UL><UL><LI><A HREF="46-1.html#4611">46.1.1 File Descriptors</A></LI></UL></UL>
 <UL><UL><LI><A HREF="46-1.html#4612">46.1.2 Multithreaded Environments</A></LI></UL></UL>
diff --git a/doc/stdlibug/contact.html b/doc/stdlibug/contact.html
index 09fbe83..6d3b0a3 100644
--- a/doc/stdlibug/contact.html
+++ b/doc/stdlibug/contact.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
-<TITLE>Contacting Rogue Wave</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet">
+<TITLE>Contacting the Apache C++ Standard Library Team</TITLE>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet">
 </HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="../../index.html"><IMG SRC="images/banner.gif" ALT="Rogue Wave banner" WIDTH=405 HEIGHT=57 BORDER=0></A><br>
@@ -10,16 +10,34 @@
 <p>Use your browser's <b>Back</b> button to return to where you were.</p>
 
 <h2>Feedback on the Documentation</h2>
+<p>
 
-<HR><B>Please do not use this feedback path for technical support issues. Those should be handled through your standard pathway for receiving technical support.</B><HR>
+Please send feedback to one of the Apache C++ Standard Library mailing lists:
 
-<p>Write to us at <a href="mailto:rwonlinedocs@roguewave.com">rwonlinedocs@roguewave.com</a></p>
-
-<p>Please use this only to:</p>
-<ol><li>Report errors in the documentation.
-<li>Make suggestions on how to improve the documentation.
-<li>Tell us how much you like the documentation.
-</ol>
+  <ul>
+    <li>
+      <a href="mailto:stdcxx-dev@incubator.apache.org">
+          stdcxx-dev@incubator.apache.org
+      </a>
+    </li>
+    <li>
+      <a href="mailto:stdcxx-user@incubator.apache.org">
+        stdcxx-user@incubator.apache.org
+      </a>
+    </li>
+  </ul>
+</p>
 
 <P><IMG SRC="images/bnoprev.gif" WIDTH=20 HEIGHT=21 BORDER=0><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=0></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=0></A><IMG SRC="images/bnonext.gif" WIDTH=19 HEIGHT=21 BORDER=0></P>
-</BODY></HTML>
+
+<!-- Google Analytics tracking code -->
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+    _uacct = "UA-1775151-1";
+    urchinTracker();
+</script>
+<!-- end of Google Analytics tracking code -->
+
+</BODY>
+</HTML>
diff --git a/doc/stdlibug/copyright.html b/doc/stdlibug/copyright.html
index b1cba66..57d7604 100644
--- a/doc/stdlibug/copyright.html
+++ b/doc/stdlibug/copyright.html
@@ -1,16 +1,31 @@
 <HTML>
 <HEAD>
 <TITLE>Copyright Information</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <A HREF="../../index.html"><IMG SRC="images/banner.gif" WIDTH=405 HEIGHT=57 ALT="Rogue Wave banner" BORDER=0></A><BR>
 <IMG SRC="images/noprev.gif" WIDTH=20 HEIGHT=21 ALT="No previous file" BORDER=O><A HREF="noframes.html"><IMG SRC="images/top.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/toc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/index.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><IMG SRC="images/nonext.gif" WIDTH=25 HEIGHT=21 ALT="No next file" BORDER=O><A HREF="../../index.html"><IMG SRC="images/blank.gif" WIDTH=56 HEIGHT=21 BORDER=O><IMG SRC="images/end.gif" WIDTH=136 HEIGHT=21 BORDER=O></A>
 <DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
-<P>Copyright 2005 Quovadx, Inc.  All Rights Reserved. </P><P>Rogue Wave and SourcePro are registered trademarks of Quovadx, Inc. in the United States and other countries.  All other trademarks are the property of their respective owners.</P>
+<P>
+
+&copy; Copyright 1994-2007 Rogue Wave Software.
+
+</P>
+<P>
+
+Licensed to the Apache Software  Foundation (ASF) under one or more contributor  license agreements.  See  the NOTICE  file distributed with  this  work  for  additional information  regarding  copyright ownership.   The ASF  licenses this  file to  you under  the Apache License, Version  2.0 (the  "License"); you may  not use  this file except in  compliance with the License.   You may obtain  a copy of the License at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>
+
+</P>
+<P>
+
+Unless required by applicable law or agreed to in writing, software distributed under the  License is distributed on an  "AS IS" BASIS, WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or implied.   See  the License  for  the  specific language  governing permissions and limitations under the License.
+
+</P>
 <BR>
 <HR>
-<IMG SRC="images/bnoprev.gif" WIDTH=20 HEIGHT=21 ALT="No previous file" BORDER=O><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><IMG SRC="images/bnonext.gif" WIDTH=20 HEIGHT=21 ALT="No next file" BORDER=O><P>&copy;2005 Copyright Quovadx, Inc. All Rights Reserved.<BR>Rogue Wave and SourcePro are registered trademarks of Quovadx, Inc. in the United States and other countries. All other trademarks are the property of their respective owners.<BR><A HREF="contact.html">Contact</A> Rogue Wave about documentation or support issues.</P>
+<IMG SRC="images/bnoprev.gif" WIDTH=20 HEIGHT=21 ALT="No previous file" BORDER=O><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><IMG SRC="images/bnonext.gif" WIDTH=20 HEIGHT=21 ALT="No next file" BORDER=O>
 
+<P>&copy; 1994-2007 Copyright Rogue Wave Software. All Rights Reserved.<BR>Rogue Wave is a registered trademark of Rogue Wave Software in the United States and other countries. All other trademarks are the property of their respective owners.<BR><A HREF="contact.html">Contact</A> the Apache C++ Standard Library maintainers with documentation and support issues.</P>
 
 <!-- Google Analytics tracking code -->
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/doc/stdlibug/frames-banner.html b/doc/stdlibug/frames-banner.html
index 4bd4676..769f34a 100644
--- a/doc/stdlibug/frames-banner.html
+++ b/doc/stdlibug/frames-banner.html
@@ -4,28 +4,45 @@
         <link rel=StyleSheet
               href="../rwbanner.css"
               type="text/css"
-              title="Rogue Wave Standard Stylesheet">
-            <base target="toc">
-    </head>
-    <body bgcolor=#FFFFFF>
+              title="Apache stdcxx Stylesheet"/>
+        <base target="toc"/>
 
+        <style type="text/css">
+            body {
+                background: url("http://apache.org/images/asf_logo.gif");
+                background-repeat: no-repeat
+            }
+        </style>
+    </head>
+    <body>
         <table border=0 cellpadding=4 cellspacing=0 width=100%>
             <tr>
                 <td align=center>
-                    <h2>Apache C++ Standard Library User's Guide</h2>
-                    <h4>
+                    <h2>
+                        <a href="http://incubator.apache.org/stdcxx"
+                           target="_top">
+                            Apache C++ Standard Library</a> User's Guide
+                    </h2>
+                    <h5>
                         <a href="frames-displayarea.html"
                            target="display">Top</a>
                         |
                         <a href="frames-tindex.html"
                            target="display">Topic Index</a>
                         |
-                        <a href="noframes.html" target="_top">No Frames</a>
+                        <a href="noframes.html"
+                           target="_top">
+                            No Frames
+                        </a>
                         <br>
-                        <a href="frames-contents-chapter.html">Chapter List</a>
+                        <a href="frames-contents-chapter.html">
+                            Chapter List
+                        </a>
                         or
-                        <a href="frames-contents-all.html">Detailed Contents</a>
-                    </h4>
+                        <a href="frames-contents-all.html">
+                            Detailed Contents
+                        </a>
+                    </h5>
                 </td>
             </tr>
          </table>
diff --git a/doc/stdlibug/frames-contents-all.html b/doc/stdlibug/frames-contents-all.html
index baf246c..449f580 100644
--- a/doc/stdlibug/frames-contents-all.html
+++ b/doc/stdlibug/frames-contents-all.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Comprehensive TOC Frames</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet">
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet">
 <BASE TARGET="text">
 </HEAD>
 <BODY BGCOLOR=#FFFFFF>
diff --git a/doc/stdlibug/frames-contents-chapter.html b/doc/stdlibug/frames-contents-chapter.html
index b0220bf..a595739 100644
--- a/doc/stdlibug/frames-contents-chapter.html
+++ b/doc/stdlibug/frames-contents-chapter.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Chapter List</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet">
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet">
 <BASE TARGET="text">
 </HEAD>
 <BODY BGCOLOR=#FFFFFF>
@@ -64,7 +64,7 @@
 &nbsp;&nbsp;<B><A HREF="43.html">43: Stream Iterators</A></B><BR>
 &nbsp;&nbsp;<B><A HREF="44.html">44: Iostreams and Multithreading</A></B><BR>
 &nbsp;&nbsp;<B><A HREF="45.html">45: Standard vs. Traditional Iostreams</A></B><BR>
-&nbsp;&nbsp;<B><A HREF="46.html">46: Standard vs. Rogue Wave Iostreams</A></B><BR>
+&nbsp;&nbsp;<B><A HREF="46.html">46: Standard vs. Apache stdcxx Iostreams</A></B><BR>
 
 </SMALL>
 </TD>
diff --git a/doc/stdlibug/frames-displayarea.html b/doc/stdlibug/frames-displayarea.html
index b370cbe..ca357f1 100644
--- a/doc/stdlibug/frames-displayarea.html
+++ b/doc/stdlibug/frames-displayarea.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Display area frameset</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet">
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet">
 </HEAD>
 
 <FRAMESET COLS="20%,*">
diff --git a/doc/stdlibug/frames-intro-contents.html b/doc/stdlibug/frames-intro-contents.html
index 943aa37..baff8ae 100644
--- a/doc/stdlibug/frames-intro-contents.html
+++ b/doc/stdlibug/frames-intro-contents.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Introduction Contents</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet">
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet">
 <BASE TARGET="text">
 </HEAD>
 <BODY BGCOLOR=#FFFFFF>
diff --git a/doc/stdlibug/frames-intro-text.html b/doc/stdlibug/frames-intro-text.html
index e30f5f4..49a60eb 100644
--- a/doc/stdlibug/frames-intro-text.html
+++ b/doc/stdlibug/frames-intro-text.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Welcome</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet">
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet">
 </HEAD>
 <BODY BGCOLOR=#FFFFFF>
 
diff --git a/doc/stdlibug/frames-tindex-contents.html b/doc/stdlibug/frames-tindex-contents.html
index 12dc047..22e5079 100644
--- a/doc/stdlibug/frames-tindex-contents.html
+++ b/doc/stdlibug/frames-tindex-contents.html
@@ -2,7 +2,7 @@
 <HEAD>
 <TITLE>Frame-based index contents frame</TITLE>
 <BASE TARGET="text">
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet">
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet">
 <BASE TARGET="text">
 </HEAD>
 <BODY BGCOLOR=#FFFFFF>
diff --git a/doc/stdlibug/frames-tindex.html b/doc/stdlibug/frames-tindex.html
index e0b59d7..7333a0a 100644
--- a/doc/stdlibug/frames-tindex.html
+++ b/doc/stdlibug/frames-tindex.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Index frameset</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet">
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet">
 </HEAD>
 
 <FRAMESET COLS="20%,*">
diff --git a/doc/stdlibug/index.html b/doc/stdlibug/index.html
index d829937..d28aeb3 100644
--- a/doc/stdlibug/index.html
+++ b/doc/stdlibug/index.html
@@ -4,7 +4,7 @@
         <link rel=StyleSheet
               href="../rw.css"
               type="text/css"
-              title="Rogue Wave Standard Stylesheet">
+              title="Apache stdcxx Stylesheet">
     </head>
 
     <frameset rows="110,*">
diff --git a/doc/stdlibug/lists.html b/doc/stdlibug/lists.html
index a05d092..f545d75 100644
--- a/doc/stdlibug/lists.html
+++ b/doc/stdlibug/lists.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Table, Figure, and Examples List</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <IMG SRC="images/bnoprev.gif" WIDTH=20 HEIGHT=21 ALT="No previous file" BORDER=O><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><IMG SRC="images/bnonext.gif" WIDTH=25 HEIGHT=21 ALT="No next file" BORDER=O><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 
diff --git a/doc/stdlibug/noframes.html b/doc/stdlibug/noframes.html
index 743d34b..279b1cf 100644
--- a/doc/stdlibug/noframes.html
+++ b/doc/stdlibug/noframes.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>C++ Standard Library Module User's Guide</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <H1>C++ Standard Library Module User's Guide</H1>
 <P>Welcome to the <I>C++ Standard Library Module User's Guide</I>.</P>
@@ -67,7 +67,7 @@
 <H4><A HREF="43.html">Chapter 43: Stream Iterators</A></H4>
 <H4><A HREF="44.html">Chapter 44: Iostreams and Multithreading</A></H4>
 <H4><A HREF="45.html">Chapter 45: Standard vs. Traditional Iostreams</A></H4>
-<H4><A HREF="46.html">Chapter 46: Standard vs. Rogue Wave Iostreams</A></H4>
+<H4><A HREF="46.html">Chapter 46: Standard vs. Apache C++ Standard Library Iostreams</A></H4>
 </UL>
 
 
diff --git a/doc/stdlibug/tindex.html b/doc/stdlibug/tindex.html
index 4cdc4bd..35d791c 100644
--- a/doc/stdlibug/tindex.html
+++ b/doc/stdlibug/tindex.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <TITLE>Topic Index</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
 <BODY BGCOLOR=#FFFFFF>
 <IMG SRC="images/bnoprev.gif" WIDTH=20 HEIGHT=21 ALT="No previous file" BORDER=O><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><IMG SRC="images/bnoindex.gif" WIDTH=56 HEIGHT=21 ALT="No link" BORDER=O><IMG SRC="images/bnonext.gif" WIDTH=25 HEIGHT=21 ALT="No next file" BORDER=O><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
 <H2>Topic Index</H2>
@@ -1361,7 +1361,7 @@
 &nbsp;&nbsp;&nbsp;internationalization [in <A HREF="45-2.html#idx988">45.2 Internationalization</A>]<BR>
 &nbsp;&nbsp;&nbsp;string streams [in <A HREF="45-4.html#idx993">45.4 String Streams</A>]<BR>
 &nbsp;&nbsp;&nbsp;templatized types [in <A HREF="45-1.html#idx985">45.1 The Character Type</A>]<BR>
-standard iostreams, Rogue Wave differences [in <A HREF="46-1.html#idx995">46.1 Extensions</A>]<BR>
+standard iostreams, differences of this implementation [in <A HREF="46-1.html#idx995">46.1 Extensions</A>]<BR>
 &nbsp;&nbsp;&nbsp;file descriptors [in <A HREF="46-1.html#idx996">46.1.1 File Descriptors</A>]<BR>
 &nbsp;&nbsp;&nbsp;multithreading [in <A HREF="46-1.html#idx997">46.1.2 Multithreaded Environments</A>]<BR>
 standard iostreams<BR>
diff --git a/etc/config/GNUmakefile.cfg b/etc/config/GNUmakefile.cfg
index 4a82c34..e5c1f8f 100644
--- a/etc/config/GNUmakefile.cfg
+++ b/etc/config/GNUmakefile.cfg
@@ -278,7 +278,9 @@
 # check compiler, linker, and run environment's sanity, determine
 # system (or compiler) architecture (word size, address size, etc.)
 sane:
-	@(echo; echo "configuring for $(CCNAME) on $(PLATFORM)"; echo;      \
+	@(echo;                                                             \
+          echo "configuring stdcxx $(LIBVER) for $(CCNAME) on $(PLATFORM)"; \
+          echo;                                                             \
           rm -f a.out ;                                                     \
           echo "int main () { return 0; }" | tee a.cpp >>$(LOGFILE) ;       \
           printf "%-50.50s " "checking if the compiler is sane";            \
@@ -306,10 +308,10 @@
 
 clean:
 	@rm -f a.out core *.o *.i *.ii *.ti vars.sh \
-               *$(LIBSUFFIX) $(LOGFILE) $(TARGET)
+               *$(LIBSUFFIX) $(TARGET)
 
 realclean: clean
-	rm -f *.d a.cpp config.h  
+	rm -f *.d *.o *.a *.so a.cpp
 
 listtarget:
 	@echo $(TARGET)
diff --git a/etc/config/GNUmakefile.exm b/etc/config/GNUmakefile.exm
index 5798bac..dcf95db 100644
--- a/etc/config/GNUmakefile.exm
+++ b/etc/config/GNUmakefile.exm
@@ -21,7 +21,9 @@
 
 INCLUDES += -I$(EXMDIR)/include
 
-RUNFLAGS += -d $(EXMDIR)
+RUNFLAGS += -d $(EXMDIR) --ulimit=as:268435456
+# No example should use more than 256MB of memory (Related to STDCXX-440).
+# The magic number 268435456 is 256MB in bytes.
 
 ifneq ($(RPATH),)
   LDFLAGS += $(RPATH)$(LIBDIR)
diff --git a/etc/config/GNUmakefile.lib b/etc/config/GNUmakefile.lib
index 25715fa..e92dedb 100644
--- a/etc/config/GNUmakefile.lib
+++ b/etc/config/GNUmakefile.lib
@@ -20,7 +20,12 @@
 LIBLINK := $(LIBNAME)
 
 ifeq ($(findstring shared,$(BUILDMODE)),shared)
-  LIB    := $(LIBLINK).$(LIBVER)
+  ifneq ($(LIBSUFFIX),.dll)
+    LIB  := $(LIBLINK).$(LIBVER)
+  else
+    # on Cygwin use name libstd${BUILDTYPE}-X.Y.Z.dll
+    LIB  := $(basename $(LIBLINK))-$(LIBVER)$(LIBSUFFIX)
+  endif
   TARGET := $(LIB) $(LIBLINK)
 else
   LIB    := $(LIBLINK)
diff --git a/etc/config/GNUmakefile.tst b/etc/config/GNUmakefile.tst
index 6fbda81..bbfd8fa 100644
--- a/etc/config/GNUmakefile.tst
+++ b/etc/config/GNUmakefile.tst
@@ -70,7 +70,9 @@
   LDFLAGS += $(RPATH)$(LIBDIR):$(BUILDDIR)/rwtest
 endif
 
-RUNFLAGS += --compat -x "--compat -O -"
+RUNFLAGS += --compat -x "--compat -O -" --ulimit=as:1073741824
+# No test should use more than 1 GB of memory (See STDCXX-440).
+# The magic number 1073741824 is 1 GB in bytes.
 
 ##############################################################################
 #  TARGETS
diff --git a/etc/config/acc.config b/etc/config/acc.config
index 5ca2651..ec58054 100644
--- a/etc/config/acc.config
+++ b/etc/config/acc.config
@@ -8,7 +8,8 @@
 
 CXX       = aCC
 
-CCVER     := $(shell $(CXX) -V 2>&1 | awk '{ print $$6 }')
+CCVER     := $(shell   $(CXX) -V 2>&1 \
+                     | sed "s/.* \(A\.[0-9][0-9]*\.[0-9][0-9]\) .*/\1/")
 aCC_MAJOR := $(shell echo $(CCVER) | sed "s/[^.]*\.\([0-9]*\)\..*/\1/")
 aCC_MINOR := $(shell echo $(CCVER) | sed "s/[^.]*\.[^.]*\.\([0-9]*\)/\1/")
 
@@ -35,6 +36,23 @@
 # 2401 destructor for base class %t is not virtual
 # 2487 inline %n cannot be explicitly instantiated
 
+    ifeq ($(shell [ $(aCC_MINOR) -gt 10 ] && echo 1),1)
+
+# 4227 padding struct with N bytes to align member
+# 4229 64 bit migration: conversion from "long" to "int" may truncate value
+# 4231 64 bit migration: conversion between types of different sizes
+# 4235 conversion from "T" to "U" may lose significant bits
+# 4237 type cast from "T" to "U" may cause sign extension
+# 4249 64 bit migration: value could be truncated before cast
+# 4255 padding size of struct with N bytes to alignment boundary
+# 4272 conversion from "T" to "unsigned T" may lose sign
+# 4284 operator= does not return reference to *this
+# 4285 operator= does not have a check for the source and destination
+# 4286 return non-const handle to non-public data member
+
+        WARNFLAGS += +W4227 +W4229 +W4231 +W4235 +W4237 +W4249 \
+                     +W4255 +W4272 +W4284 +W4285 +W4286
+    endif   # aCC > 6.10
 endif   # aCC 6.x
 
 ifeq ($(shell [ $(aCC_MAJOR) -ge 6 -o $(aCC_MINOR) -ge 38 ] && echo 1),1)
diff --git a/etc/config/eccp.config b/etc/config/eccp.config
index 364892f..77f72f2 100644
--- a/etc/config/eccp.config
+++ b/etc/config/eccp.config
@@ -10,6 +10,11 @@
 ECCP_MAJOR     := $(shell echo "$(CCVER)" | sed -n "s/^\([^\.]*\).*/\1/p")
 ECCP_MINOR     := $(shell echo "$(CCVER)" | sed -n "s/^.*\.\([0-9]*\).*/\1/p")
 
+ifeq ($(BUILDDIR),)
+    # set to the CWD when not defined
+    BUILDDIR=$(shell pwd)/build
+endif
+
 ifeq ($(ECCP_MAJOR),2)
     CPPFLAGS        = -I$(TOPDIR)/include/ansi --incl_suffixes ::
     CXXFLAGS        = -A -B -x
diff --git a/etc/config/gcc.config b/etc/config/gcc.config
index d7cf689..1fef1f5 100644
--- a/etc/config/gcc.config
+++ b/etc/config/gcc.config
@@ -6,12 +6,12 @@
 #
 ##############################################################################
 
-CXX             = gcc
-CCVER          := $(shell $(CXX) -dumpversion | sed "s/[^0-9]*\([0-9.]*\).*/\1/g")
+CXX    = gcc
+CCVER := $(shell $(CXX) -dumpversion | sed "s/[^0-9]*\([0-9.]*\).*/\1/g")
 
 # determine the major version of gcc
-CXX_MAJOR      := $(shell echo "$(CCVER)" | sed "s/^\([1-9][0-9]*\).*/\1/")
-CXX_MINOR      := $(shell echo "$(CCVER)" | sed "s/[1-9]*\.\([0-9]*\).*/\1/")
+CXX_MAJOR := $(shell echo "$(CCVER)" | sed "s/^\([1-9][0-9]*\).*/\1/")
+CXX_MINOR := $(shell echo "$(CCVER)" | sed "s/[1-9]*\.\([0-9]*\).*/\1/")
 
 # determine the major and minor version of the OS on AIX
 ifeq ($(OSNAME),AIX)
@@ -20,25 +20,25 @@
 endif
 
 # -W and -Wextra are the same
-WARNFLAGS       = -W -Wall -Wcast-qual -Winline -Wshadow -Wwrite-strings
+WARNFLAGS = -W -Wall -Wcast-qual -Winline -Wshadow -Wwrite-strings
 
 # -Wno-long-long not available prior to 2.90
-ifeq ($(shell [ $(CXX_MAJOR) -gt 2 -o $(CXX_MAJOR) -eq 2 -a $(CXX_MINOR) -ge 90 ] && echo 1), 1)
-WARNFLAGS      += -Wno-long-long
+ifeq ($(shell [    $(CXX_MAJOR) -gt 2 -o $(CXX_MAJOR) -eq 2 \
+                -a $(CXX_MINOR) -ge 90 ] && echo 1), 1)
+    WARNFLAGS += -Wno-long-long
 endif   # gcc >= 2.90
 
 # prevent (bogus?) warnings on SunOS
 ifneq ($(OSNAME),SunOS)
-WARNFLAGS      += -Wcast-align
+    WARNFLAGS      += -Wcast-align
 else
 
-# prevent gcc 3.x warnings about #pragma ident on SunOS
-ifeq ($(CXX_MAJOR),3)
-ifeq ($(shell expr $(CXX_MINOR) \< 4),1)
-WARNFLAGS      += -Wno-unknown-pragmas
-endif   # gcc < 3.4
-endif   # gcc == 3.x
-
+    # prevent gcc 3.x warnings about #pragma ident on SunOS
+    ifeq ($(CXX_MAJOR),3)
+        ifeq ($(shell expr $(CXX_MINOR) \< 4),1)
+            WARNFLAGS += -Wno-unknown-pragmas
+        endif   # gcc < 3.4
+    endif   # gcc == 3.x
 endif   # !SunOS
 
 # do not enable -Wunreachable-code: it's useless the way implemented
@@ -47,12 +47,14 @@
 # endif   # gcc > 3.3
 
 
-DEPENDFLAGS     = -M
+DEPENDFLAGS = -M
 
 # avoid adding -FPIC on IBM AIX and Cygwin where
 # gcc generated code is always position independent
-ifeq (,$(findstring |$(OSNAME)|,|AIX|CYGWIN|))
-    PICFLAGS = -fPIC
+ifeq (,$(findstring AIX,$(OSNAME)))
+    ifeq (,$(findstring CYGWIN,$(OSNAME)))
+        PICFLAGS = -fPIC
+    endif
 endif
 
 ifeq ($(OSNAME),SunOS)
@@ -62,44 +64,53 @@
 endif
 
 ifneq ($(MAPFLAGS),)
-  # path to mapfile (relative to $(TOPDIR)) for symbol versioning
-  ifneq ($(CXX_MAJOR),2)
-    MAPFILE = src/mapfile.$(CXX)
-  else
-    # gcc 2.x implements a different ABI than gcc 3
-    MAPFILE = src/mapfile.$(CXX)-$(CXX_MAJOR)
-  endif
+    # path to mapfile (relative to $(TOPDIR)) for symbol versioning
+    ifneq ($(CXX_MAJOR),2)
+        MAPFILE = src/mapfile.$(CXX)
+    else
+        # gcc 2.x implements a different ABI than gcc 3
+        MAPFILE = src/mapfile.$(CXX)-$(CXX_MAJOR)
+    endif
 endif
 
 ifneq ($(OSNAME),Darwin)
-  # no -shared option for GCC on Mac OS X (Darwin)
-  LDSOFLAGS = -shared
+    # no -shared option for GCC on Mac OS X (Darwin)
+    LDSOFLAGS = -shared
 else
-  # -dynamiclib is needed when linking the library
-  LDSOFLAGS = -dynamiclib
+    # -dynamiclib is needed when linking the library
+    LDSOFLAGS = -dynamiclib
 endif
 
 
 # -fPIC needed both to compile and link shared libs on HP-UX 11
 ifeq ($(OSNAME),HP-UX)
-LDSOFLAGS      += -fPIC
+    LDSOFLAGS += -fPIC
 endif
 
-CXXFLAGS        = -pedantic -nostdinc++
+ifeq ($(CXX_MAJOR),3)
+    ifeq ($(shell [ $(CXX_MINOR) -lt 4 ] && echo 1),1)
+        # for gcc 3 prior to gcc 3.4 force linking with libgcc_s.so
+        # and avoid linking with libgcc_s.a to get stack unwinding
+        # due to exceptions right (see STDCXX-369)
+        LDSOFLAGS += -shared-libgcc
+    endif
+endif
+
+CXXFLAGS = -pedantic -nostdinc++
 
 ifeq ($(CXX_MAJOR),2)
-ifeq ($(shell expr $(CXX_MINOR) / 10),9)
-CXXFLAGS       += -fhonor-std -ftemplate-depth-32
-else
-CXXFLAGS       += -ftemplate-depth-32
-endif
+    ifeq ($(shell expr $(CXX_MINOR) / 10),9)
+        CXXFLAGS += -fhonor-std -ftemplate-depth-32
+    else
+        CXXFLAGS += -ftemplate-depth-32
+    endif
 endif
 
 ifeq ($(OSNAME),IRIX64)
     ifeq ($(CXX_MAJOR),2)
-      # prevent (some) assembler errors caused by overly long symbol names
-      # (the option is not supported in gcc 3 and beyond)
-      CXXFLAGS += -fsquangle
+        # prevent (some) assembler errors caused by overly long symbol
+        # names (the option is not supported in gcc 3 and beyond)
+        CXXFLAGS += -fsquangle
     endif
 
     # disable ld warnings about libs not used to resolve any symbols
@@ -108,59 +119,59 @@
 
 # prevent (some) assemler errors caused by overly long symbol names
 ifeq ($(OSNAME),OSF1)
-CXXFLAGS       += -fsquangle
+    CXXFLAGS += -fsquangle
 endif
 
-CXXPRELINK      = 
+CXXPRELINK =
 
 # enable C++ C library headers (the <cname> kind)
-CPPFLAGS        = -I$(TOPDIR)/include/ansi
+CPPFLAGS = -I$(TOPDIR)/include/ansi
 
 # decrease warning level to prevent annoying linker warnings
 # about duplicate symbols (the linker has no concept of weak symbols)
 ifeq ($(OSNAME),AIX)
-  LDFLAGS = -Wl,-bh:5
+    LDFLAGS = -Wl,-bh:5
 endif
 
 ifneq ($(CXX_MAJOR),2)
-  # gcc 3.x needs to explicitly link with libsupc++ for language support
-  # g++ 3.x links with it as well as libstdc++ automatically
-  LDLIBS = -lsupc++
+    # gcc 3.x needs to explicitly link with libsupc++ for language support
+    # g++ 3.x links with it as well as libstdc++ automatically
+    LDLIBS = -lsupc++
 
-  ifeq ($(OSNAME),Darwin)
-    # link with gcc_eh to resolve the _Unwind_xxx functions
-    # (shouldn't we link with it on all platforms?)
-    LDLIBS += -lgcc_eh
-  endif
+    ifeq ($(OSNAME),Darwin)
+        # link with gcc_eh to resolve the _Unwind_xxx functions
+        # (shouldn't we link with it on all platforms?)
+        LDLIBS += -lgcc_eh
+    endif
 endif   # gcc > 2
 
 # The flag(s) to use to embed a library search path into generated executables.
 ifeq ($(OSNAME),Linux)
-  RPATH = -Wl,-R
-else
-  ifeq ($(OSNAME),SunOS)
     RPATH = -Wl,-R
-  else
-    ifeq ($(OSNAME),AIX)
-      ifeq ($(shell [ $(OS_MAJOR) -gt 5 -o $(OS_MAJOR) -eq 5 -a $(OS_MINOR) \
--ge 3 ] && echo 1), 1)
-        # -bsrv4, -R only available on AIX 5.3 and newer
-        RPATH = -Wl,-bsvr4,-R
-      endif
+else
+    ifeq ($(OSNAME),SunOS)
+        RPATH = -Wl,-R
     else
-      ifeq ($(OSNAME),HP-UX)
-        RPATH = -Wl,+b
-      else
-        ifeq ($(OSNAME),IRIX64)
-          RPATH = -Wl,-rpath,
+        ifeq ($(OSNAME),AIX)
+            ifeq ($(shell [    $(OS_MAJOR) -gt 5 -o $(OS_MAJOR) -eq 5 \
+                            -a $(OS_MINOR) -ge 3 ] && echo 1), 1)
+                # -bsrv4, -R only available on AIX 5.3 and newer
+                RPATH = -Wl,-bsvr4,-R
+            endif
         else
-          ifeq ($(OSNAME),OSF1)
-            RPATH = -Wl,-rpath,
-          endif
+            ifeq ($(OSNAME),HP-UX)
+                RPATH = -Wl,+b
+             else
+                 ifeq ($(OSNAME),IRIX64)
+                     RPATH = -Wl,-rpath,
+                 else
+                    ifeq ($(OSNAME),OSF1)
+                        RPATH = -Wl,-rpath,
+                    endif
+                 endif
+             endif
         endif
-      endif
     endif
-  endif
 endif
 
 # debug/optimization options
@@ -176,19 +187,19 @@
 SHARED_LDFLAGS =
 
 ifeq ($(OSNAME),AIX)
-  SHARED_SUFFIX   = .a
+    SHARED_SUFFIX = .a
 endif
 
 ifeq ($(OSNAME),HP-UX)
-  SHARED_SUFFIX   = .sl
+    SHARED_SUFFIX = .sl
 endif
 
 ifeq ($(OSNAME),Darwin)
-  SHARED_SUFFIX = .dylib
+    SHARED_SUFFIX = .dylib
 endif 
 
 ifneq ($(findstring CYGWIN,$(OSNAME)),)
-  SHARED_SUFFIX = .dll
+    SHARED_SUFFIX = .dll
 endif
 
 STATIC_CXXFLAGS =
@@ -201,32 +212,32 @@
 # the same option is named -pthreads on Solaris
 
 ifeq ($(findstring CYGWIN,$(OSNAME)),)
-  ifeq ($(OSNAME),SunOS)
-    MULTI_CPPFLAGS_POSIX = -pthreads
-    MULTI_LDFLAGS_POSIX  = -pthreads
-  else
-    ifeq ($(OSNAME),IRIX64)
-      # no -pthreads option (or similar) on IRIX?
-      MULTI_CPPFLAGS_POSIX = -D_REENTRANT
-      MULTI_LDFLAGS_POSIX   = -lpthread
+    ifeq ($(OSNAME),SunOS)
+        MULTI_CPPFLAGS_POSIX = -pthreads
+        MULTI_LDFLAGS_POSIX  = -pthreads
     else
-      # option doesn't exist in Darwin gcc
-      ifneq ($(OSNAME),Darwin)
-        MULTI_CPPFLAGS_POSIX = -pthread
-        MULTI_LDFLAGS_POSIX  = -pthread
-      endif
+        ifeq ($(OSNAME),IRIX64)
+            # no -pthreads option (or similar) on IRIX?
+            MULTI_CPPFLAGS_POSIX = -D_REENTRANT
+            MULTI_LDFLAGS_POSIX   = -lpthread
+        else
+            # option doesn't exist in Darwin gcc
+            ifneq ($(OSNAME),Darwin)
+                MULTI_CPPFLAGS_POSIX = -pthread
+                MULTI_LDFLAGS_POSIX  = -pthread
+            endif
+        endif
     endif
-  endif
 else
-  # on Cygwin use MingW-threads by default
-  MULTI_CPPFLAGS_POSIX = -mthreads
-  MULTI_LDFLAGS_POSIX  = -mthreads
+    # on Cygwin use MingW-threads by default
+    MULTI_CPPFLAGS_POSIX = -mthreads
+    MULTI_LDFLAGS_POSIX  = -mthreads
 
-  # link with libcatgets and libiconv
-  LDLIBS += -lcatgets -liconv
+    # link with libcatgets and libiconv
+    LDLIBS += -lcatgets -liconv
 
-  # set the assembler file suffix to .s
-  AS_EXT = .s
+    # set the assembler file suffix to .s
+    AS_EXT = .s
 endif
 
 MULTI_CPPFLAGS_SOLARIS = -threads
@@ -248,39 +259,39 @@
 arch=$(shell uname -p 2>/dev/null)
 
 ifeq ($(arch),ia64)
-  # LP64 is the default (implicit) setting on IA64
-  ifeq ($(OSNAME),HP-UX)
-    # -milp32, -mlp64, etc. are options specific to HP-UX
-    CXXFLAGS.narrow  = -milp32
-    LDFLAGS.narrow   = -milp32
-    LDSOFLAGS.narrow = -milp32
-    ARFLAGS.narrow   =
-  endif
+    # LP64 is the default (implicit) setting on IA64
+    ifeq ($(OSNAME),HP-UX)
+        # -milp32, -mlp64, etc. are options specific to HP-UX
+        CXXFLAGS.narrow  = -milp32
+        LDFLAGS.narrow   = -milp32
+        LDSOFLAGS.narrow = -milp32
+        ARFLAGS.narrow   =
+    endif
 else
-  # determine whether the default compiler invocation produces
-  # wide (64-bit) or narrow (32-bit) code and set compiler,
-  # linker, and other flags accordingly
-  wide = $(shell tmpfile=/tmp/longsize-$$; export tmpfile;           \
-                 echo "int main() { return 8 == sizeof (long); }"    \
-                      > $$tmpfile.c                                  \
-                 && $(CXX) $$tmpfile.c >/dev/null 2>&1 -o $$tmpfile; \
-                 $$tmpfile; echo $$?; rm -f $$tmpfile.c $$tmpfile)
+    # determine whether the default compiler invocation produces
+    # wide (64-bit) or narrow (32-bit) code and set compiler,
+    # linker, and other flags accordingly
+    wide = $(shell tmpfile=/tmp/longsize-$$; export tmpfile;           \
+                   echo "int main() { return 8 == sizeof (long); }"    \
+                        > $$tmpfile.c                                  \
+                   && $(CXX) $$tmpfile.c >/dev/null 2>&1 -o $$tmpfile; \
+                   $$tmpfile; echo $$?; rm -f $$tmpfile.c $$tmpfile)
 
-  ifeq ($(wide),0)
-      # wide (64-bit) flags
-      CXXFLAGS.wide  = -m64
-      LDFLAGS.wide   = -m64
-      LDSOFLAGS.wide = -m64
-      ARFLAGS.wide   =
+    ifeq ($(wide),0)
+        # wide (64-bit) flags
+        CXXFLAGS.wide  = -m64
+        LDFLAGS.wide   = -m64
+        LDSOFLAGS.wide = -m64
+        ARFLAGS.wide   =
 
-      # narrow (32-bit) mode is implicit
-  else
-      # narrow (32-bit) flags
-      CXXFLAGS.narrow  = -m32
-      LDFLAGS.narrow   = -m32
-      LDSOFLAGS.narrow = -m32
-      ARFLAGS.narrow   =
+        # narrow (32-bit) mode is implicit
+    else
+        # narrow (32-bit) flags
+        CXXFLAGS.narrow  = -m32
+        LDFLAGS.narrow   = -m32
+        LDSOFLAGS.narrow = -m32
+        ARFLAGS.narrow   =
 
-      # wide (64-bit) mode is implicit
-  endif
+        # wide (64-bit) mode is implicit
+    endif
 endif
diff --git a/etc/config/makefile.rules b/etc/config/makefile.rules
index b1fb4e0..1c41896 100644
--- a/etc/config/makefile.rules
+++ b/etc/config/makefile.rules
@@ -105,17 +105,43 @@
 # a report (set to ALL to run all executables)
 # hung or runaway processes are killed after a customizable timeout period
 #
+# to avoid filling up disk space with junk files left behind by bad programs
+# creates and sets TMP to a temporary directory before running the programs
+# which is then removed when done
+#
 # PlumHall specific:
 # for all "top level" tests that failed to build, find and build all
 # subtests (the little tests the main test consists of)
+ifneq ($(LIBSUFFIX),.dll)
+
 run runall run_all: $(BINDIR)/exec
 	@(LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(LIBDIR);                    \
         PATH=$$PATH:.;                                                    \
         TOPDIR=$(TOPDIR);                                                 \
-        export LD_LIBRARY_PATH PATH TOPDIR;                               \
+        TMP=$${TMP:-/tmp}/stdcxx-run-$$$$;                                \
+        export TMP;                                                       \
+        export LD_LIBRARY_PATH PATH TMP TOPDIR;                           \
+        trap "rm -rf $$TMP" HUP INT QUIT TERM EXIT;                       \
+        mkdir -p $$TMP;                                                   \
         ./run $(RUNFLAGS) $(RUNTARGET);                                   \
         exit 0)
 
+else
+# on Cygwin add $(LIBDIR) to PATH
+run runall run_all: $(BINDIR)/exec
+	@(LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(LIBDIR);                    \
+        PATH=$$PATH:$(LIBDIR):.;                                          \
+        TOPDIR=$(TOPDIR);                                                 \
+        TMP=$${TMP:-/tmp}/stdcxx-run-$$$$;                                \
+        export TMP;                                                       \
+        export LD_LIBRARY_PATH PATH TMP TOPDIR;                           \
+        trap "rm -rf $$TMP" HUP INT QUIT TERM EXIT;                       \
+        mkdir -p $$TMP;                                                   \
+        ./run $(RUNFLAGS) $(RUNTARGET);                                   \
+        exit 0)
+
+endif
+
 # include the automatically generated dependencies unless "clean"
 # or similar is one of the targets
 ifeq ($(findstring clean,$(MAKECMDGOALS)),)
diff --git a/etc/config/run_locale_utils.sh b/etc/config/run_locale_utils.sh
index e6b3504..562a348 100755
--- a/etc/config/run_locale_utils.sh
+++ b/etc/config/run_locale_utils.sh
@@ -47,12 +47,21 @@
 ##############################################################################
 
 
-if [ "`uname`" = "OSF1" -a "$BIN_SH" != "xpg4" ]; then
+OSNAME=`uname`
+
+if [ "$OSNAME" = "OSF1" -a "$BIN_SH" != "xpg4" ]; then
     # make getopts work on Tru64 by setting the BIN_SH variable
     # and re-executing self with the same command line arguments
     BIN_SH=xpg4
     export BIN_SH
     exec $0 $*
+elif [ "$OSNAME" = "AIX" -a -z "$BASH_VERSION" ]; then
+    # use an alternate shell to work around a bug (?) in the AIX system
+    # shell that prevents it from trapping SIGHUP (and invoking the signal
+    # handler)
+    if [ -x /bin/bash ]; then
+        exec /bin/bash $0 $*
+    fi
 fi
 
 
@@ -374,6 +383,13 @@
     dump_charmap $stage_1/$fname $stage_1/charmaps/$charmap
     dump_locale $stage_1/$fname $stage_1/$source.src
 
+    if [ -z "$no_clean" ]; then
+        # remove stage 1 locale to free up disk space but keep
+        # the text dumps for later processing
+        debug_output "rm $stage_1/$fname"
+        rm $stage_1/$fname
+    fi
+
     # create a directory for stage 2 charmap source files
     debug_output "mkdir -p $stage_2/charmaps"
     mkdir -p $stage_2/charmaps
@@ -404,6 +420,13 @@
     dump_charmap $stage_2/$fname $stage_2/charmaps/$charmap
     dump_locale $stage_2/$fname $stage_2/$source.src
 
+    if [ -z "$no_clean" ]; then
+        # remove stage 2 locale to free up disk space but keep
+        # the text dumps for later processing
+        debug_output "rm $stage_2/$fname"
+        rm $stage_2/$fname
+    fi
+
     assertions=`expr $assertions + 1`
 
     # create a directory for stage 2 charmap source files
@@ -434,6 +457,13 @@
     dump_charmap $stage_3/$fname $stage_3/charmaps/$charmap
     dump_locale $stage_3/$fname $stage_3/$source.src
 
+    if [ -z "$no_clean" ]; then
+        # remove stage 3 locale to free up disk space but keep
+        # the text dumps for later processing
+        debug_output "rm $stage_3/$fname"
+        rm $stage_3/$fname
+     fi
+
     assertions=`expr $assertions + 1`
 
     # verify that stage 1 and stage 2 charmaps are the same
@@ -466,10 +496,10 @@
         failedassertions=`expr $failedassertions + 1`
     fi
 
-    if [ "$no_clean" = "" ]; then
+    if [ -z "$no_clean" ]; then
         # clean up
         debug_output "rm -rf $stage_1 $stage_2 $stage_3"
-        rm -rf rm -rf $stage_1 $stage_2 $stage_3
+        rm -rf $stage_1 $stage_2 $stage_3
     fi
 }
 
@@ -478,17 +508,20 @@
 #
 cleanup ()
 {
-    if [ "$no_clean" = "" ]; then
+    if [ -z "$no_clean" ]; then
         # clean up
         debug_output "rm -rf $tmpdir"
         rm -rf $tmpdir
     fi
+
+    exit
 }
 
 ##############################################################################
 #  Main code
 ##############################################################################
 
+
 ## assertions
 assertions=0
 failedassertions=0
@@ -503,10 +536,6 @@
 nlsdir=""
 locdir=""
 
-## Temporary (working) directory
-[ -z "$TMP" ] && TMP="/tmp";
-tmpdir=$TMP/locale.$$
-
 ## Get the options from the command line
 while getopts ":nsfdb:i:l:O:L:M:C:D:" opt_name; do
     case $opt_name in 
@@ -527,6 +556,14 @@
      esac;
 done
 
+## set temporary (working) directory
+if [ -z "$TMP" ]; then
+    TMP="/tmp";
+    export TMP;
+fi
+
+tmpdir=$TMP/${locale_db:-unnamed-locale}.$$
+
 ## Actual test
 if [ "$chk_sanity" = "yes" ]; then
 
diff --git a/etc/config/src/GLOBAL_BAD_ALLOC.cpp b/etc/config/src/GLOBAL_BAD_ALLOC.cpp
index ebd6c0c..b4e8270 100644
--- a/etc/config/src/GLOBAL_BAD_ALLOC.cpp
+++ b/etc/config/src/GLOBAL_BAD_ALLOC.cpp
@@ -2,10 +2,17 @@
 
 #include "config.h"
 
+#if !defined (_RWSTD_NO_NEW_THROWS) && !defined (_RWSTD_NO_NEW_OFLOW_SAFE)
+#  include <stddef.h>   // for size_t
+#endif   // !_RWSTD_NO_NEW_THROWS && !_RWSTD_NO_NEW_OFLOW_SAFE
+
 #ifndef _RWSTD_NO_SETRLIMIT
-#  include <sys/resource.h>   // for setrlimit()
+// test for setrlimit() presence before compiling current file
 #endif
 
+// proclimits.h must be included only after #if[n]def _RWSTD_NO_SETRLIMIT
+#include "proclimits.h"
+
 #ifndef _RWSTD_NO_HONOR_STD
 #  ifdef _RWSTD_NO_STD_TERMINATE
 
@@ -63,19 +70,14 @@
 #ifndef _RWSTD_NO_NEW_THROWS
 #  ifndef _RWSTD_NO_NEW_OFLOW_SAFE
 
-        void *p = ::operator new ((unsigned long)-1);
+        void *p = ::operator new (size_t (-1));
 
         if (!p)
             return 1;
 
 #  else   // if defined (_RWSTD_NO_NEW_OFLOW_SAFE)
 
-#ifndef _RWSTD_NO_SETRLIMIT
-
-        struct rlimit rl = { 0, 0 };
-        setrlimit (RLIMIT_DATA, &rl);
-
-#endif   // _RWSTD_NO_SETRLIMIT
+        limit_memory (0);
 
         for (unsigned long n = 1UL << (sizeof (long) * 8 - 1);
              0 != n; n |= (n >> 1)) {
diff --git a/etc/config/src/LOCALE_NAME_FMAT.cpp b/etc/config/src/LOCALE_NAME_FMAT.cpp
index 44a22e0..e8993f1 100644
--- a/etc/config/src/LOCALE_NAME_FMAT.cpp
+++ b/etc/config/src/LOCALE_NAME_FMAT.cpp
@@ -19,6 +19,9 @@
 #undef strcat
 
 
+#include "locale_names.h"   // for test_locale_names
+
+
 // the longest combined locale name handled by the test (GNU glibc
 // can generate some awfully long names since in addition to the
 // name of the locale name for each category it includes the name
@@ -683,785 +686,3 @@
 
     return 0;
 }
-
-/*********************************************************************/
-
-const char* const test_locale_names[] = {
-    "ar", "ar_EG.UTF-8", "bg_BG", "bg_BG.ISO8859-5", "ca", "ca_ES",
-
-
-    "C.iso88591",
-    "C.iso885915",
-    "C.utf8",
-    "DE_AT",
-    "DE_AT.UTF-8",
-    "DE_AT.UTF-8@euro",
-    "DE_AT@euro",
-    "DE_CH",
-    "DE_CH.UTF-8",
-    "DE_DE",
-    "DE_DE.UTF-8",
-    "DE_DE.UTF-8@euro",
-    "DE_DE@euro",
-    "DE_LU",
-    "DE_LU.UTF-8",
-    "DE_LU.UTF-8@euro",
-    "DE_LU@euro",
-    "De_CH",
-    "De_CH.IBM-850",
-    "De_DE",
-    "De_DE.IBM-850",
-    "FR_BE",
-    "FR_BE.UTF-8",
-    "FR_BE.UTF-8@euro",
-    "FR_BE@euro",
-    "FR_CA",
-    "FR_CA.UTF-8",
-    "FR_CH",
-    "FR_CH.UTF-8",
-    "FR_FR",
-    "FR_FR.UTF-8",
-    "FR_FR.UTF-8@euro",
-    "FR_FR@euro",
-    "FR_LU",
-    "FR_LU.UTF-8",
-    "FR_LU.UTF-8@euro",
-    "FR_LU@euro",
-    "Fr_BE",
-    "Fr_BE.IBM-850",
-    "Fr_CA",
-    "Fr_CA.IBM-850",
-    "Fr_CH",
-    "Fr_CH.IBM-850",
-    "Fr_FR",
-    "Fr_FR.IBM-850",
-    "JA_JP",
-    "JA_JP.UTF-8",
-    "Ja_JP",
-    "Ja_JP.IBM-932",
-    "Ja_JP.IBM-943",
-    "af_ZA",
-    "ar",
-    "ar_AE",
-    "ar_AE.utf8",
-    "ar_BH",
-    "ar_BH.utf8",
-    "ar_DZ",
-    "ar_DZ.arabic8",
-    "ar_DZ.utf8",
-    "ar_EG",
-    "ar_EG.UTF-8",
-    "ar_EG.utf8",
-    "ar_IN",
-    "ar_IQ",
-    "ar_IQ.utf8",
-    "ar_JO",
-    "ar_JO.utf8",
-    "ar_KW",
-    "ar_KW.utf8",
-    "ar_LB",
-    "ar_LB.utf8",
-    "ar_LY",
-    "ar_LY.utf8",
-    "ar_MA",
-    "ar_MA.utf8",
-    "ar_OM",
-    "ar_OM.utf8",
-    "ar_QA",
-    "ar_QA.utf8",
-    "ar_SA",
-    "ar_SA.arabic8",
-    "ar_SA.iso88596",
-    "ar_SA.utf8",
-    "ar_SD",
-    "ar_SD.utf8",
-    "ar_SY",
-    "ar_SY.utf8",
-    "ar_TN",
-    "ar_TN.utf8",
-    "ar_YE",
-    "ar_YE.utf8",
-    "be_BY",
-    "be_BY.utf8",
-    "bg_BG",
-    "bg_BG.ISO8859-5",
-    "bg_BG.iso88595",
-    "bg_BG.utf8",
-    "bokmal",
-    "bokmål",
-    "br",
-    "br_FR",
-    "bs_BA",
-    "ca",
-    "ca_ES",
-    "ca_ES.ISO8859-1",
-    "ca_ES.ISO8859-15",
-    "ca_ES.ISO8859-15@euro",
-    "ca_ES.utf8",
-    "ca_ES.utf8@euro",
-    "ca_ES@euro",
-    "catalan",
-    "chinese",
-    "common",
-    "croatian",
-    "cs",
-    "cs.po",
-    "cs_CZ",
-    "cs_CZ.ISO8859-2",
-    "cs_CZ.iso88592",
-    "cs_CZ.utf8",
-    "cy_GB",
-    "cz",
-    "czech",
-    "da",
-    "da.ISO8859-15",
-    "da.po",
-    "da_DK",
-    "da_DK.ISO8859-1",
-    "da_DK.ISO8859-15",
-    "da_DK.ISO8859-15@euro",
-    "da_DK.UTF-8",
-    "da_DK.iso88591",
-    "da_DK.iso885915@euro",
-    "da_DK.roman8",
-    "da_DK.utf8",
-    "danish",
-    "dansk",
-    "de",
-    "de.ISO8859-15",
-    "de.UTF-8",
-    "de.po",
-    "de_AT",
-    "de_AT.8859-15",
-    "de_AT.8859-15@euro",
-    "de_AT.ISO8859-1",
-    "de_AT.ISO8859-15",
-    "de_AT.ISO8859-15@euro",
-    "de_AT.utf8",
-    "de_AT.utf8@euro",
-    "de_AT@euro",
-    "de_BE",
-    "de_BE.utf8",
-    "de_BE.utf8@euro",
-    "de_BE@euro",
-    "de_CH",
-    "de_CH.8859-15",
-    "de_CH.ISO8859-1",
-    "de_CH.ISO8859-15",
-    "de_CH.utf8",
-    "de_DE",
-    "de_DE.8859-15",
-    "de_DE.8859-15@euro",
-    "de_DE.IBM-1252",
-    "de_DE.IBM-1252@euro",
-    "de_DE.ISO8859-1",
-    "de_DE.ISO8859-15",
-    "de_DE.ISO8859-15@euro",
-    "de_DE.UTF-8",
-    "de_DE.UTF-8@euro",
-    "de_DE.iso88591",
-    "de_DE.iso885915@euro",
-    "de_DE.roman8",
-    "de_DE.utf8",
-    "de_DE.utf8@euro",
-    "de_DE@euro",
-    "de_LU",
-    "de_LU.8859-15",
-    "de_LU.8859-15@euro",
-    "de_LU.utf8",
-    "de_LU.utf8@euro",
-    "de_LU@euro",
-    "deutsch",
-    "dk",
-    "dutch",
-    "eesti",
-    "el",
-    "el.sun_eu_greek",
-    "el_GR",
-    "el_GR.ISO8859-7",
-    "el_GR.ISO8859-7@euro",
-    "el_GR.greek8",
-    "el_GR.iso88597",
-    "el_GR.utf8",
-    "en",
-    "en_AU",
-    "en_AU.ISO8859-1",
-    "en_AU.ISO8859-15",
-    "en_AU.utf8",
-    "en_BW",
-    "en_BW.utf8",
-    "en_CA",
-    "en_CA.ISO8859-1",
-    "en_CA.ISO8859-15",
-    "en_CA.utf8",
-    "en_DK",
-    "en_DK.utf8",
-    "en_EU.UTF-8@euro",
-    "en_GB",
-    "en_GB.ISO8859-1",
-    "en_GB.ISO8859-15",
-    "en_GB.ISO8859-15@euro",
-    "en_GB.UTF-8",
-    "en_GB.iso88591",
-    "en_GB.iso885915@euro",
-    "en_GB.roman8",
-    "en_GB.utf8",
-    "en_HK",
-    "en_HK.utf8",
-    "en_IE",
-    "en_IE.ISO8859-1",
-    "en_IE.ISO8859-15",
-    "en_IE.ISO8859-15@euro",
-    "en_IE.utf8",
-    "en_IE.utf8@euro",
-    "en_IE@euro",
-    "en_IN",
-    "en_NZ",
-    "en_NZ.ISO8859-1",
-    "en_NZ.utf8",
-    "en_PH",
-    "en_PH.utf8",
-    "en_RN",
-    "en_SG",
-    "en_SG.utf8",
-    "en_UK",
-    "en_US",
-    "en_US.8859-15",
-    "en_US.ISO8859-1",
-    "en_US.ISO8859-15",
-    "en_US.ISO8859-15@euro",
-    "en_US.UTF-8",
-    "en_US.UTF-8@euro",
-    "en_US.cp850",
-    "en_US.iso88591",
-    "en_US.roman8",
-    "en_US.utf8",
-    "en_ZA",
-    "en_ZA.utf8",
-    "en_ZW",
-    "en_ZW.utf8",
-    "eo",
-    "es",
-    "es.ISO8859-15",
-    "es.UTF-8",
-    "es.po",
-    "es_AR",
-    "es_AR.ISO8859-1",
-    "es_AR.ISO8859-15",
-    "es_AR.utf8",
-    "es_BO",
-    "es_BO.ISO8859-1",
-    "es_BO.utf8",
-    "es_CL",
-    "es_CL.ISO8859-1",
-    "es_CL.utf8",
-    "es_CO",
-    "es_CO.ISO8859-1",
-    "es_CO.utf8",
-    "es_CR",
-    "es_CR.ISO8859-1",
-    "es_CR.utf8",
-    "es_DO",
-    "es_DO.utf8",
-    "es_EC",
-    "es_EC.ISO8859-1",
-    "es_EC.utf8",
-    "es_ES",
-    "es_ES.ISO8859-1",
-    "es_ES.ISO8859-15",
-    "es_ES.ISO8859-15@euro",
-    "es_ES.UTF-8",
-    "es_ES.UTF-8@euro",
-    "es_ES.iso88591",
-    "es_ES.iso885915@euro",
-    "es_ES.roman8",
-    "es_ES.utf8",
-    "es_ES.utf8@euro",
-    "es_ES@euro",
-    "es_GT",
-    "es_GT.ISO8859-1",
-    "es_GT.utf8",
-    "es_HN",
-    "es_HN.utf8",
-    "es_MX",
-    "es_MX.ISO8859-1",
-    "es_MX.ISO8859-15",
-    "es_MX.utf8",
-    "es_NI",
-    "es_NI.ISO8859-1",
-    "es_NI.utf8",
-    "es_PA",
-    "es_PA.ISO8859-1",
-    "es_PA.utf8",
-    "es_PE",
-    "es_PE.ISO8859-1",
-    "es_PE.utf8",
-    "es_PR",
-    "es_PR.utf8",
-    "es_PY",
-    "es_PY.ISO8859-1",
-    "es_PY.utf8",
-    "es_SV",
-    "es_SV.ISO8859-1",
-    "es_SV.utf8",
-    "es_US",
-    "es_US.utf8",
-    "es_UY",
-    "es_UY.ISO8859-1",
-    "es_UY.utf8",
-    "es_VE",
-    "es_VE.ISO8859-1",
-    "es_VE.utf8",
-    "estonian",
-    "et",
-    "et_EE",
-    "et_EE.ISO8859-15",
-    "et_EE.utf8",
-    "eu_ES",
-    "eu_ES.utf8",
-    "eu_ES.utf8@euro",
-    "eu_ES@euro",
-    "fa_IR",
-    "fi",
-    "fi.ISO8859-15",
-    "fi.po",
-    "fi_FI",
-    "fi_FI.ISO8859-1",
-    "fi_FI.ISO8859-15",
-    "fi_FI.ISO8859-15@euro",
-    "fi_FI.UTF-8",
-    "fi_FI.iso88591",
-    "fi_FI.iso885915@euro",
-    "fi_FI.roman8",
-    "fi_FI.utf8",
-    "fi_FI.utf8@euro",
-    "fi_FI@euro",
-    "finnish",
-    "fo_FO",
-    "fo_FO.utf8",
-    "fr",
-    "fr.ISO8859-15",
-    "fr.UTF-8",
-    "fr.po",
-    "fr_BE",
-    "fr_BE.8859-15",
-    "fr_BE.8859-15@euro",
-    "fr_BE.IBM-1252",
-    "fr_BE.IBM-1252@euro",
-    "fr_BE.ISO8859-1",
-    "fr_BE.ISO8859-15",
-    "fr_BE.ISO8859-15@euro",
-    "fr_BE.UTF-8",
-    "fr_BE.UTF-8@euro",
-    "fr_BE.utf8",
-    "fr_BE.utf8@euro",
-    "fr_BE@euro",
-    "fr_CA",
-    "fr_CA.8859-15",
-    "fr_CA.ISO8859-1",
-    "fr_CA.ISO8859-15",
-    "fr_CA.iso88591",
-    "fr_CA.iso885915",
-    "fr_CA.roman8",
-    "fr_CA.utf8",
-    "fr_CH",
-    "fr_CH.8859-15",
-    "fr_CH.ISO8859-1",
-    "fr_CH.ISO8859-15",
-    "fr_CH.utf8",
-    "fr_FR",
-    "fr_FR.8859-15",
-    "fr_FR.8859-15@euro",
-    "fr_FR.IBM-1252",
-    "fr_FR.IBM-1252@euro",
-    "fr_FR.ISO8859-1",
-    "fr_FR.ISO8859-15",
-    "fr_FR.ISO8859-15@euro",
-    "fr_FR.UTF-8",
-    "fr_FR.UTF-8@euro",
-    "fr_FR.iso88591",
-    "fr_FR.iso885915@euro",
-    "fr_FR.roman8",
-    "fr_FR.utf8",
-    "fr_FR.utf8@euro",
-    "fr_FR@euro",
-    "fr_LU",
-    "fr_LU.8859-15",
-    "fr_LU.8859-15@euro",
-    "fr_LU.utf8",
-    "fr_LU.utf8@euro",
-    "fr_LU@euro",
-    "french",
-    "ga",
-    "ga_IE",
-    "ga_IE.utf8",
-    "ga_IE.utf8@euro",
-    "ga_IE@euro",
-    "galego",
-    "galician",
-    "german",
-    "gl",
-    "gl_ES",
-    "gl_ES.utf8",
-    "gl_ES.utf8@euro",
-    "gl_ES@euro",
-    "greek",
-    "gv_GB",
-    "gv_GB.utf8",
-    "he",
-    "he_IL",
-    "he_IL.UTF-8",
-    "he_IL.utf8",
-    "hebrew",
-    "hi_IN",
-    "hi_IN.UTF-8",
-    "hr",
-    "hr_HR",
-    "hr_HR.ISO8859-2",
-    "hr_HR.iso88592",
-    "hr_HR.utf8",
-    "hrvatski",
-    "hu",
-    "hu_HU",
-    "hu_HU.ISO8859-2",
-    "hu_HU.iso88592",
-    "hu_HU.utf8",
-    "hungarian",
-    "icelandic",
-    "id_ID",
-    "id_ID.utf8",
-    "in",
-    "in_ID",
-    "is",
-    "is.po",
-    "is_IS",
-    "is_IS.ISO8859-1",
-    "is_IS.ISO8859-15",
-    "is_IS.iso88591",
-    "is_IS.iso885915@euro",
-    "is_IS.roman8",
-    "is_IS.utf8",
-    "iso_8859_1",
-    "iso_8859_13",
-    "iso_8859_15",
-    "iso_8859_2",
-    "iso_8859_5",
-    "iso_8859_7",
-    "iso_8859_9",
-    "it",
-    "it.ISO8859-15",
-    "it.UTF-8",
-    "it_CH",
-    "it_CH.ISO8859-15",
-    "it_CH.utf8",
-    "it_IT",
-    "it_IT.ISO8859-1",
-    "it_IT.ISO8859-15",
-    "it_IT.ISO8859-15@euro",
-    "it_IT.UTF-8",
-    "it_IT.UTF-8@euro",
-    "it_IT.iso88591",
-    "it_IT.iso885915@euro",
-    "it_IT.roman8",
-    "it_IT.utf8",
-    "it_IT.utf8@euro",
-    "it_IT@euro",
-    "italian",
-    "iw_IL",
-    "iw_IL.hebrew8",
-    "iw_IL.iso88598",
-    "iw_IL.utf8",
-    "ja",
-    "ja_JP",
-    "ja_JP.EUC",
-    "ja_JP.IBM-eucJP",
-    "ja_JP.PCK",
-    "ja_JP.SJIS",
-    "ja_JP.SJIS@ucs4",
-    "ja_JP.UTF-8",
-    "ja_JP.deckanji",
-    "ja_JP.deckanji@ucs4",
-    "ja_JP.eucJP",
-    "ja_JP.eucjp",
-    "ja_JP.kana8",
-    "ja_JP.sdeckanji",
-    "ja_JP.ujis",
-    "ja_JP.utf8",
-    "japanese",
-    "japanese.euc",
-    "japanese.sjis",
-    "ka_GE",
-    "kl_GL",
-    "kl_GL.utf8",
-    "ko",
-    "ko.UTF-8",
-    "ko_KR",
-    "ko_KR.EUC",
-    "ko_KR.EUC@dict",
-    "ko_KR.UTF-8",
-    "ko_KR.UTF-8@dict",
-    "ko_KR.eucKR",
-    "ko_KR.euckr",
-    "ko_KR.utf8",
-    "korean",
-    "korean.euc",
-    "kw_GB",
-    "kw_GB.utf8",
-    "lithuanian",
-    "lt",
-    "lt_LT",
-    "lt_LT.ISO8859-13",
-    "lt_LT.utf8",
-    "lv",
-    "lv_LV",
-    "lv_LV.ISO8859-13",
-    "lv_LV.utf8",
-    "mi_NZ",
-    "mk",
-    "mk_MK",
-    "mk_MK.ISO8859-5",
-    "mk_MK.utf8",
-    "mr_IN",
-    "ms_MY",
-    "ms_MY.utf8",
-    "mt_MT",
-    "mt_MT.utf8",
-    "nb_NO",
-    "nb_NO.ISO-8859-1",
-    "nl",
-    "nl.ISO8859-15",
-    "nl_BE",
-    "nl_BE.ISO8859-1",
-    "nl_BE.ISO8859-15",
-    "nl_BE.ISO8859-15@euro",
-    "nl_BE.UTF-8",
-    "nl_BE.utf8",
-    "nl_BE.utf8@euro",
-    "nl_BE@euro",
-    "nl_NL",
-    "nl_NL.ISO8859-1",
-    "nl_NL.ISO8859-15",
-    "nl_NL.ISO8859-15@euro",
-    "nl_NL.UTF-8",
-    "nl_NL.iso88591",
-    "nl_NL.iso885915@euro",
-    "nl_NL.roman8",
-    "nl_NL.utf8",
-    "nl_NL.utf8@euro",
-    "nl_NL@euro",
-    "nn_NO",
-    "nn_NO.utf8",
-    "no",
-    "no.po",
-    "no@nynorsk",
-    "no_NO",
-    "no_NO.ISO8859-1",
-    "no_NO.ISO8859-15",
-    "no_NO.ISO8859-1@bokmal",
-    "no_NO.ISO8859-1@nynorsk",
-    "no_NO.UTF-8",
-    "no_NO.iso88591",
-    "no_NO.iso885915@euro",
-    "no_NO.roman8",
-    "no_NO.utf8",
-    "no_NY",
-    "norwegian",
-    "nr",
-    "nynorsk",
-    "oc_FR",
-    "pl",
-    "pl.UTF-8",
-    "pl.po",
-    "pl_PL",
-    "pl_PL.ISO8859-2",
-    "pl_PL.UTF-8",
-    "pl_PL.iso88592",
-    "pl_PL.utf8",
-    "polish",
-    "portuguese",
-    "pt",
-    "pt.ISO8859-15",
-    "pt_BR",
-    "pt_BR.ISO8859-1",
-    "pt_BR.ISO8859-15",
-    "pt_BR.UTF-8",
-    "pt_BR.po",
-    "pt_BR.utf8",
-    "pt_PT",
-    "pt_PT.ISO8859-1",
-    "pt_PT.ISO8859-15",
-    "pt_PT.ISO8859-15@euro",
-    "pt_PT.UTF-8",
-    "pt_PT.iso88591",
-    "pt_PT.iso885915@euro",
-    "pt_PT.roman8",
-    "pt_PT.utf8",
-    "pt_PT.utf8@euro",
-    "pt_PT@euro",
-    "ro",
-    "ro_RO",
-    "ro_RO.ISO8859-2",
-    "ro_RO.iso88592",
-    "ro_RO.utf8",
-    "romanian",
-    "ru",
-    "ru.UTF-8",
-    "ru.koi8-r",
-    "ru_RU",
-    "ru_RU.ANSI1251",
-    "ru_RU.ISO8859-5",
-    "ru_RU.KOI8-R",
-    "ru_RU.UTF-8",
-    "ru_RU.iso88595",
-    "ru_RU.koi8r",
-    "ru_RU.utf8",
-    "ru_SU",
-    "ru_UA",
-    "ru_UA.utf8",
-    "russian",
-    "se",
-    "sh_BA",
-    "sh_BA.ISO8859-2@bosnia",
-    "sk",
-    "sk_SK",
-    "sk_SK.ISO8859-2",
-    "sk_SK.iso88592",
-    "sk_SK.utf8",
-    "sl",
-    "sl_SI",
-    "sl_SI.ISO8859-2",
-    "sl_SI.iso88592",
-    "sl_SI.utf8",
-    "slovak",
-    "slovene",
-    "slovenian",
-    "spanish",
-    "sq_AL",
-    "sq_AL.ISO8859-2",
-    "sq_AL.utf8",
-    "sr",
-    "sr_SP",
-    "sr_YU",
-    "sr_YU.ISO8859-5",
-    "sr_YU.utf8",
-    "sr_YU.utf8@cyrillic",
-    "sr_YU@cyrillic",
-    "sv",
-    "sv.ISO8859-15",
-    "sv.UTF-8",
-    "sv_FI",
-    "sv_FI.utf8",
-    "sv_FI.utf8@euro",
-    "sv_FI@euro",
-    "sv_SE",
-    "sv_SE.ISO8859-1",
-    "sv_SE.ISO8859-15",
-    "sv_SE.ISO8859-15@euro",
-    "sv_SE.UTF-8",
-    "sv_SE.UTF-8@euro",
-    "sv_SE.iso88591",
-    "sv_SE.iso885915@euro",
-    "sv_SE.roman8",
-    "sv_SE.utf8",
-    "swedish",
-    "ta_IN",
-    "te_IN",
-    "tg_TJ",
-    "th",
-    "th_TH",
-    "th_TH.ISO8859-11",
-    "th_TH.TIS620",
-    "th_TH.UTF-8",
-    "th_TH.tis620",
-    "th_TH.utf8",
-    "thai",
-    "tl_PH",
-    "tr",
-    "tr_TR",
-    "tr_TR.ISO8859-9",
-    "tr_TR.UTF-8",
-    "tr_TR.iso88599",
-    "tr_TR.turkish8",
-    "tr_TR.utf8",
-    "turkish",
-    "ua",
-    "uk",
-    "uk_UA",
-    "uk_UA.utf8",
-    "univ.utf8",
-    "universal.UTF-8",
-    "universal.utf8@ucs4",
-    "ur_PK",
-    "uz_UZ",
-    "vi_VN",
-    "wa",
-    "yi_US",
-    "zh",
-    "zh.GBK",
-    "zh.UTF-8",
-    "zh_CN",
-    "zh_CN.EUC",
-    "zh_CN.EUC@pinyin",
-    "zh_CN.EUC@radical",
-    "zh_CN.EUC@stroke",
-    "zh_CN.GB18030",
-    "zh_CN.GB18030@pinyin",
-    "zh_CN.GB18030@radical",
-    "zh_CN.GB18030@stroke",
-    "zh_CN.GB2312",
-    "zh_CN.GBK",
-    "zh_CN.GBK@pinyin",
-    "zh_CN.GBK@radical",
-    "zh_CN.GBK@stroke",
-    "zh_CN.UTF-8",
-    "zh_CN.UTF-8@pinyin",
-    "zh_CN.UTF-8@radical",
-    "zh_CN.UTF-8@stroke",
-    "zh_CN.gb18030",
-    "zh_CN.gbk",
-    "zh_CN.hp15CN",
-    "zh_CN.utf8",
-    "zh_HK",
-    "zh_HK.BIG5HK",
-    "zh_HK.BIG5HK@radical",
-    "zh_HK.BIG5HK@stroke",
-    "zh_HK.UTF-8",
-    "zh_HK.UTF-8@radical",
-    "zh_HK.UTF-8@stroke",
-    "zh_HK.big5",
-    "zh_HK.utf8",
-    "zh_TW",
-    "zh_TW.BIG5",
-    "zh_TW.BIG5@pinyin",
-    "zh_TW.BIG5@radical",
-    "zh_TW.BIG5@stroke",
-    "zh_TW.BIG5@zhuyin",
-    "zh_TW.Big5",
-    "zh_TW.EUC",
-    "zh_TW.EUC@pinyin",
-    "zh_TW.EUC@radical",
-    "zh_TW.EUC@stroke",
-    "zh_TW.EUC@zhuyin",
-    "zh_TW.UTF-8",
-    "zh_TW.UTF-8@pinyin",
-    "zh_TW.UTF-8@radical",
-    "zh_TW.UTF-8@stroke",
-    "zh_TW.UTF-8@zhuyin",
-    "zh_TW.big5",
-    "zh_TW.ccdc",
-    "zh_TW.eucTW",
-    "zh_TW.euctw",
-    "zh_TW.utf8",
-
-    // Windows names
-    "ENU", "ENG", "ENA", "ENC", "ENZ", "ENI", "ENS", "ENJ", "ENB", "ENL",
-    "ENT", "BGR", "CSY", "DAN", "DEU", "DES", "DEA", "DEL", "DEC", "ELL",
-    "ESP", "ESM", "ESN", "ESG", "ESC", "ESA", "ESD", "ESV", "ESO", "ESR",
-    "ESS", "ESF", "ESL", "ESY", "ESZ", "ESB", "ESE", "ESH", "ESI", "ESU",
-    "FIN", "FRA", "FRB", "FRC", "FRS", "FRL", "HUN", "ISL", "ITA", "ITS",
-    "NLD", "NLB", "NOR", "NON", "PLK", "PTB", "PTG", "ROM", "RUS", "HRV",
-    "SRL", "SRB", "SKY", "SVE", "SVF", "TRK", "SLV", "AFK", "SQI", "EUQ",
-    "BEL", "CAT", "ETI", "FOS", "IND", "LVI", "LTH", "UKR"
-};
-
-const unsigned nlocales = sizeof test_locale_names / sizeof *test_locale_names;
diff --git a/etc/config/src/NEW_THROWS.cpp b/etc/config/src/NEW_THROWS.cpp
index f2ae019..529041c 100644
--- a/etc/config/src/NEW_THROWS.cpp
+++ b/etc/config/src/NEW_THROWS.cpp
@@ -5,9 +5,11 @@
 #include <stdio.h>
 
 #ifndef _RWSTD_NO_SETRLIMIT
-#  include <sys/resource.h>   // for setrlimit()
+// test for setrlimit() presence before compiling current file
 #endif   // _RWSTD_NO_SETRLIMIT
 
+// proclimits.h must be included only after #if[n]def _RWSTD_NO_SETRLIMIT
+#include "proclimits.h"
 
 #if 2 == __GNUG__
 #  ifndef _RWSTD_NO_HONOR_STD
@@ -84,15 +86,9 @@
     // by passing it a smaller argument
     printf ("#define _RWSTD_NO_NEW_OFLOW_SAFE\n");
 
-#ifndef _RWSTD_NO_SETRLIMIT
-
     // decrease resource limit to a minimum to induce a failure
     // without unreasonably stressing the system
-
-    struct rlimit rl = { 0, 0 };
-    setrlimit (RLIMIT_DATA, &rl);
-
-#endif   // _RWSTD_NO_SETRLIMIT
+    limit_memory (0);
 
     p = (void*)1;
 
diff --git a/etc/config/src/NONDEDUCED_CONTEXT.cpp b/etc/config/src/NONDEDUCED_CONTEXT.cpp
index 2e9d32f..0b756fa 100644
--- a/etc/config/src/NONDEDUCED_CONTEXT.cpp
+++ b/etc/config/src/NONDEDUCED_CONTEXT.cpp
@@ -38,8 +38,6 @@
 }
 
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
 template <class T>
 struct B
 {
@@ -56,5 +54,3 @@
 
     b.baz (a, ' ');
 }
-
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
diff --git a/etc/config/src/STD_BAD_ALLOC.cpp b/etc/config/src/STD_BAD_ALLOC.cpp
index 8196323..f652c78 100644
--- a/etc/config/src/STD_BAD_ALLOC.cpp
+++ b/etc/config/src/STD_BAD_ALLOC.cpp
@@ -2,10 +2,17 @@
 
 #include "config.h"
 
+#if !defined (_RWSTD_NO_NEW_THROWS) && !defined (_RWSTD_NO_NEW_OFLOW_SAFE)
+#  include <stddef.h>   // for size_t
+#endif   // !_RWSTD_NO_NEW_THROWS && !_RWSTD_NO_NEW_OFLOW_SAFE
+
 #ifndef _RWSTD_NO_SETRLIMIT
-#  include <sys/resource.h>   // for setrlimit()
+// test for setrlimit() presence before compiling current file
 #endif
 
+// proclimits.h must be included only after #if[n]def _RWSTD_NO_SETRLIMIT
+#include "proclimits.h"
+
 #ifndef _RWSTD_NO_HONOR_STD
 #  ifdef _RWSTD_NO_STD_TERMINATE
 
@@ -70,19 +77,14 @@
 #ifndef _RWSTD_NO_NEW_THROWS
 #  ifndef _RWSTD_NO_NEW_OFLOW_SAFE
 
-        void *p = ::operator new ((unsigned long)-1);
+        void *p = ::operator new (size_t (-1));
 
         if (!p)
             return 1;
 
 #  else   // if defined (_RWSTD_NO_NEW_OFLOW_SAFE)
 
-#ifndef _RWSTD_NO_SETRLIMIT
-
-        struct rlimit rl = { 0, 0 };
-        setrlimit (RLIMIT_DATA, &rl);
-
-#endif   // _RWSTD_NO_SETRLIMIT
+        limit_memory (0);
 
         for (unsigned long n = 1UL << (sizeof (long) * 8 - 1);
              0 != n; n |= (n >> 1)) {
diff --git a/etc/config/src/THREAD_SAFE_LOCALE.cpp b/etc/config/src/THREAD_SAFE_LOCALE.cpp
new file mode 100644
index 0000000..b6b87ed
--- /dev/null
+++ b/etc/config/src/THREAD_SAFE_LOCALE.cpp
@@ -0,0 +1,73 @@
+// checking if locale is thread safe
+
+// determines whether each thread has its own C locale environment
+// that's independent of those of all other threads or whether the
+// C locale facility is process global (i.e., shared among all
+// threads)
+
+
+#include <locale.h>         // for LC_ALL, setlocale()
+#include <string.h>         // for strcpy()
+
+#include "locale_names.h"   // for test_locale_names
+#include "thread.h"         // for pthread_t, pthread_create
+
+
+static char
+thread_locale [3][1024];
+
+
+extern "C" {
+
+void* thread_routine (void *arg)
+{
+    const char* const name = setlocale (LC_ALL, 0);
+
+    if (name) {
+        const unsigned long inx = (unsigned long)arg;
+
+        strcpy (thread_locale [inx], name);
+    }
+
+    return 0;
+}
+
+}   // extern "C"
+
+int main ()
+{
+    const char* locale_name = setlocale (LC_ALL, "C");
+
+    // save the main thread's locale at index 0
+    strcpy (thread_locale [0], locale_name);
+
+    pthread_t thread [2];
+
+    // create one thread and have it save its locale name at index 1
+    if (pthread_create (thread + 0, 0, thread_routine, (void*)1))
+        return 4;
+
+    // find a named locale different from the initial one
+    for (unsigned i = 0; i != nlocales; ++i) {
+        // set the main thread's locale to one that's different
+        // from that of the first thread
+        locale_name = setlocale (LC_ALL, test_locale_names [i]);
+        if (locale_name && strcmp (locale_name, thread_locale [0]))
+            break;
+    }
+
+    // create another thread and have it save its locale name at index 2
+    if (pthread_create (thread + 1, 0, thread_routine, (void*)2)) {
+        return 3;
+    }
+
+    // join both (sub)threads
+    if (pthread_join (thread [0], 0) || pthread_join (thread [1], 0))
+        return 2;
+
+    // return 0 (success) when the (sub)thread's locale is different
+    // from the main thread's locale and 1 (failure) when they are
+    // the same
+    return    0 == strcmp (thread_locale [0], thread_locale [1])
+           || 0 == strcmp (thread_locale [0], thread_locale [2]);
+}
diff --git a/etc/config/src/locale_names.h b/etc/config/src/locale_names.h
new file mode 100644
index 0000000..9236f00
--- /dev/null
+++ b/etc/config/src/locale_names.h
@@ -0,0 +1,785 @@
+#ifndef LOCALE_NAMES_H_INCLUDED
+#define LOCALE_NAMES_H_INCLUDED
+
+// "well-known" locale names on popular systems
+
+const char* const test_locale_names[] = {
+    "ar", "ar_EG.UTF-8", "bg_BG", "bg_BG.ISO8859-5", "ca", "ca_ES",
+
+    // "C.iso88591",
+    // "C.iso885915",
+    // "C.utf8",
+    "DE_AT",
+    "DE_AT.UTF-8",
+    "DE_AT.UTF-8@euro",
+    "DE_AT@euro",
+    "DE_CH",
+    "DE_CH.UTF-8",
+    "DE_DE",
+    "DE_DE.UTF-8",
+    "DE_DE.UTF-8@euro",
+    "DE_DE@euro",
+    "DE_LU",
+    "DE_LU.UTF-8",
+    "DE_LU.UTF-8@euro",
+    "DE_LU@euro",
+    "De_CH",
+    "De_CH.IBM-850",
+    "De_DE",
+    "De_DE.IBM-850",
+    "FR_BE",
+    "FR_BE.UTF-8",
+    "FR_BE.UTF-8@euro",
+    "FR_BE@euro",
+    "FR_CA",
+    "FR_CA.UTF-8",
+    "FR_CH",
+    "FR_CH.UTF-8",
+    "FR_FR",
+    "FR_FR.UTF-8",
+    "FR_FR.UTF-8@euro",
+    "FR_FR@euro",
+    "FR_LU",
+    "FR_LU.UTF-8",
+    "FR_LU.UTF-8@euro",
+    "FR_LU@euro",
+    "Fr_BE",
+    "Fr_BE.IBM-850",
+    "Fr_CA",
+    "Fr_CA.IBM-850",
+    "Fr_CH",
+    "Fr_CH.IBM-850",
+    "Fr_FR",
+    "Fr_FR.IBM-850",
+    "JA_JP",
+    "JA_JP.UTF-8",
+    "Ja_JP",
+    "Ja_JP.IBM-932",
+    "Ja_JP.IBM-943",
+    "af_ZA",
+    "ar",
+    "ar_AE",
+    "ar_AE.utf8",
+    "ar_BH",
+    "ar_BH.utf8",
+    "ar_DZ",
+    "ar_DZ.arabic8",
+    "ar_DZ.utf8",
+    "ar_EG",
+    "ar_EG.UTF-8",
+    "ar_EG.utf8",
+    "ar_IN",
+    "ar_IQ",
+    "ar_IQ.utf8",
+    "ar_JO",
+    "ar_JO.utf8",
+    "ar_KW",
+    "ar_KW.utf8",
+    "ar_LB",
+    "ar_LB.utf8",
+    "ar_LY",
+    "ar_LY.utf8",
+    "ar_MA",
+    "ar_MA.utf8",
+    "ar_OM",
+    "ar_OM.utf8",
+    "ar_QA",
+    "ar_QA.utf8",
+    "ar_SA",
+    "ar_SA.arabic8",
+    "ar_SA.iso88596",
+    "ar_SA.utf8",
+    "ar_SD",
+    "ar_SD.utf8",
+    "ar_SY",
+    "ar_SY.utf8",
+    "ar_TN",
+    "ar_TN.utf8",
+    "ar_YE",
+    "ar_YE.utf8",
+    "be_BY",
+    "be_BY.utf8",
+    "bg_BG",
+    "bg_BG.ISO8859-5",
+    "bg_BG.iso88595",
+    "bg_BG.utf8",
+    "bokmal",
+    "bokmål",
+    "br",
+    "br_FR",
+    "bs_BA",
+    "ca",
+    "ca_ES",
+    "ca_ES.ISO8859-1",
+    "ca_ES.ISO8859-15",
+    "ca_ES.ISO8859-15@euro",
+    "ca_ES.utf8",
+    "ca_ES.utf8@euro",
+    "ca_ES@euro",
+    "catalan",
+    "chinese",
+    "common",
+    "croatian",
+    "cs",
+    "cs.po",
+    "cs_CZ",
+    "cs_CZ.ISO8859-2",
+    "cs_CZ.iso88592",
+    "cs_CZ.utf8",
+    "cy_GB",
+    "cz",
+    "czech",
+    "da",
+    "da.ISO8859-15",
+    "da.po",
+    "da_DK",
+    "da_DK.ISO8859-1",
+    "da_DK.ISO8859-15",
+    "da_DK.ISO8859-15@euro",
+    "da_DK.UTF-8",
+    "da_DK.iso88591",
+    "da_DK.iso885915@euro",
+    "da_DK.roman8",
+    "da_DK.utf8",
+    "danish",
+    "dansk",
+    "de",
+    "de.ISO8859-15",
+    "de.UTF-8",
+    "de.po",
+    "de_AT",
+    "de_AT.8859-15",
+    "de_AT.8859-15@euro",
+    "de_AT.ISO8859-1",
+    "de_AT.ISO8859-15",
+    "de_AT.ISO8859-15@euro",
+    "de_AT.utf8",
+    "de_AT.utf8@euro",
+    "de_AT@euro",
+    "de_BE",
+    "de_BE.utf8",
+    "de_BE.utf8@euro",
+    "de_BE@euro",
+    "de_CH",
+    "de_CH.8859-15",
+    "de_CH.ISO8859-1",
+    "de_CH.ISO8859-15",
+    "de_CH.utf8",
+    "de_DE",
+    "de_DE.8859-15",
+    "de_DE.8859-15@euro",
+    "de_DE.IBM-1252",
+    "de_DE.IBM-1252@euro",
+    "de_DE.ISO8859-1",
+    "de_DE.ISO8859-15",
+    "de_DE.ISO8859-15@euro",
+    "de_DE.UTF-8",
+    "de_DE.UTF-8@euro",
+    "de_DE.iso88591",
+    "de_DE.iso885915@euro",
+    "de_DE.roman8",
+    "de_DE.utf8",
+    "de_DE.utf8@euro",
+    "de_DE@euro",
+    "de_LU",
+    "de_LU.8859-15",
+    "de_LU.8859-15@euro",
+    "de_LU.utf8",
+    "de_LU.utf8@euro",
+    "de_LU@euro",
+    "deutsch",
+    "dk",
+    "dutch",
+    "eesti",
+    "el",
+    "el.sun_eu_greek",
+    "el_GR",
+    "el_GR.ISO8859-7",
+    "el_GR.ISO8859-7@euro",
+    "el_GR.greek8",
+    "el_GR.iso88597",
+    "el_GR.utf8",
+    "en",
+    "en_AU",
+    "en_AU.ISO8859-1",
+    "en_AU.ISO8859-15",
+    "en_AU.utf8",
+    "en_BW",
+    "en_BW.utf8",
+    "en_CA",
+    "en_CA.ISO8859-1",
+    "en_CA.ISO8859-15",
+    "en_CA.utf8",
+    "en_DK",
+    "en_DK.utf8",
+    "en_EU.UTF-8@euro",
+    "en_GB",
+    "en_GB.ISO8859-1",
+    "en_GB.ISO8859-15",
+    "en_GB.ISO8859-15@euro",
+    "en_GB.UTF-8",
+    "en_GB.iso88591",
+    "en_GB.iso885915@euro",
+    "en_GB.roman8",
+    "en_GB.utf8",
+    "en_HK",
+    "en_HK.utf8",
+    "en_IE",
+    "en_IE.ISO8859-1",
+    "en_IE.ISO8859-15",
+    "en_IE.ISO8859-15@euro",
+    "en_IE.utf8",
+    "en_IE.utf8@euro",
+    "en_IE@euro",
+    "en_IN",
+    "en_NZ",
+    "en_NZ.ISO8859-1",
+    "en_NZ.utf8",
+    "en_PH",
+    "en_PH.utf8",
+    "en_RN",
+    "en_SG",
+    "en_SG.utf8",
+    "en_UK",
+    "en_US",
+    "en_US.8859-15",
+    "en_US.ISO8859-1",
+    "en_US.ISO8859-15",
+    "en_US.ISO8859-15@euro",
+    "en_US.UTF-8",
+    "en_US.UTF-8@euro",
+    "en_US.cp850",
+    "en_US.iso88591",
+    "en_US.roman8",
+    "en_US.utf8",
+    "en_ZA",
+    "en_ZA.utf8",
+    "en_ZW",
+    "en_ZW.utf8",
+    "eo",
+    "es",
+    "es.ISO8859-15",
+    "es.UTF-8",
+    "es.po",
+    "es_AR",
+    "es_AR.ISO8859-1",
+    "es_AR.ISO8859-15",
+    "es_AR.utf8",
+    "es_BO",
+    "es_BO.ISO8859-1",
+    "es_BO.utf8",
+    "es_CL",
+    "es_CL.ISO8859-1",
+    "es_CL.utf8",
+    "es_CO",
+    "es_CO.ISO8859-1",
+    "es_CO.utf8",
+    "es_CR",
+    "es_CR.ISO8859-1",
+    "es_CR.utf8",
+    "es_DO",
+    "es_DO.utf8",
+    "es_EC",
+    "es_EC.ISO8859-1",
+    "es_EC.utf8",
+    "es_ES",
+    "es_ES.ISO8859-1",
+    "es_ES.ISO8859-15",
+    "es_ES.ISO8859-15@euro",
+    "es_ES.UTF-8",
+    "es_ES.UTF-8@euro",
+    "es_ES.iso88591",
+    "es_ES.iso885915@euro",
+    "es_ES.roman8",
+    "es_ES.utf8",
+    "es_ES.utf8@euro",
+    "es_ES@euro",
+    "es_GT",
+    "es_GT.ISO8859-1",
+    "es_GT.utf8",
+    "es_HN",
+    "es_HN.utf8",
+    "es_MX",
+    "es_MX.ISO8859-1",
+    "es_MX.ISO8859-15",
+    "es_MX.utf8",
+    "es_NI",
+    "es_NI.ISO8859-1",
+    "es_NI.utf8",
+    "es_PA",
+    "es_PA.ISO8859-1",
+    "es_PA.utf8",
+    "es_PE",
+    "es_PE.ISO8859-1",
+    "es_PE.utf8",
+    "es_PR",
+    "es_PR.utf8",
+    "es_PY",
+    "es_PY.ISO8859-1",
+    "es_PY.utf8",
+    "es_SV",
+    "es_SV.ISO8859-1",
+    "es_SV.utf8",
+    "es_US",
+    "es_US.utf8",
+    "es_UY",
+    "es_UY.ISO8859-1",
+    "es_UY.utf8",
+    "es_VE",
+    "es_VE.ISO8859-1",
+    "es_VE.utf8",
+    "estonian",
+    "et",
+    "et_EE",
+    "et_EE.ISO8859-15",
+    "et_EE.utf8",
+    "eu_ES",
+    "eu_ES.utf8",
+    "eu_ES.utf8@euro",
+    "eu_ES@euro",
+    "fa_IR",
+    "fi",
+    "fi.ISO8859-15",
+    "fi.po",
+    "fi_FI",
+    "fi_FI.ISO8859-1",
+    "fi_FI.ISO8859-15",
+    "fi_FI.ISO8859-15@euro",
+    "fi_FI.UTF-8",
+    "fi_FI.iso88591",
+    "fi_FI.iso885915@euro",
+    "fi_FI.roman8",
+    "fi_FI.utf8",
+    "fi_FI.utf8@euro",
+    "fi_FI@euro",
+    "finnish",
+    "fo_FO",
+    "fo_FO.utf8",
+    "fr",
+    "fr.ISO8859-15",
+    "fr.UTF-8",
+    "fr.po",
+    "fr_BE",
+    "fr_BE.8859-15",
+    "fr_BE.8859-15@euro",
+    "fr_BE.IBM-1252",
+    "fr_BE.IBM-1252@euro",
+    "fr_BE.ISO8859-1",
+    "fr_BE.ISO8859-15",
+    "fr_BE.ISO8859-15@euro",
+    "fr_BE.UTF-8",
+    "fr_BE.UTF-8@euro",
+    "fr_BE.utf8",
+    "fr_BE.utf8@euro",
+    "fr_BE@euro",
+    "fr_CA",
+    "fr_CA.8859-15",
+    "fr_CA.ISO8859-1",
+    "fr_CA.ISO8859-15",
+    "fr_CA.iso88591",
+    "fr_CA.iso885915",
+    "fr_CA.roman8",
+    "fr_CA.utf8",
+    "fr_CH",
+    "fr_CH.8859-15",
+    "fr_CH.ISO8859-1",
+    "fr_CH.ISO8859-15",
+    "fr_CH.utf8",
+    "fr_FR",
+    "fr_FR.8859-15",
+    "fr_FR.8859-15@euro",
+    "fr_FR.IBM-1252",
+    "fr_FR.IBM-1252@euro",
+    "fr_FR.ISO8859-1",
+    "fr_FR.ISO8859-15",
+    "fr_FR.ISO8859-15@euro",
+    "fr_FR.UTF-8",
+    "fr_FR.UTF-8@euro",
+    "fr_FR.iso88591",
+    "fr_FR.iso885915@euro",
+    "fr_FR.roman8",
+    "fr_FR.utf8",
+    "fr_FR.utf8@euro",
+    "fr_FR@euro",
+    "fr_LU",
+    "fr_LU.8859-15",
+    "fr_LU.8859-15@euro",
+    "fr_LU.utf8",
+    "fr_LU.utf8@euro",
+    "fr_LU@euro",
+    "french",
+    "ga",
+    "ga_IE",
+    "ga_IE.utf8",
+    "ga_IE.utf8@euro",
+    "ga_IE@euro",
+    "galego",
+    "galician",
+    "german",
+    "gl",
+    "gl_ES",
+    "gl_ES.utf8",
+    "gl_ES.utf8@euro",
+    "gl_ES@euro",
+    "greek",
+    "gv_GB",
+    "gv_GB.utf8",
+    "he",
+    "he_IL",
+    "he_IL.UTF-8",
+    "he_IL.utf8",
+    "hebrew",
+    "hi_IN",
+    "hi_IN.UTF-8",
+    "hr",
+    "hr_HR",
+    "hr_HR.ISO8859-2",
+    "hr_HR.iso88592",
+    "hr_HR.utf8",
+    "hrvatski",
+    "hu",
+    "hu_HU",
+    "hu_HU.ISO8859-2",
+    "hu_HU.iso88592",
+    "hu_HU.utf8",
+    "hungarian",
+    "icelandic",
+    "id_ID",
+    "id_ID.utf8",
+    "in",
+    "in_ID",
+    "is",
+    "is.po",
+    "is_IS",
+    "is_IS.ISO8859-1",
+    "is_IS.ISO8859-15",
+    "is_IS.iso88591",
+    "is_IS.iso885915@euro",
+    "is_IS.roman8",
+    "is_IS.utf8",
+    "iso_8859_1",
+    "iso_8859_13",
+    "iso_8859_15",
+    "iso_8859_2",
+    "iso_8859_5",
+    "iso_8859_7",
+    "iso_8859_9",
+    "it",
+    "it.ISO8859-15",
+    "it.UTF-8",
+    "it_CH",
+    "it_CH.ISO8859-15",
+    "it_CH.utf8",
+    "it_IT",
+    "it_IT.ISO8859-1",
+    "it_IT.ISO8859-15",
+    "it_IT.ISO8859-15@euro",
+    "it_IT.UTF-8",
+    "it_IT.UTF-8@euro",
+    "it_IT.iso88591",
+    "it_IT.iso885915@euro",
+    "it_IT.roman8",
+    "it_IT.utf8",
+    "it_IT.utf8@euro",
+    "it_IT@euro",
+    "italian",
+    "iw_IL",
+    "iw_IL.hebrew8",
+    "iw_IL.iso88598",
+    "iw_IL.utf8",
+    "ja",
+    "ja_JP",
+    "ja_JP.EUC",
+    "ja_JP.IBM-eucJP",
+    "ja_JP.PCK",
+    "ja_JP.SJIS",
+    "ja_JP.SJIS@ucs4",
+    "ja_JP.UTF-8",
+    "ja_JP.deckanji",
+    "ja_JP.deckanji@ucs4",
+    "ja_JP.eucJP",
+    "ja_JP.eucjp",
+    "ja_JP.kana8",
+    "ja_JP.sdeckanji",
+    "ja_JP.ujis",
+    "ja_JP.utf8",
+    "japanese",
+    "japanese.euc",
+    "japanese.sjis",
+    "ka_GE",
+    "kl_GL",
+    "kl_GL.utf8",
+    "ko",
+    "ko.UTF-8",
+    "ko_KR",
+    "ko_KR.EUC",
+    "ko_KR.EUC@dict",
+    "ko_KR.UTF-8",
+    "ko_KR.UTF-8@dict",
+    "ko_KR.eucKR",
+    "ko_KR.euckr",
+    "ko_KR.utf8",
+    "korean",
+    "korean.euc",
+    "kw_GB",
+    "kw_GB.utf8",
+    "lithuanian",
+    "lt",
+    "lt_LT",
+    "lt_LT.ISO8859-13",
+    "lt_LT.utf8",
+    "lv",
+    "lv_LV",
+    "lv_LV.ISO8859-13",
+    "lv_LV.utf8",
+    "mi_NZ",
+    "mk",
+    "mk_MK",
+    "mk_MK.ISO8859-5",
+    "mk_MK.utf8",
+    "mr_IN",
+    "ms_MY",
+    "ms_MY.utf8",
+    "mt_MT",
+    "mt_MT.utf8",
+    "nb_NO",
+    "nb_NO.ISO-8859-1",
+    "nl",
+    "nl.ISO8859-15",
+    "nl_BE",
+    "nl_BE.ISO8859-1",
+    "nl_BE.ISO8859-15",
+    "nl_BE.ISO8859-15@euro",
+    "nl_BE.UTF-8",
+    "nl_BE.utf8",
+    "nl_BE.utf8@euro",
+    "nl_BE@euro",
+    "nl_NL",
+    "nl_NL.ISO8859-1",
+    "nl_NL.ISO8859-15",
+    "nl_NL.ISO8859-15@euro",
+    "nl_NL.UTF-8",
+    "nl_NL.iso88591",
+    "nl_NL.iso885915@euro",
+    "nl_NL.roman8",
+    "nl_NL.utf8",
+    "nl_NL.utf8@euro",
+    "nl_NL@euro",
+    "nn_NO",
+    "nn_NO.utf8",
+    "no",
+    "no.po",
+    "no@nynorsk",
+    "no_NO",
+    "no_NO.ISO8859-1",
+    "no_NO.ISO8859-15",
+    "no_NO.ISO8859-1@bokmal",
+    "no_NO.ISO8859-1@nynorsk",
+    "no_NO.UTF-8",
+    "no_NO.iso88591",
+    "no_NO.iso885915@euro",
+    "no_NO.roman8",
+    "no_NO.utf8",
+    "no_NY",
+    "norwegian",
+    "nr",
+    "nynorsk",
+    "oc_FR",
+    "pl",
+    "pl.UTF-8",
+    "pl.po",
+    "pl_PL",
+    "pl_PL.ISO8859-2",
+    "pl_PL.UTF-8",
+    "pl_PL.iso88592",
+    "pl_PL.utf8",
+    "polish",
+    "portuguese",
+    "pt",
+    "pt.ISO8859-15",
+    "pt_BR",
+    "pt_BR.ISO8859-1",
+    "pt_BR.ISO8859-15",
+    "pt_BR.UTF-8",
+    "pt_BR.po",
+    "pt_BR.utf8",
+    "pt_PT",
+    "pt_PT.ISO8859-1",
+    "pt_PT.ISO8859-15",
+    "pt_PT.ISO8859-15@euro",
+    "pt_PT.UTF-8",
+    "pt_PT.iso88591",
+    "pt_PT.iso885915@euro",
+    "pt_PT.roman8",
+    "pt_PT.utf8",
+    "pt_PT.utf8@euro",
+    "pt_PT@euro",
+    "ro",
+    "ro_RO",
+    "ro_RO.ISO8859-2",
+    "ro_RO.iso88592",
+    "ro_RO.utf8",
+    "romanian",
+    "ru",
+    "ru.UTF-8",
+    "ru.koi8-r",
+    "ru_RU",
+    "ru_RU.ANSI1251",
+    "ru_RU.ISO8859-5",
+    "ru_RU.KOI8-R",
+    "ru_RU.UTF-8",
+    "ru_RU.iso88595",
+    "ru_RU.koi8r",
+    "ru_RU.utf8",
+    "ru_SU",
+    "ru_UA",
+    "ru_UA.utf8",
+    "russian",
+    "se",
+    "sh_BA",
+    "sh_BA.ISO8859-2@bosnia",
+    "sk",
+    "sk_SK",
+    "sk_SK.ISO8859-2",
+    "sk_SK.iso88592",
+    "sk_SK.utf8",
+    "sl",
+    "sl_SI",
+    "sl_SI.ISO8859-2",
+    "sl_SI.iso88592",
+    "sl_SI.utf8",
+    "slovak",
+    "slovene",
+    "slovenian",
+    "spanish",
+    "sq_AL",
+    "sq_AL.ISO8859-2",
+    "sq_AL.utf8",
+    "sr",
+    "sr_SP",
+    "sr_YU",
+    "sr_YU.ISO8859-5",
+    "sr_YU.utf8",
+    "sr_YU.utf8@cyrillic",
+    "sr_YU@cyrillic",
+    "sv",
+    "sv.ISO8859-15",
+    "sv.UTF-8",
+    "sv_FI",
+    "sv_FI.utf8",
+    "sv_FI.utf8@euro",
+    "sv_FI@euro",
+    "sv_SE",
+    "sv_SE.ISO8859-1",
+    "sv_SE.ISO8859-15",
+    "sv_SE.ISO8859-15@euro",
+    "sv_SE.UTF-8",
+    "sv_SE.UTF-8@euro",
+    "sv_SE.iso88591",
+    "sv_SE.iso885915@euro",
+    "sv_SE.roman8",
+    "sv_SE.utf8",
+    "swedish",
+    "ta_IN",
+    "te_IN",
+    "tg_TJ",
+    "th",
+    "th_TH",
+    "th_TH.ISO8859-11",
+    "th_TH.TIS620",
+    "th_TH.UTF-8",
+    "th_TH.tis620",
+    "th_TH.utf8",
+    "thai",
+    "tl_PH",
+    "tr",
+    "tr_TR",
+    "tr_TR.ISO8859-9",
+    "tr_TR.UTF-8",
+    "tr_TR.iso88599",
+    "tr_TR.turkish8",
+    "tr_TR.utf8",
+    "turkish",
+    "ua",
+    "uk",
+    "uk_UA",
+    "uk_UA.utf8",
+    "univ.utf8",
+    "universal.UTF-8",
+    "universal.utf8@ucs4",
+    "ur_PK",
+    "uz_UZ",
+    "vi_VN",
+    "wa",
+    "yi_US",
+    "zh",
+    "zh.GBK",
+    "zh.UTF-8",
+    "zh_CN",
+    "zh_CN.EUC",
+    "zh_CN.EUC@pinyin",
+    "zh_CN.EUC@radical",
+    "zh_CN.EUC@stroke",
+    "zh_CN.GB18030",
+    "zh_CN.GB18030@pinyin",
+    "zh_CN.GB18030@radical",
+    "zh_CN.GB18030@stroke",
+    "zh_CN.GB2312",
+    "zh_CN.GBK",
+    "zh_CN.GBK@pinyin",
+    "zh_CN.GBK@radical",
+    "zh_CN.GBK@stroke",
+    "zh_CN.UTF-8",
+    "zh_CN.UTF-8@pinyin",
+    "zh_CN.UTF-8@radical",
+    "zh_CN.UTF-8@stroke",
+    "zh_CN.gb18030",
+    "zh_CN.gbk",
+    "zh_CN.hp15CN",
+    "zh_CN.utf8",
+    "zh_HK",
+    "zh_HK.BIG5HK",
+    "zh_HK.BIG5HK@radical",
+    "zh_HK.BIG5HK@stroke",
+    "zh_HK.UTF-8",
+    "zh_HK.UTF-8@radical",
+    "zh_HK.UTF-8@stroke",
+    "zh_HK.big5",
+    "zh_HK.utf8",
+    "zh_TW",
+    "zh_TW.BIG5",
+    "zh_TW.BIG5@pinyin",
+    "zh_TW.BIG5@radical",
+    "zh_TW.BIG5@stroke",
+    "zh_TW.BIG5@zhuyin",
+    "zh_TW.Big5",
+    "zh_TW.EUC",
+    "zh_TW.EUC@pinyin",
+    "zh_TW.EUC@radical",
+    "zh_TW.EUC@stroke",
+    "zh_TW.EUC@zhuyin",
+    "zh_TW.UTF-8",
+    "zh_TW.UTF-8@pinyin",
+    "zh_TW.UTF-8@radical",
+    "zh_TW.UTF-8@stroke",
+    "zh_TW.UTF-8@zhuyin",
+    "zh_TW.big5",
+    "zh_TW.ccdc",
+    "zh_TW.eucTW",
+    "zh_TW.euctw",
+    "zh_TW.utf8",
+
+    // Windows names
+    "ENU", "ENG", "ENA", "ENC", "ENZ", "ENI", "ENS", "ENJ", "ENB", "ENL",
+    "ENT", "BGR", "CSY", "DAN", "DEU", "DES", "DEA", "DEL", "DEC", "ELL",
+    "ESP", "ESM", "ESN", "ESG", "ESC", "ESA", "ESD", "ESV", "ESO", "ESR",
+    "ESS", "ESF", "ESL", "ESY", "ESZ", "ESB", "ESE", "ESH", "ESI", "ESU",
+    "FIN", "FRA", "FRB", "FRC", "FRS", "FRL", "HUN", "ISL", "ITA", "ITS",
+    "NLD", "NLB", "NOR", "NON", "PLK", "PTB", "PTG", "ROM", "RUS", "HRV",
+    "SRL", "SRB", "SKY", "SVE", "SVF", "TRK", "SLV", "AFK", "SQI", "EUQ",
+    "BEL", "CAT", "ETI", "FOS", "IND", "LVI", "LTH", "UKR"
+};
+
+const unsigned nlocales = sizeof test_locale_names / sizeof *test_locale_names;
+
+#endif   // LOCALE_NAMES_H_INCLUDED
diff --git a/etc/config/src/proclimits.h b/etc/config/src/proclimits.h
new file mode 100644
index 0000000..784caba
--- /dev/null
+++ b/etc/config/src/proclimits.h
@@ -0,0 +1,57 @@
+// proclimits.h must be included in .cpp file
+// only after #if[n]def _RWSTD_NO_SETRLIMIT line
+
+#if !defined (_RWSTD_NO_SETRLIMIT)
+
+#  include <sys/resource.h>   // for setrlimit()
+
+void limit_memory (unsigned long limit)
+{
+    struct rlimit rl = { limit, limit };
+    setrlimit (RLIMIT_DATA, &rl);
+}
+
+#elif defined (_WIN32)
+
+#  ifndef _WIN32_WINNT
+#    define _WIN32_WINNT 0x0500
+#  endif
+
+#  if _WIN32_WINNT >= 0x0500
+
+// Job Objects available only in Windows 2000 and later
+
+#    include <windows.h>
+
+void limit_memory (unsigned long limit)
+{
+    SYSTEM_INFO info;
+    GetSystemInfo (&info);
+
+    HANDLE hJob = CreateJobObject (NULL, NULL);
+    if (hJob) {
+        if (AssignProcessToJobObject (hJob, GetCurrentProcess ())) {
+            JOBOBJECT_EXTENDED_LIMIT_INFORMATION job_info = { 0 };
+            job_info.BasicLimitInformation.LimitFlags =
+                JOB_OBJECT_LIMIT_PROCESS_MEMORY;
+            job_info.ProcessMemoryLimit =
+                limit > info.dwPageSize ? limit : info.dwPageSize;
+            SetInformationJobObject (hJob,
+                                     JobObjectExtendedLimitInformation,
+                                     &job_info, sizeof (job_info));
+        }
+        CloseHandle (hJob);
+    }
+}
+
+#  else   // _WIN32_WINNT < 0x0500
+
+void limit_memory (unsigned long) { /* no-op */ }
+
+#  endif  // _WIN32_WINNT
+
+#else   // _RWSTD_NO_SETRLIMIT && !_WIN32
+
+void limit_memory (unsigned long) { /* no-op */ }
+
+#endif  // _RWSTD_NO_SETRLIMIT
diff --git a/etc/config/vacpp.config b/etc/config/vacpp.config
index 01c625f..9ac3c37 100644
--- a/etc/config/vacpp.config
+++ b/etc/config/vacpp.config
@@ -108,6 +108,12 @@
       PRELINKFLAGS += -Wl,-bh:5
     endif
     LDFLAGS      += -Wl,-bh:5
+  else
+    ifeq ($(CXX_MAJOR),6)
+      # also silence ld warning 0711-224 (Duplicate symbol) for shared
+      # library linking with VisualAge C++ 6.0 (see STDCXX-439)
+      LDFLAGS += -Wl,-bh:5
+    endif
   endif
 
   # disable assembly files on AIX but leave them enabled (at the default
@@ -148,7 +154,10 @@
 DEBUG_CXXFLAGS  = -g
 DEBUG_CPPFLAGS  =
 
-OPTMZ_CXXFLAGS  = -O -qinline
+# -O enables inlining of all functions declared inline
+# -Q (same as -qinline) enables inlining of all functions
+#    up to 20 statements big
+OPTMZ_CXXFLAGS  = -O -Q
 OPTMZ_CPPFLAGS  =
 
 # shared/archive library options
diff --git a/etc/config/windows/build.wsf b/etc/config/windows/build.wsf
index f01b609..17c76d5 100644
--- a/etc/config/windows/build.wsf
+++ b/etc/config/windows/build.wsf
@@ -73,20 +73,21 @@
     // clear output window
     outputPane.Clear();
 
-    // delete old BuildLog.htm
-    var path = Cfg.Evaluate(Cfg.IntermediateDirectory) + "\\BuildLog.htm";
-    if (fso.FileExists(path))
-        fso.DeleteFile(path);
+    if (null != Cfg)
+    {
+        // delete old BuildLog.htm
+        var path = Cfg.Evaluate(Cfg.IntermediateDirectory) + "\\BuildLog.htm";
+        if (fso.FileExists(path))
+            fso.DeleteFile(path);
+    }
 }
 
-function event_ProjectBuildFinished(Cfg, Warnings, Errors, Canceled)
+function getBuildLog(path)
 {
     var log = "";
 
     try
     {
-        // try get log from BuildLog.htm file
-        var path = Cfg.Evaluate(Cfg.IntermediateDirectory) + "\\BuildLog.htm";
         var ForReading = 1;
         var format = UNICODELOG ? -1 : 0;
         var logStrm = fso.OpenTextFile(path, ForReading, false, format);
@@ -99,10 +100,53 @@
     }
     catch (e)
     {
+        log = "";
+    }
+
+    return log;
+}
+
+function event_ProjectBuildFinished(Cfg, Warnings, Errors, Canceled)
+{
+    var log = "";
+    var htm = "BuildLog.htm";
+
+    if (null != Cfg)
+    {
+        try
+        {
+            // try get log from BuildLog.htm file
+            var path = Cfg.Evaluate(Cfg.IntermediateDirectory) + "\\" + htm;
+            log = getBuildLog(path);
+        }
+        catch (e)
+        {
+            log = "";
+        }
+    }
+
+    if (0 == log.length)
+    {
         // try get log from output window
         var sel = outputPane.TextDocument.Selection;
         sel.SelectAll();
         log = sel.Text;
+
+        // find BuildLoh.htm path
+        var proto = "file://";
+        var begin = log.indexOf(proto);
+        if (0 <= begin)
+        {
+            begin += proto.length;
+            var end = log.indexOf(htm, begin);
+            if (0 <= end)
+            {
+                var path = log.substring(begin, end + htm.length);
+                var log2 = getBuildLog(path);
+                if (0 < log2.length)
+                    log = log2;
+            }
+        }
     }
 
     WScript.Echo(log);
@@ -121,7 +165,18 @@
 
     if (null != projectFile)
     {
+        var isICC = 0 < projectFile.indexOf(".icproj");
+
+        if (isICC)
+            // event not invoked automatically for Intel projects
+            event_ProjectBuildStarted(null);
+
         solutionBuild.BuildProject(longConfName, projectFile, true);
+
+        if (isICC)
+            // event not invoked automatically for Intel projects
+            event_ProjectBuildFinished(null, 0, 0, 0);
+
         return solutionBuild.LastBuildInfo;
     }
 
@@ -168,7 +223,33 @@
         }
         
         var solutionBuild = solution.SolutionBuild;
-        projectEngine = solution.Projects.Item(1).Object.VCProjectEngine;
+
+        // fix 'Call was Rejected By Callee' error
+        // http://msdn2.microsoft.com/en-us/library/ms228772(vs.80).aspx
+        var ntimes = 60;
+        for (var i = 0; i < ntimes; ++i)
+        {
+            try
+            {
+                projectEngine = solution.Projects.Item(1).Object.VCProjectEngine;
+                break;
+            }
+            catch (e)
+            {
+                if (0 > e.description.indexOf("Call was rejected by callee")
+                    || i == ntimes - 1)
+                {
+                    WScript.StdErr.WriteLine("Build: " + e.description);
+                    retCode = 7;
+                    break;
+                }
+                else
+                    WScript.Sleep(1000);
+            }
+        }
+
+        if (retCode)
+            break;
         
         events = projectEngine.Events;
         try
diff --git a/etc/config/windows/configure.wsf b/etc/config/windows/configure.wsf
index 4296ce6..f34707c 100644
--- a/etc/config/windows/configure.wsf
+++ b/etc/config/windows/configure.wsf
@@ -79,6 +79,27 @@
 
 var description = new configure; // run
 
+// clean tests folder
+// print msg to the StdErr, if specified
+// quit with exitcode
+function cleanQuit(exitcode, msg)
+{
+    // clean Tests folder
+    if (fso.FolderExists(stageDir))
+    {
+        try
+        {
+            fso.DeleteFolder(stageDir, true);
+        }
+        catch (e) { }
+    }
+
+    if (typeof(msg) != "undefined")
+        WScript.StdErr.WriteLine(msg);
+
+    WScript.Quit(exitcode);
+}
+
 // the main function of the script
 function configure()
 {
@@ -231,13 +252,11 @@
                " /NODEFAULTLIB:libcpmt /NODEFAULTLIB:libcpmtd" +
                " /NODEFAULTLIB:msvcprt /NODEFAULTLIB:msvcprtd";
 
+    var exitmsg = "You may see log here: " + logFileNameURI;
+
     // sanity check
     if (0 == checkSanity())
-    {
-        WScript.StdErr.WriteLine(
-            "You may see log here: " + logFileNameURI);
-        WScript.Quit(1);
-    }
+        cleanQuit(1, exitmsg);
         
     // check architecture
     checkArchitecture();
@@ -247,22 +266,14 @@
 
     // compile .lib.cpp s
     if (0 == compileLibs(confInfo.dll))
-    {
-        WScript.StdErr.WriteLine(
-            "You may see log here: " + logFileNameURI);
-        WScript.Quit(1);
-    }
+        cleanQuit(1, exitmsg);
     
     // compile, link and run .cpp's (if possible)
     if (0 == runExeTests())
-    {
-        WScript.StdErr.WriteLine(
-            "You may see log here: " + logFileNameURI);
-        WScript.Quit(1);
-    }
+        cleanQuit(1, exitmsg);
     
-    fso.MoveFile(stageFile , configFile);
-    WScript.Quit(0);
+    fso.MoveFile(stageFile, configFile);
+    cleanQuit(0);
 }
 
 // performs compiler and linker sanity checks
diff --git a/etc/config/windows/generate.wsf b/etc/config/windows/generate.wsf
index c18f152..5e9e64d 100644
--- a/etc/config/windows/generate.wsf
+++ b/etc/config/windows/generate.wsf
@@ -86,8 +86,14 @@
 // the replacement of the WScript.Echo()
 function Echo(msg)
 {
-    // WScript.Echo(msg);
-    WScript.StdOut.WriteLine(msg);
+    try
+    {
+        // WScript.Echo(msg);
+        WScript.StdOut.WriteLine(msg);
+    }
+    catch(e)
+    {
+    }
 }
 
 // print message to the stdout and out the message to the logfile
diff --git a/etc/config/windows/projects.js b/etc/config/windows/projects.js
index 8e4dc51..caef2e9 100644
--- a/etc/config/windows/projects.js
+++ b/etc/config/windows/projects.js
@@ -86,6 +86,7 @@
 ///////////////////////////////////////////////////////////////////////////////
     var stdcxxDef = new ProjectDef(".stdcxx", typeLibrary);
     stdcxxDef.VCProjDir = ProjectsDir;
+    stdcxxDef.RTTI = true;
     stdcxxDef.FilterDefs.push(
         new FilterDef(sourceFilterName, sourceFilterUuid, sourceFilterExts, eFileTypeCppCode, false).
             addFilesByMask("%SRCDIR%\\src", rxExcludedFolders, null));
@@ -247,7 +248,9 @@
         "if exist \"$(OutDir)\\runexamples.log\" del \"$(OutDir)\\runexamples.log\"";
     runexamplesDef.CustomBuildFile = "runall.wsf";
     runexamplesDef.CustomBuildCmd =
-        "set PATH=$(SolutionDir)%CONFIG%\\lib;%PATH%\r\n" +
+        "set PATH=$(SolutionDir)%CONFIG%\\bin;$(SolutionDir)%CONFIG%\\lib;" +
+        "%SRCDIR%\\examples\\manual;%PATH%\r\n" +
+        "set TZ=MST+7\r\n" +
         "cscript /nologo \"%CUSTOMFILE%\"" +
         " /INOUTDIR:\"%SRCDIR%\\examples\"" +
         " /EXEDIR:\"$(OutDir)\"" +
@@ -266,6 +269,7 @@
 
     var testTplDef = new ProjectDef(null, typeApplication);
     testTplDef.VCProjDir = ProjectsDir + "\\tests";
+    testTplDef.RTTI = true;
     testTplDef.Defines = commonDefines;
     testTplDef.Includes = rwtestIncludes;
     testTplDef.OutDir = "$(SolutionDir)%CONFIG%\\tests";
@@ -307,7 +311,7 @@
         "if exist \"$(OutDir)\\runtests.log\" del \"$(OutDir)\\runtests.log\"";
     runtestsDef.CustomBuildFile = "runall.wsf";
     runtestsDef.CustomBuildCmd =
-        "set PATH=$(SolutionDir)%CONFIG%\\lib;%PATH%\r\n" +
+        "set PATH=$(SolutionDir)%CONFIG%\\bin;$(SolutionDir)%CONFIG%\\lib;%PATH%\r\n" +
         "cscript /nologo \"%CUSTOMFILE%\"" +
         " /EXEDIR:\"$(OutDir)\"" +
         " /PRJDIR:\"" + runtestsDef.VCProjDir + "\"" +
@@ -385,7 +389,7 @@
                           "summary.js")));
     testlocaleTplDef.CustomBuildFile = "runall.wsf";
     testlocaleTplDef.CustomBuildCmd =
-        "set PATH=$(SolutionDir)%CONFIG%\\lib;%PATH%\r\n" +
+        "set PATH=$(SolutionDir)%CONFIG%\\bin;$(SolutionDir)%CONFIG%\\lib;%PATH%\r\n" +
         "cscript /nologo \"%CUSTOMFILE%\"" +
         " /EXEDIR:\"$(OutDir)\"" +
         " /CONFIG:\"%SOLUTION%\"" +
diff --git a/etc/config/windows/runall.wsf b/etc/config/windows/runall.wsf
index e65312a..fde9836 100644
--- a/etc/config/windows/runall.wsf
+++ b/etc/config/windows/runall.wsf
@@ -36,8 +36,6 @@
                 required="false" type="string"/>
             <named helpstring="Run tests in compat mode" name="COMPAT" 
                 required="false" type="string"/>
-            <named helpstring="The lib dll folder" name="LIBDIR" 
-                required="false" type="string"/>
             <named helpstring="The examples extension" name="EXT" 
                 required="false" type="string"/>
             <example>
@@ -48,7 +46,7 @@
             <usage>
 Usage: cscript runexamples.wsf /EXEDIR:@EXEDIR /CONFIG:@CONFIG
 [/PRJDIR:@PRJDIR] [/INOUTDIR:@INOUTDIR] [/LOGFILE:@LOGFILE]
-[/COMPAT] [/LIBDIR:@LIBDIR] [/EXT:@EXT]
+[/COMPAT] [/EXT:@EXT]
 where
 @EXEDIR is the root directory with executables to be run and checked,
 @PRJDIR is the directory with .vcproj files of the executables,
@@ -57,7 +55,6 @@
 @CONFIG is the compiler configuration (msvc-7.1, icc-9.0, etc),
 @LOGFILE is the log file name,
 @COMPAT is the option for run tests in compat mode,
-@LIBDIR is the library dll folder,
 @EXT is the extension of the example files, default value: "exe".
             </usage>
         </runtime>
@@ -80,7 +77,6 @@
 var logFileName = ""; // the log file name
 var logFileDefault = "runexamples.log"; // the default log file name
 var compatMode = false;
-var libdllFolder = "";
 var ext = "exe";
 
 var varOut = "out";
@@ -97,7 +93,6 @@
 var buildlogFile = "BuildLog.htm";
 var summaryFileName = "Summary.htm";
 var htmFolderName = "temphtm";
-var libFileName = "libstd";
 
 var utlExec = "exec.exe";
 var unicodeLog = false;
@@ -165,8 +160,6 @@
     if (WScript.Arguments.Named.Exists("INOUTDIR"))
         inoutDir =  WScript.Arguments.Named("INOUTDIR");
 
-    utlExec = examplesDir + "\\..\\bin\\" + utlExec;
-    
     if (WScript.Arguments.Named.Exists("LOGFILE"))
         logFileName = WScript.Arguments.Named("LOGFILE");
     else
@@ -175,9 +168,6 @@
     if (WScript.Arguments.Named.Exists("COMPAT"))
         compatMode = true;
     
-    if (WScript.Arguments.Named.Exists("LIBDIR"))
-        libdllFolder = WScript.Arguments.Named("LIBDIR");
-    
     if (WScript.Arguments.Named.Exists("EXT"))
         ext = WScript.Arguments.Named("EXT");
     
@@ -308,7 +298,8 @@
         itemInfo.exitCode = parseStatus(itemInfo.name + "." + exeExt, execOut);
         switch (itemInfo.exitCode)
         {
-        case 0:  // OK
+        case  0: // OK
+        case -7: // OUTPUT
             ++exRunSucceeded;
             fileLog.WriteLine(itemInfo.name + " completed successfully, exit code " +
                 itemInfo.exitCode);
@@ -351,8 +342,8 @@
 {
     var res = 0;
 
-    // maxNameLen is the length of the "NAME" column in the exec utility output
-    var maxNameLen = 25;
+    // maxNameLen is the width of the "NAME" column in the exec utility output
+    var maxNameLen = 30;
     var pos = execOut.indexOf(exeName.substr(0, maxNameLen));
     if (0 <= pos)
     {
@@ -378,6 +369,9 @@
             case "  LINK":
                 res = -6;
                 break;
+            case "OUTPUT":
+                res = -7;
+                break;
             default:
                 res = -1;
             }
diff --git a/etc/config/windows/summary.js b/etc/config/windows/summary.js
index a18e849..adaef56 100644
--- a/etc/config/windows/summary.js
+++ b/etc/config/windows/summary.js
@@ -68,7 +68,7 @@
         return;
     }
 
-    var blogData = blogFile.ReadAll();
+    var blogData = blogFile.AtEndOfStream ? "" : blogFile.ReadAll();
     
     var posTmp = getCommandLinesInfo(itemInfo, blogData, 0);
     posTmp = getCompilationInfo(itemInfo, blogData, posTmp);
@@ -665,7 +665,7 @@
         var blogFile = 
             fso.OpenTextFile(testFolder.Path + "\\" + htmFileName, 
                              1, false, uniMode);
-        var blogData = blogFile.ReadAll();
+        var blogData = blogFile.AtEndOfStream ? "" : blogFile.ReadAll();
     
         var posTmp = getCommandLinesInfo(testInfo, blogData, 0);
         posTmp = getCompilationInfo(testInfo, blogData, posTmp);
diff --git a/etc/config/windows/utilities.js b/etc/config/windows/utilities.js
index 506bbd1..bd6e24f 100644
--- a/etc/config/windows/utilities.js
+++ b/etc/config/windows/utilities.js
@@ -320,7 +320,10 @@
            .replace(new RegExp("><", "g"), ">\r\n<")
            .replace(new RegExp("(^<[\\s\\S]+?>)", "gm"), "")
            .replace(new RegExp("\r", "g"), "")
-           .replace(new RegExp("\n{2,}", "g"), "\n\n");
+           .replace(new RegExp("\n{2,}", "g"), "\n\n")
+           .replace(new RegExp("</pre>", "g"), "")
+           .replace(new RegExp("</h3>", "g"), "")
+           .replace(new RegExp("</font>", "g"), "");
 }
 
 // returns source string without first character if it equal to symbol
diff --git a/etc/config/xlC_version.sh b/etc/config/xlC_version.sh
index 238a3b0..82af8bd 100755
--- a/etc/config/xlC_version.sh
+++ b/etc/config/xlC_version.sh
@@ -2,7 +2,31 @@
 #
 # $Id$
 #
-# prints VisualAge version
+# prints IBM VisualAge and XLC/C++ version
+#
+# reported versions and patches they correspond to:
+#
+# version    release/patch
+# --------   -------------
+# 6.0.0.0    VisualAge 6
+# 6.0.0.14   VisualAge 6, Septemmber 2005 PTF
+# 6.0.0.17   VisualAge 6, November 2006 PTF
+# 7.0        VisualAge 7
+# 7.0.0.1    VisualAge 7 November 2004 PTF
+# 7.0.0.2    VisualAge 7 May 2005 PTF
+# 7.0.0.3    VisualAge 7 Aug 2005 PTF
+# 7.0.0.4    ???
+# 7.0.0.5    VisualAge 7 January 2006 PTF
+# 7.0.0.6    VisualAge 7 April 2006 PTF
+# 7.0.0.7    VisualAge 7 August 2006 PTF
+# 7.0.0.8    VisualAge 7 October 2006 PTF
+# 7.0.0.9    VisualAge 7 Feb 2007 PTF
+# 8.0.0.0    XLC/C++ 8
+# 8.0.0.1    XLC/C++ 8 March 2006 PTF
+# 8.0.0.10   XLC/C++ 8 June 2006 PTF
+# 8.0.0.11   XLC/C++ 8 August 2006 PTF
+# 8.0.0.12   XLC/C++ 8 December 2006 PTF
+# 8.0.0.13   XLC/C++ 8 February 2007 PTF
 
 if [ $# -gt 0 ]; then
     CXX=$1
@@ -28,11 +52,19 @@
     exit
 fi
 
+# check to see if this is the base 7.0
 grep "V7" $xlcout > /dev/null 2>&1
+v7_or_6=$?
 
-if [ $? -eq 0 ]; then
+if [ $v7_or_6 -ne 0 ]; then
+    # if it's not 7.0 see if it's 6.0
+    grep "version 6.0" $xlcout > /dev/null 2>&1
+    v7_or_6=$?
+fi
 
-    # VisualAge 7.0 (unpatched)
+if [ $v7_or_6 -eq 0 ]; then
+
+    # VisualAge 6.0 or 7.0 (unpatched)
     tmpsrc=/tmp/$CXX_version.$$.cpp
     tmpobj=/tmp/$CXX_version.$$.o
 
@@ -59,7 +91,7 @@
     exit
 fi
 
-# VisualAge 6.0 (and prior?)
+# VisualAge 5.0 (and prior?)
 echo >> $xlcout
 sed "s/.*version \(.*\)/\1/" $xlcout
 rm $xlcout
diff --git a/etc/nls/gen_list b/etc/nls/gen_list
index 3102bb0..7d05013 100644
--- a/etc/nls/gen_list
+++ b/etc/nls/gen_list
@@ -32,6 +32,7 @@
 de_BE.euro          ISO-8859-15         
 de_CH               ISO-8859-1          
 de_DE               ISO-8859-1          
+de_DE               UTF-8
 de_DE.euro          ISO-8859-15         
 de_LU               ISO-8859-1          
 de_LU.euro          ISO-8859-15         
@@ -50,6 +51,7 @@
 en_SG               ISO-8859-1          
 en_US               ISO-8859-1          
 en_US               ANSI_X3.4-1968
+en_US               UTF-8
 en_ZA               ISO-8859-1          
 en_ZW               ISO-8859-1          
 es_AR               ISO-8859-1          
@@ -85,6 +87,7 @@
 fr_CA               ISO-8859-1          
 fr_CH               ISO-8859-1          
 fr_FR               ISO-8859-1          
+fr_FR               UTF-8
 fr_FR.euro          ISO-8859-15         
 fr_LU               ISO-8859-1          
 fr_LU.euro          ISO-8859-15         
@@ -132,6 +135,7 @@
 ro_RO               ISO-8859-2          
 ru_RU               ISO-8859-5          
 ru_RU               KOI8-R              
+ru_RU               UTF-8
 ru_UA               KOI8-U              
 sk_SK               ISO-8859-2          
 sl_SI               ISO-8859-2          
@@ -155,6 +159,7 @@
 zh_CN               GB2312              
 zh_CN               GB18030             
 zh_CN               GBK                 
+zh_CN               UTF-8
 zh_HK               BIG5-HKSCS          
 zh_TW               BIG5                
 zh_TW               EUC-TW              
diff --git a/etc/nls/posix/charmaps/ascii.cm b/etc/nls/posix/charmaps/ascii.cm
index a582d8b..c9db278 100644
--- a/etc/nls/posix/charmaps/ascii.cm
+++ b/etc/nls/posix/charmaps/ascii.cm
@@ -8,15 +8,172 @@
 #
 ###########################################################################
 # 
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
- * 
- **************************************************************************/
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 2001-2007 Rogue Wave Software.
+#
+###########################################################################
+
+<code_set_name>                 "ascii"
+<mb_cur_max>                    1
+<mb_cur_min>                    1
+<escape_char>                   \\
+<comment_char>                  #
+
+CHARMAP
+
+# POSIX portable character set
+
+<NUL>                   \x00
+<SOH>                   \x01
+<STX>                   \x02
+<ETX>                   \x03
+<EOT>                   \x04
+<ENQ>                   \x05
+<ACK>                   \x06
+<BEL>                   \x07
+<alert>                 \x07
+<backspace>             \x08
+<tab>                   \x09
+<newline>               \x0A
+<vertical-tab>          \x0B
+<form-feed>             \x0C
+<carriage-return>       \x0D
+<SO>                    \x0E
+<SI>                    \x0F
+<DLE>                   \x10
+<DC1>                   \x11
+<DC2>                   \x12
+<DC3>                   \x13
+<DC4>                   \x14
+<NAK>                   \x15
+<SYN>                   \x16
+<ETB>                   \x17
+<CAN>                   \x18
+<EM>                    \x19
+<SUB>                   \x1a
+<ESC>                   \x1b
+<IS4>                   \x1c
+<IS3>                   \x1d
+<IS2>                   \x1e
+<IS1>                   \x1f
+<space>                 \x20
+<exclamation-mark>      \x21
+<quotation-mark>        \x22
+<number-sign>           \x23
+<dollar-sign>           \x24
+<percent-sign>          \x25
+<ampersand>             \x26
+<apostrophe>            \x27
+<left-parenthesis>      \x28
+<right-parenthesis>     \x29
+<asterisk>              \x2A
+<plus-sign>             \x2B
+<comma>                 \x2C
+<hyphen-minus>          \x2D
+<hyphen>                \x2D
+<full-stop>             \x2E
+<period>                \x2E
+<slash>                 \x2F
+<solidus>               \x2F
+<zero>                  \x30
+<one>                   \x31
+<two>                   \x32
+<three>                 \x33
+<four>                  \x34
+<five>                  \x35
+<six>                   \x36
+<seven>                 \x37
+<eight>                 \x38
+<nine>                  \x39
+<colon>                 \x3A
+<semicolon>             \x3B
+<less-than-sign>        \x3C
+<equals-sign>           \x3D
+<greater-than-sign>     \x3E
+<question-mark>         \x3F
+<commercial-at>         \x40
+<A>                     \x41
+<B>                     \x42
+<C>                     \x43
+<D>                     \x44
+<E>                     \x45
+<F>                     \x46
+<G>                     \x47
+<H>                     \x48
+<I>                     \x49
+<J>                     \x4A
+<K>                     \x4B
+<L>                     \x4C
+<M>                     \x4D
+<N>                     \x4E
+<O>                     \x4F
+<P>                     \x50
+<Q>                     \x51
+<R>                     \x52
+<S>                     \x53
+<T>                     \x54
+<U>                     \x55
+<V>                     \x56
+<W>                     \x57
+<X>                     \x58
+<Y>                     \x59
+<Z>                     \x5A
+<left-square-bracket>   \x5B
+<backslash>             \x5C
+<reverse-solidus>       \x5C
+<right-square-bracket>  \x5D
+<circumflex-accent>     \x5E
+<circumflex>            \x5E
+<low-line>              \x5F
+<underscore>            \x5F
+<grave-accent>          \x60
+<a>                     \x61
+<b>                     \x62
+<c>                     \x63
+<d>                     \x64
+<e>                     \x65
+<f>                     \x66
+<g>                     \x67
+<h>                     \x68
+<i>                     \x69
+<j>                     \x6A
+<k>                     \x6B
+<l>                     \x6C
+<m>                     \x6D
+<n>                     \x6E
+<o>                     \x6F
+<p>                     \x70
+<q>                     \x71
+<r>                     \x72
+<s>                     \x73
+<t>                     \x74
+<u>                     \x75
+<v>                     \x76
+<w>                     \x77
+<x>                     \x78
+<y>                     \x79
+<z>                     \x7A
+<left-brace>            \x7B
+<left-curly-bracket>    \x7B
+<vertical-line>         \x7C
+<right-brace>           \x7D
+<right-curly-bracket>   \x7D
+<tilde>                 \x7E
+<DEL>                   \x7F
+
+END CHARMAP
diff --git a/etc/nls/posix/src/C.src b/etc/nls/posix/src/C.src
index dcf1e39..ee74d41 100644
--- a/etc/nls/posix/src/C.src
+++ b/etc/nls/posix/src/C.src
@@ -8,15 +8,316 @@
 #
 ###########################################################################
 # 
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
- * 
- **************************************************************************/
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 2001-2007 Rogue Wave Software.
+#
+###########################################################################
+
+
+LC_CTYPE
+# The following is the POSIX locale LC_CTYPE.
+# "alpha" is by default "upper" and "lower"
+# "alnum" is by definition "alpha" and "digit"
+# "print" is by default "alnum", "punct", and the <space>
+# "graph" is by default "alnum" and "punct"
+#
+upper <A>;<B>;<C>;<D>;<E>;<F>;<G>;<H>;<I>;<J>;<K>;<L>;<M>;\
+<N>;<O>;<P>;<Q>;<R>;<S>;<T>;<U>;<V>;<W>;<X>;<Y>;<Z>
+
+#
+lower <a>;<b>;<c>;<d>;<e>;<f>;<g>;<h>;<i>;<j>;<k>;<l>;<m>;\
+<n>;<o>;<p>;<q>;<r>;<s>;<t>;<u>;<v>;<w>;<x>;<y>;<z>
+#
+
+digit <zero>;<one>;<two>;<three>;<four>;<five>;<six>;\
+<seven>;<eight>;<nine>
+#
+
+space <tab>;<newline>;<vertical-tab>;<form-feed>;\
+<carriage-return>;<space>
+#
+
+cntrl <alert>;<backspace>;<tab>;<newline>;<vertical-tab>;\
+<form-feed>;<carriage-return>;\
+<NUL>;<SOH>;<STX>;<ETX>;<EOT>;<ENQ>;<ACK>;<SO>;\
+<SI>;<DLE>;<DC1>;<DC2>;<DC3>;<DC4>;<NAK>;<SYN>;\
+<ETB>;<CAN>;<EM>;<SUB>;<ESC>;<IS4>;<IS3>;<IS2>;\
+<IS1>;<DEL>
+
+#
+punct <exclamation-mark>;<quotation-mark>;<number-sign>;\
+<dollar-sign>;<percent-sign>;<ampersand>;<apostrophe>;\
+<left-parenthesis>;<right-parenthesis>;<asterisk>;\
+<plus-sign>;<comma>;<hyphen>;<period>;<slash>;\
+<colon>;<semicolon>;<less-than-sign>;<equals-sign>;\
+<greater-than-sign>;<question-mark>;<commercial-at>;\
+<left-square-bracket>;<backslash>;<right-square-bracket>;\
+<circumflex>;<underscore>;<grave-accent>;<left-curly-bracket>;\
+<vertical-line>;<right-curly-bracket>;<tilde>
+
+#
+xdigit <zero>;<one>;<two>;<three>;<four>;<five>;<six>;<seven>;\
+<eight>;<nine>;<A>;<B>;<C>;<D>;<E>;<F>;<a>;<b>;<c>;<d>;<e>;<f>
+
+#
+blank <space>;<tab>
+
+#
+toupper (<a>,<A>);(<b>,<B>);(<c>,<C>);(<d>,<D>);(<e>,<E>);\
+(<f>,<F>);(<g>,<G>);(<h>,<H>);(<i>,<I>);(<j>,<J>);\
+(<k>,<K>);(<l>,<L>);(<m>,<M>);(<n>,<N>);(<o>,<O>);\
+(<p>,<P>);(<q>,<Q>);(<r>,<R>);(<s>,<S>);(<t>,<T>);\
+(<u>,<U>);(<v>,<V>);(<w>,<W>);(<x>,<X>);(<y>,<Y>);(<z>,<Z>)
+
+#
+tolower (<A>,<a>);(<B>,<b>);(<C>,<c>);(<D>,<d>);(<E>,<e>);\
+(<F>,<f>);(<G>,<g>);(<H>,<h>);(<I>,<i>);(<J>,<j>);\
+(<K>,<k>);(<L>,<l>);(<M>,<m>);(<N>,<n>);(<O>,<o>);\
+(<P>,<p>);(<Q>,<q>);(<R>,<r>);(<S>,<s>);(<T>,<t>);\
+(<U>,<u>);(<V>,<v>);(<W>,<w>);(<X>,<x>);(<Y>,<y>);(<Z>,<z>)
+END LC_CTYPE
+
+
+LC_COLLATE
+# This is the POSIX locale definition for the LC_COLLATE category.
+# The order is the same as in the ASCII codeset.
+order_start forward
+<NUL>
+<SOH>
+<STX>
+<ETX>
+<EOT>
+<ENQ>
+<ACK>
+<alert>
+<backspace>
+<tab>
+<newline>
+<vertical-tab>
+<form-feed>
+<carriage-return>
+<SO>
+<SI>
+<DLE>
+<DC1>
+<DC2>
+<DC3>
+<DC4>
+<NAK>
+<SYN>
+<ETB>
+<CAN>
+<EM>
+<SUB>
+<ESC>
+<IS4>
+<IS3>
+<IS2>
+<IS1>
+<space>
+<exclamation-mark>
+<quotation-mark>
+<number-sign>
+<dollar-sign>
+<percent-sign>
+<ampersand>
+<apostrophe>
+<left-parenthesis>
+<right-parenthesis>
+<asterisk>
+<plus-sign>
+<comma>
+<hyphen>
+<period>
+<slash>
+<zero>
+<one>
+<two>
+<three>
+<four>
+<five>
+<six>
+<seven>
+<eight>
+<nine>
+<colon>
+<semicolon>
+<less-than-sign>
+<equals-sign>
+<greater-than-sign>
+<question-mark>
+<commercial-at>
+<A>
+<B>
+<C>
+<D>
+<E>
+<F>
+<G>
+<H>
+<I>
+<J>
+<K>
+<L>
+<M>
+<N>
+<O>
+<P>
+<Q>
+<R>
+<S>
+<T>
+<U>
+<V>
+<W>
+<X>
+<Y>
+<Z>
+<left-square-bracket>
+<backslash>
+<right-square-bracket>
+<circumflex>
+<underscore>
+<grave-accent>
+<a>
+<b>
+<c>
+<d>
+<e>
+<f>
+<g>
+<h>
+<i>
+<j>
+<k>
+<l>
+<m>
+<n>
+<o>
+<p>
+<q>
+<r>
+<s>
+<t>
+<u>
+<v>
+<w>
+<x>
+<y>
+<z>
+<left-curly-bracket>
+<vertical-line>
+<right-curly-bracket>
+<tilde>
+<DEL>
+order_end
+#
+END LC_COLLATE
+
+
+LC_MONETARY
+# This is the POSIX locale definition for
+# the LC_MONETARY category.
+#
+int_curr_symbol ""
+currency_symbol ""
+mon_decimal_point ""
+mon_thousands_sep ""
+mon_grouping -1
+positive_sign ""
+negative_sign ""
+int_frac_digits -1
+frac_digits -1
+p_cs_precedes -1
+p_sep_by_space -1
+n_cs_precedes -1
+n_sep_by_space -1
+p_sign_posn -1
+n_sign_posn -1
+#
+END LC_MONETARY
+
+
+LC_NUMERIC
+# This is the POSIX locale definition for
+# the LC_NUMERIC category.
+#
+decimal_point "<period>"
+thousands_sep ""
+grouping -1
+#
+END LC_NUMERIC
+
+
+LC_MESSAGES
+# This is the POSIX locale definition for
+# the LC_MESSAGES category.
+#
+yesexpr "<circumflex><left-square-bracket><y><Y><right-square-bracket>"
+#
+noexpr "<circumflex><left-square-bracket><n><N><right-square-bracket>"
+#
+END LC_MESSAGES
+
+
+LC_TIME
+# This is the POSIX locale definition for
+# the LC_TIME category.
+#
+# Abbreviated weekday names (%a)
+abday "<S><u><n>";"<M><o><n>";"<T><u><e>";"<W><e><d>";\
+"<T><h><u>";"<F><r><i>";"<S><a><t>"
+#
+# Full weekday names (%A)
+day "<S><u><n><d><a><y>";"<M><o><n><d><a><y>";\
+"<T><u><e><s><d><a><y>";"<W><e><d><n><e><s><d><a><y>";\
+"<T><h><u><r><s><d><a><y>";"<F><r><i><d><a><y>";\
+"<S><a><t><u><r><d><a><y>"
+#
+# Abbreviated month names (%b)
+abmon "<J><a><n>";"<F><e><b>";"<M><a><r>";\
+"<A><p><r>";"<M><a><y>";"<J><u><n>";\
+"<J><u><l>";"<A><u><g>";"<S><e><p>";\
+"<O><c><t>";"<N><o><v>";"<D><e><c>"
+#
+# Full month names (%B)
+mon "<J><a><n><u><a><r><y>";"<F><e><b><r><u><a><r><y>";\
+"<M><a><r><c><h>";"<A><p><r><i><l>";\
+"<M><a><y>";"<J><u><n><e>";\
+"<J><u><l><y>";"<A><u><g><u><s><t>";\
+"<S><e><p><t><e><m><b><e><r>";"<O><c><t><o><b><e><r>";\
+"<N><o><v><e><m><b><e><r>";"<D><e><c><e><m><b><e><r>"
+#
+# Equivalent of AM/PM (%p) "AM";"PM"
+am_pm "<A><M>";"<P><M>"
+#
+# Appropriate date and time representation (%c)
+# "%a %b %e %H:%M:%S %Y"
+d_t_fmt "<percent-sign><a><space><percent-sign><b><space><percent-sign><e><space><percent-sign><H><colon><percent-sign><M><colon><percent-sign><S><space><percent-sign><Y>"
+#
+# Appropriate date representation (%x) "%m/%d/%y"
+d_fmt "<percent-sign><m><slash><percent-sign><d><slash><percent-sign><y>"
+#
+# Appropriate time representation (%X) "%H:%M:%S"
+t_fmt "<percent-sign><H><colon><percent-sign><M><colon><percent-sign><S>"
+#
+# Appropriate 12-hour time representation (%r) "%I:%M:%S %p"
+t_fmt_ampm "<percent-sign><I><colon><percent-sign><M><colon><percent-sign><S><space><percent-sign><p>"
+#
+END LC_TIME
+
diff --git a/examples/include/alg3.h b/examples/include/alg3.h
index b0d4d68..d750035 100644
--- a/examples/include/alg3.h
+++ b/examples/include/alg3.h
@@ -3,20 +3,27 @@
  * alg3.h - Header for sample programs for STL generic algorihtms
  *          that modify their arguments in place.
  *
- * $Id: //stdlib/dev/examples/stdlib/include/alg3.h#7 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/include/codecvte.h b/examples/include/codecvte.h
index a6fa57a..c7e09e2 100644
--- a/examples/include/codecvte.h
+++ b/examples/include/codecvte.h
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/include/examples.h b/examples/include/examples.h
index d94bfb6..46a92c4 100644
--- a/examples/include/examples.h
+++ b/examples/include/examples.h
@@ -6,20 +6,27 @@
  * The goal of this file is to allow completely conforming syntax
  * in examples' code even with non-conforming compilers.
  *
- * $Id: //stdlib/dev/examples/stdlib/include/examples.h#26 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/include/memfunref.h b/examples/include/memfunref.h
index 400330b..bbc6296 100644
--- a/examples/include/memfunref.h
+++ b/examples/include/memfunref.h
@@ -3,20 +3,27 @@
  * memfunref.h - Header for example program for mem_fun and other 
  * member function reference wrappers.  See Class Reference Section
  *
- * $Id: //stdlib/dev/examples/stdlib/include/memfunref.h#8 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/include/replace.h b/examples/include/replace.h
index 0154284..b142d3b 100644
--- a/examples/include/replace.h
+++ b/examples/include/replace.h
@@ -2,20 +2,27 @@
  *
  * replace.h - Header for example program of replace algorithm 
  *
- * $Id: //stdlib/dev/examples/stdlib/include/replace.h#7 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/include/rwstdmessages.h b/examples/include/rwstdmessages.h
index 512ffba..82f0bab 100644
--- a/examples/include/rwstdmessages.h
+++ b/examples/include/rwstdmessages.h
@@ -2,20 +2,27 @@
  *
  * rwstdmessages.h - indices for error messages
  *
- * $Id: //stdlib/dev/examples/stdlib/include/rwstdmessages.h#8 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/include/stocks.h b/examples/include/stocks.h
index 4bc0542..b793b12 100644
--- a/examples/include/stocks.h
+++ b/examples/include/stocks.h
@@ -2,20 +2,27 @@
  *
  * stocks.h - Stocks program.
  *
- * $Id: //stdlib/dev/examples/stdlib/include/stocks.h#15 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/include/teller.h b/examples/include/teller.h
index dc49ce8..9011c7d 100644
--- a/examples/include/teller.h
+++ b/examples/include/teller.h
@@ -2,20 +2,27 @@
  *
  * teller.h - Header for bank teller sample program.
  *
- * $Id: //stdlib/dev/examples/stdlib/include/teller.h#7 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/include/valarray.h b/examples/include/valarray.h
index 3bcff12..fe74a52 100644
--- a/examples/include/valarray.h
+++ b/examples/include/valarray.h
@@ -3,20 +3,27 @@
  * valarray.h -- Header for valarray examples.
  *               Provides a valarray stream inserter.
  *
- * $Id: //stdlib/dev/examples/stdlib/include/valarray.h#13 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/include/widwork.h b/examples/include/widwork.h
index d620c3d..8ec93d4 100644
--- a/examples/include/widwork.h
+++ b/examples/include/widwork.h
@@ -4,16 +4,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/accumulate.cpp b/examples/manual/accumulate.cpp
index 48f4975..e1eb447 100644
--- a/examples/manual/accumulate.cpp
+++ b/examples/manual/accumulate.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/adj_diff.cpp b/examples/manual/adj_diff.cpp
index 1e94299..95a87b2 100644
--- a/examples/manual/adj_diff.cpp
+++ b/examples/manual/adj_diff.cpp
@@ -2,20 +2,27 @@
  *
  * adj_diff.cpp - Example program for adjacent_difference. 
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/adj_diff.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/advance.cpp b/examples/manual/advance.cpp
index ebaece0..29e123f 100644
--- a/examples/manual/advance.cpp
+++ b/examples/manual/advance.cpp
@@ -2,20 +2,27 @@
  *
  * advance.cpp - Example program for advancing iterators. 
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/advance.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/auto_ptr.cpp b/examples/manual/auto_ptr.cpp
index 048eb73..47c65c8 100644
--- a/examples/manual/auto_ptr.cpp
+++ b/examples/manual/auto_ptr.cpp
@@ -2,20 +2,27 @@
  *
  * auto_ptr.cpp - Example program of auto_ptr.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/auto_ptr.cpp#10 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/binders.cpp b/examples/manual/binders.cpp
index b2e640d..e1e118f 100644
--- a/examples/manual/binders.cpp
+++ b/examples/manual/binders.cpp
@@ -2,20 +2,27 @@
  *
  * binders.cpp - Example program for binder1st & binder2nd.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/binders.cpp#13 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/bitset.cpp b/examples/manual/bitset.cpp
index 693fe2a..72ff665 100644
--- a/examples/manual/bitset.cpp
+++ b/examples/manual/bitset.cpp
@@ -2,20 +2,27 @@
  *
  * bitset.cpp - Example program for bitset.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/bitset.cpp#13 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/codecvt1.cpp b/examples/manual/codecvt1.cpp
index 45cd46d..5df02fc 100644
--- a/examples/manual/codecvt1.cpp
+++ b/examples/manual/codecvt1.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/collate.cpp b/examples/manual/collate.cpp
index 9cbcafd..281259b 100644
--- a/examples/manual/collate.cpp
+++ b/examples/manual/collate.cpp
@@ -2,20 +2,27 @@
  *
  * collate.cpp - Example program of collate facet. 
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/collate.cpp#15 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/complex.cpp b/examples/manual/complex.cpp
index 6d6b2c0..370f9de 100644
--- a/examples/manual/complex.cpp
+++ b/examples/manual/complex.cpp
@@ -2,20 +2,27 @@
  *
  * complex.cpp - Example program for complex.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/complex.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/copyex.cpp b/examples/manual/copyex.cpp
index 3eb30e0..7e6e7b2 100644
--- a/examples/manual/copyex.cpp
+++ b/examples/manual/copyex.cpp
@@ -2,20 +2,27 @@
  *
  * copyex.cpp - Example program for copy.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/copyex.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/count.cpp b/examples/manual/count.cpp
index 16fd0b1..2f49906 100644
--- a/examples/manual/count.cpp
+++ b/examples/manual/count.cpp
@@ -2,20 +2,27 @@
  *
  * count.cpp - Example program for counting number of elements in container. 
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/count.cpp#13 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/ctype.cpp b/examples/manual/ctype.cpp
index 05a27af..18c7f8c 100644
--- a/examples/manual/ctype.cpp
+++ b/examples/manual/ctype.cpp
@@ -2,20 +2,27 @@
  *
  * ctype.cpp - Example program of ctype facet. 
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/ctype.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
  
diff --git a/examples/manual/deque.cpp b/examples/manual/deque.cpp
index b10e04b..0c22895 100644
--- a/examples/manual/deque.cpp
+++ b/examples/manual/deque.cpp
@@ -2,20 +2,27 @@
  *
  * deque.cpp - Example program for deque class.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/deque.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/distance.cpp b/examples/manual/distance.cpp
index bf8c6b5..cdbf379 100644
--- a/examples/manual/distance.cpp
+++ b/examples/manual/distance.cpp
@@ -2,20 +2,27 @@
  *
  * distance.cpp - Example program for distance between two iterators.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/distance.cpp#14 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/equal.cpp b/examples/manual/equal.cpp
index 02afa07..f974fab 100644
--- a/examples/manual/equal.cpp
+++ b/examples/manual/equal.cpp
@@ -2,20 +2,27 @@
  *
  * equal.cpp - Example program for comparing two ranges for equivalence.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/equal.cpp#13 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/equal_range.cpp b/examples/manual/equal_range.cpp
index 0df8835..78e9979 100644
--- a/examples/manual/equal_range.cpp
+++ b/examples/manual/equal_range.cpp
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/exception.cpp b/examples/manual/failure.cpp
similarity index 96%
rename from examples/manual/exception.cpp
rename to examples/manual/failure.cpp
index 31da3e9..f9a1838 100644
--- a/examples/manual/exception.cpp
+++ b/examples/manual/failure.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
  *
- * except.cpp - Example program for exceptions.
+ * failure.cpp - Example program demonstrating ios::failure.
  *
  * $Id$
  *
diff --git a/examples/manual/filebuf.cpp b/examples/manual/filebuf.cpp
index fab5949..2beac8a 100644
--- a/examples/manual/filebuf.cpp
+++ b/examples/manual/filebuf.cpp
@@ -2,20 +2,27 @@
  *
  * filebuf.cpp - basic_filebuf example
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/filebuf.cpp#17 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
  
diff --git a/examples/manual/fill.cpp b/examples/manual/fill.cpp
index 0027996..dc12ebe 100644
--- a/examples/manual/fill.cpp
+++ b/examples/manual/fill.cpp
@@ -2,20 +2,27 @@
  *
  * fill.cpp - Example program for initializing a range with a given value.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/fill.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/find.cpp b/examples/manual/find.cpp
index 8785831..2d125dd 100644
--- a/examples/manual/find.cpp
+++ b/examples/manual/find.cpp
@@ -3,20 +3,27 @@
  * find.cpp - Example program for finding an occurence of value in a 
  *            sequence.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/find.cpp#13 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/find_end.cpp b/examples/manual/find_end.cpp
index d620a2c..4255f4e 100644
--- a/examples/manual/find_end.cpp
+++ b/examples/manual/find_end.cpp
@@ -2,20 +2,27 @@
  *
  * find_end.cpp - Example program for finding a subsequence. 
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/find_end.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/find_first_of.cpp b/examples/manual/find_first_of.cpp
index 5af4238..0875977 100644
--- a/examples/manual/find_first_of.cpp
+++ b/examples/manual/find_first_of.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/fmtflags_manip.cpp b/examples/manual/fmtflags_manip.cpp
new file mode 100644
index 0000000..96e6c96
--- /dev/null
+++ b/examples/manual/fmtflags_manip.cpp
@@ -0,0 +1,121 @@
+/**************************************************************************
+ *
+ * fmtflags_manip.cpp - Example program demonstrating the implementation
+ * of a user-defined manipulator for convenient and exception-safe setting
+ * and restoring of stream formatting flags.
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#include <ios>        // for hex
+#include <iomanip>    // for __rw_smanip
+#include <iostream>   // for cout
+
+#include <examples.h>
+
+
+// implementation class of the fmtflags manipulator that saves
+// a stream object's fmtflags state before optionally setting
+// their new value and restores the saved state when destroyed
+class fmtflags_manip
+{
+    std::ios_base           *strm_;
+    std::ios_base::fmtflags  saved_;
+
+public:
+    fmtflags_manip (): strm_ (), saved_ () { }
+
+    void operator() (std::ios_base           &strm,
+                     std::ios_base::fmtflags  flags) const {
+
+        const_cast<fmtflags_manip*>(this)->strm_  = &strm;
+        const_cast<fmtflags_manip*>(this)->saved_ = strm.flags ();
+
+        if (flags != std::ios_base::fmtflags (-1))
+            strm.flags (flags);
+    }
+
+    ~fmtflags_manip () {
+        if (strm_)
+            strm_->flags (saved_);
+    }
+};
+
+
+// saveflags manipulator to temporarily set formatting flags and
+// restore their initial value at the end of an insertion statement
+inline std::__rw_smanip<fmtflags_manip, std::ios_base::fmtflags>
+saveflags (std::ios_base::fmtflags flags = std::ios_base::fmtflags (-1))
+{
+    typedef std::__rw_smanip<fmtflags_manip, std::ios_base::fmtflags> Manip;
+
+    return Manip (flags);
+}
+
+
+// dummy class whose insertion operator always throws
+struct BadClass { };
+
+
+inline std::ostream&
+operator<< (std::ostream &strm, BadClass&)
+{
+    // inserter that always throws an exception
+    return throw "exception", strm;
+
+}
+
+
+int main ()
+{
+    try {
+        BadClass throw_exception;
+
+        // use the saveflags manipulator to set the formatting flags
+        // for the rest of this insertion statement only and have it
+        // restore the  previous flags at the end of the statement
+        // or on exception
+        std::cout << saveflags (std::cout.hex)
+                  << std::showbase
+                  << "hex 1234: " << 0x1234 << '\n'
+                  << "hex 2345: " << 0x2345 << '\n'
+                  << throw_exception    // inserting will throw
+                  << "never output!";   // this string is never output
+    }
+    catch (...) {
+        // show that default formatting flags (decimal output and no
+        // showbase) have been restored during stack unwinding above
+        std::cout << "dec 3456:   " << 3456 << '\n'
+                  << std::oct
+                  << "oct 4567:   " << 04567 << '\n';
+    }
+
+    // use ordinary manipulators to set hex output with base prefix
+    std::cout << std::hex << std::showbase
+              << "hex 5678: " << 0x5678 << '\n'
+              << "hex 6789: " << 0x6789 << '\n';
+
+    // the same flags set above are still in effect
+    std::cout << "hex 789a: " << 0x789a << '\n';
+
+    return 0;
+}
diff --git a/examples/manual/for_each.cpp b/examples/manual/for_each.cpp
index d7048ee..5895398 100644
--- a/examples/manual/for_each.cpp
+++ b/examples/manual/for_each.cpp
@@ -3,20 +3,27 @@
  * for_each.cpp - Example program for applying a function to each element 
  *                in a range.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/for_each.cpp#10 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/fstream.cpp b/examples/manual/fstream.cpp
index e8582cd..8ee1fef 100644
--- a/examples/manual/fstream.cpp
+++ b/examples/manual/fstream.cpp
@@ -2,20 +2,27 @@
  *
  * fstream.cpp - fstream example.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/fstream.cpp#13 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/funct_ob.cpp b/examples/manual/funct_ob.cpp
index b5faaf2..65d64a4 100644
--- a/examples/manual/funct_ob.cpp
+++ b/examples/manual/funct_ob.cpp
@@ -2,20 +2,27 @@
  *
  * funct_ob.cpp - Example program for function objects.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/funct_ob.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/generate.cpp b/examples/manual/generate.cpp
index bc53494..a5a4d69 100644
--- a/examples/manual/generate.cpp
+++ b/examples/manual/generate.cpp
@@ -3,20 +3,27 @@
  * generate.cpp - Example program for initializing a container with values 
  *                produced by a value-generator class.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/generate.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/gslice.cpp b/examples/manual/gslice.cpp
index 24748cb..c9bad29 100644
--- a/examples/manual/gslice.cpp
+++ b/examples/manual/gslice.cpp
@@ -2,20 +2,27 @@
  *
  * gslice.cpp - Generalized slice example program.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/gslice.cpp#13 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/gslice_array.cpp b/examples/manual/gslice_array.cpp
index 88c702a..d6dd5c0 100644
--- a/examples/manual/gslice_array.cpp
+++ b/examples/manual/gslice_array.cpp
@@ -2,20 +2,27 @@
  *
  * gslice_array.cpp -- Generalized array slice examples
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/gslice_array.cpp#13 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/has_facet.cpp b/examples/manual/has_facet.cpp
index 0828263..f597576 100644
--- a/examples/manual/has_facet.cpp
+++ b/examples/manual/has_facet.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/heap_ops.cpp b/examples/manual/heap_ops.cpp
index d33b9ef..7bfdf73 100644
--- a/examples/manual/heap_ops.cpp
+++ b/examples/manual/heap_ops.cpp
@@ -2,20 +2,27 @@
  *
  * heap_ops.cpp - Example program for heap operations. 
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/heap_ops.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/ifstream.cpp b/examples/manual/ifstream.cpp
index d4fac17..c749bb9 100644
--- a/examples/manual/ifstream.cpp
+++ b/examples/manual/ifstream.cpp
@@ -2,20 +2,27 @@
  *
  * ifstream.cpp - basic_ifstream example.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/ifstream.cpp#16 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
  
diff --git a/examples/manual/in/money_manip.in b/examples/manual/in/money_manip.in
new file mode 100644
index 0000000..29d6383
--- /dev/null
+++ b/examples/manual/in/money_manip.in
@@ -0,0 +1 @@
+100
diff --git a/examples/manual/in/time_manip.in b/examples/manual/in/time_manip.in
new file mode 100644
index 0000000..d2cc0a1
--- /dev/null
+++ b/examples/manual/in/time_manip.in
@@ -0,0 +1 @@
+Mon Jun 4 08:25:14 2007
diff --git a/examples/manual/includes.cpp b/examples/manual/includes.cpp
index 3c05b4b..2f083cd 100644
--- a/examples/manual/includes.cpp
+++ b/examples/manual/includes.cpp
@@ -3,20 +3,27 @@
  * includes.cpp - Example program of basic set operation for sorted 
  *                sequences.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/includes.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/indirect_array.cpp b/examples/manual/indirect_array.cpp
index 92959f7..92c4992 100644
--- a/examples/manual/indirect_array.cpp
+++ b/examples/manual/indirect_array.cpp
@@ -2,20 +2,27 @@
  *
  * indirect_array.cpp -- Indirect array examples
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/indirect_array.cpp#13 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/inner_product.cpp b/examples/manual/inner_product.cpp
index db624c3..7f0a802 100644
--- a/examples/manual/inner_product.cpp
+++ b/examples/manual/inner_product.cpp
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/insert_iterator.cpp b/examples/manual/insert_iterator.cpp
index 71baf52..6954aa8 100644
--- a/examples/manual/insert_iterator.cpp
+++ b/examples/manual/insert_iterator.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/insert_wchar.cpp b/examples/manual/insert_wchar.cpp
new file mode 100644
index 0000000..d2ddf54
--- /dev/null
+++ b/examples/manual/insert_wchar.cpp
@@ -0,0 +1,214 @@
+/**************************************************************************
+ *
+ * insert_wchar.cpp
+ *
+ * Example program demonstrating an implementation of an inserter
+ * operator overloaded for arrays of wchar_t that performs codeset
+ * conversion from wchar_t to mutlibyte characters.
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ * 
+ **************************************************************************/
+ 
+#include <cassert>    // for assert()
+#include <cwchar>     // for mbstate_t, size_t
+#include <ios>        // for hex
+#include <iostream>   // for cout
+#include <locale>     // for codecvt, isalnum(), locale
+#include <ostream>    // for basic_ostream
+#include <sstream>    // for ostringstream
+
+
+// inserts a wide character string into a stream buffer performing
+// codeset conversion if necessary
+template <class charT, class Traits>
+void
+streambuf_insert (std::basic_ostream<charT, Traits> &strm,
+                  const wchar_t                     *s)
+{
+    typedef typename Traits::state_type                  StateT;
+    typedef std::codecvt<wchar_t, charT, StateT>         Codecvt;
+
+    const Codecvt &cvt = std::use_facet<Codecvt>(strm.getloc ());
+
+    const std::size_t slen = std::char_traits<wchar_t>::length (s);
+
+    // perform codeset conversion in chunks to avoid dynamic
+    // memory allocation
+
+    const std::size_t    xbufsize = 32;
+
+    charT                xbuf [xbufsize];
+    charT*               xbuf_end  = xbuf + xbufsize;
+    charT*               to_next   = 0;
+    const wchar_t*       from_next = 0;
+    const wchar_t* const end       = s + slen;
+
+    StateT state = StateT ();
+
+    for (const wchar_t* base = s; from_next != end; base = from_next) {
+
+        const std::codecvt_base::result res =
+            cvt.out (state, base, end, from_next,
+                     xbuf, xbuf_end, to_next);
+
+        std::streamsize nbytes = to_next - xbuf;
+
+        switch (res) {
+        case Codecvt::error:
+            // write out the sequence successfully converted up
+            // to the point of the error in the internal sequence
+            // and fail
+            strm.rdbuf ()->sputn (xbuf, nbytes);
+            strm.setstate (strm.badbit);
+
+        case Codecvt::noconv:
+            // write the entire sequence
+            if (nbytes != strm.rdbuf ()->sputn (xbuf, nbytes)) {
+                strm.setstate (strm.badbit);
+                return;
+            }
+
+            from_next = end;   // effectively break
+            break;
+
+        default:
+            assert (cvt.ok == res || cvt.partial == res);
+
+            // partial conversion will result if there isn't enough
+            // space in the conversion buffer to hold the converted
+            // sequence, but we're O.K. since we'll be passing any
+            // remaining unconverted characters (starting at
+            // from_next) in the next iteration
+
+            nbytes = to_next - xbuf;
+
+            if (nbytes != strm.rdbuf ()->sputn (xbuf, nbytes)) {
+                strm.setstate (strm.badbit);
+                return;
+            }
+        }
+    }
+}
+
+
+// stream insertion operator overloaded for arrays of wchar_t characters
+template <class charT, class Traits>
+std::basic_ostream<charT, Traits>&
+operator<< (std::basic_ostream<charT, Traits> &strm,
+            const wchar_t                     *s)
+{
+    const typename std::basic_ostream<charT, Traits>::sentry opfx (strm);
+
+    if (opfx) {
+
+        try {
+            // try to insert character array into stream buffer
+            streambuf_insert (strm, s);
+        }
+        catch (...) {
+            bool threw;
+            try {
+                // set badbit on exception without throwing ios::failure
+                strm.setstate (strm.badbit);
+                threw = false;
+            }
+            catch (std::ios_base::failure&) {
+                // make a note of the exception thrown from setstate()...
+                threw = true;
+            }
+            if (threw) {
+                // ...and rethrow the original exception
+                throw;
+            }
+        }
+    }
+
+    return strm;
+}
+
+
+// examples of wide character strings
+static const wchar_t* const wcs [] = {
+    L"a", L"abc",
+    // Greek letter Alpha:
+    L"\x0391",   // "\xce\x91"
+    // Greek letters Alpha Beta:
+    L"\x0391\x0392",   // "\xce\x91\xce\x91\xce\x92"
+    // Greek letters Alpha Beta Gamma:
+    L"\x0391\x0392\x0393",   // "\xce\x91\xce\x92\xce\x93"
+    // Tibetan digit zero:
+    L"\x0f20",   // "\xe0\xbc\xa0"
+    // Tibetan digits one, zero:
+    L"\x0f21\x0f20",   // "\xe0\xbc\xa1\xe0\xbc\xa0"
+    // Tibetan digits two, one, zero:
+    L"\x0f22\x0f21\x0f20"   // "\xe0\xbc\xa2\xe0\xbc\xa1\xe0\xbc\xa0"
+};
+
+
+int main ()
+{
+    typedef std::codecvt_byname<wchar_t, char, std::mbstate_t> Codecvt;
+
+    // create a UCS/UTF-8 codecvt facet and install it in a locale
+    const std::locale utf (std::cout.getloc (), new Codecvt ("UTF-8@UCS"));
+
+    for (std::size_t i = 0; i != sizeof wcs / sizeof *wcs; ++i) {
+
+        std::ostringstream strm;
+
+        // imbue the UTF-8/UCS capable locale in a stringstream
+        strm.imbue (utf);
+
+        // insert each wide character string into the narrow stream
+        // object relying on the inserter to convert each wide string
+        // into the corresponding multibyte character string
+        strm << wcs [i];
+
+        // write out the wide character string in Unicode notation
+        std::cout << "UCS-2: " << std::hex;
+
+        for (const wchar_t *pwc = wcs [i]; *pwc != L'\0'; ++pwc)
+            std::cout << "U+" << unsigned (*pwc) << ' ';
+
+        const std::string str = strm.str ();
+
+        std::cout << " ==> UTF-8: \"";
+
+        typedef unsigned char UChar;
+
+        // write out the the multibyte character sequence using
+        // ordinary aphanumeric symbols or hex escape sequences
+        // where necessary
+        for (const char *pc = str.c_str (); *pc != '\0'; ++pc) {
+
+            // parenthesize isalnum to prevent macro expension
+            // in case the function happens to be (illegally)
+            // shadowed by a macro
+            if ((std::isalnum)(*pc, std::cout.getloc ()))
+                std::cout << *pc;
+            else
+                std::cout << "\\x" << int (UChar (*pc));
+        }
+
+        std::cout << "\"\n";
+    }
+}
diff --git a/examples/manual/isalnum.cpp b/examples/manual/isalnum.cpp
index b2f05eb..b7c303c 100644
--- a/examples/manual/isalnum.cpp
+++ b/examples/manual/isalnum.cpp
@@ -2,20 +2,27 @@
  *
  * isalnum.cpp - Example program of isalnum convience function.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/isalnum.cpp#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
  
diff --git a/examples/manual/istream1.cpp b/examples/manual/istream1.cpp
index 3e4b6ed..d2e4a42 100644
--- a/examples/manual/istream1.cpp
+++ b/examples/manual/istream1.cpp
@@ -2,20 +2,27 @@
  *
  * istream1.cpp - istream example
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/istream1.cpp#15 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
  
diff --git a/examples/manual/istreambuf_iterator.cpp b/examples/manual/istreambuf_iterator.cpp
index 7d29ff0..d745c00 100644
--- a/examples/manual/istreambuf_iterator.cpp
+++ b/examples/manual/istreambuf_iterator.cpp
@@ -2,20 +2,27 @@
  *
  * istreambuf_iterator.cpp - istreambuf_iterator example
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/istreambuf_iterator.cpp#15 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
  
diff --git a/examples/manual/istringstream.cpp b/examples/manual/istringstream.cpp
index 5e2f3be..a5e2d0c 100644
--- a/examples/manual/istringstream.cpp
+++ b/examples/manual/istringstream.cpp
@@ -2,20 +2,27 @@
  *
  * istringstream.cpp - basic_istringstream example
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/istringstream.cpp#15 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
  
diff --git a/examples/manual/istrstream.cpp b/examples/manual/istrstream.cpp
index 248a976..30db9d4 100644
--- a/examples/manual/istrstream.cpp
+++ b/examples/manual/istrstream.cpp
@@ -2,20 +2,27 @@
  *
  * istrstream.cpp - istrstream example.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/istrstream.cpp#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/lex_compare.cpp b/examples/manual/lex_compare.cpp
index db2cfdd..e0f1bbf 100644
--- a/examples/manual/lex_compare.cpp
+++ b/examples/manual/lex_compare.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/list.cpp b/examples/manual/list.cpp
index 20720e1..f76ea85 100644
--- a/examples/manual/list.cpp
+++ b/examples/manual/list.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/locale.cpp b/examples/manual/locale.cpp
index 854a423..322507a 100644
--- a/examples/manual/locale.cpp
+++ b/examples/manual/locale.cpp
@@ -2,20 +2,27 @@
  *
  * locale.cpp - Example program for the  locale class. 
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/locale.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/map.cpp b/examples/manual/map.cpp
index 9f11391..dffa89c 100644
--- a/examples/manual/map.cpp
+++ b/examples/manual/map.cpp
@@ -2,20 +2,27 @@
  *
  * map.cpp - Example program of map.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/map.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/mask_array.cpp b/examples/manual/mask_array.cpp
index 003bff4..05af8be 100644
--- a/examples/manual/mask_array.cpp
+++ b/examples/manual/mask_array.cpp
@@ -2,20 +2,27 @@
  *
  * mask_array.cpp -- Mask array examples
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/mask_array.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/max.cpp b/examples/manual/max.cpp
index d627d65..c7e80e7 100644
--- a/examples/manual/max.cpp
+++ b/examples/manual/max.cpp
@@ -2,20 +2,27 @@
  *
  * max.cpp - Example program for finding maximum of a pair of values.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/max.cpp#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/max_elem.cpp b/examples/manual/max_elem.cpp
index 1e7e787..439bbe5 100644
--- a/examples/manual/max_elem.cpp
+++ b/examples/manual/max_elem.cpp
@@ -2,20 +2,27 @@
  *
  * max_elem.cpp - Example program for finding maximum value in a range.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/max_elem.cpp#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/mbsrtowcs.cpp b/examples/manual/mbsrtowcs.cpp
index 8d9cc14..25f1014 100644
--- a/examples/manual/mbsrtowcs.cpp
+++ b/examples/manual/mbsrtowcs.cpp
@@ -142,7 +142,7 @@
         // <U0391>: Greek letter Alpha
         "\xce\x91",
         // <U0391><U0392>: Greek letters Alpha Beta
-        "\xce\x91\xce\x91\xce\x92",
+        "\xce\x91\xce\x92",
         // <U0391><U0392><U0393>: Greek letters Alpha Beta Gamma
         "\xce\x91\xce\x92\xce\x93",
         // <U0966>: Devangari digit 0
@@ -198,6 +198,9 @@
             continue;
         }
 
+        // NUL-terminate the converted string
+        dst [nconv] = L'\0';
+
         // write out the wide and the narrow sequences
         std::cout << "UCS-2 (" << std::dec << length << "): " << std::hex;
 
diff --git a/examples/manual/memfunc.cpp b/examples/manual/memfunc.cpp
index e72a37d..7ca3ae1 100644
--- a/examples/manual/memfunc.cpp
+++ b/examples/manual/memfunc.cpp
@@ -3,20 +3,27 @@
  * memfunc.cpp - Example program for mem_fun and other member function
  *               pointer wrappers.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/memfunc.cpp#19 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/memfunref.cpp b/examples/manual/memfunref.cpp
index fdd11bf..b3ebd7b 100644
--- a/examples/manual/memfunref.cpp
+++ b/examples/manual/memfunref.cpp
@@ -3,20 +3,27 @@
  * memfunref.cpp - Example program for mem_fun and other member function
  *                 reference wrappers.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/memfunref.cpp#13 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/messages.cpp b/examples/manual/messages.cpp
index 6667e5c..5dd1cbf 100644
--- a/examples/manual/messages.cpp
+++ b/examples/manual/messages.cpp
@@ -2,20 +2,27 @@
  *
  * messages.cpp - Example program for the messages facet. 
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/messages.cpp#10 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/mismatch.cpp b/examples/manual/mismatch.cpp
index 0eecd8f..bd2a8ca 100644
--- a/examples/manual/mismatch.cpp
+++ b/examples/manual/mismatch.cpp
@@ -4,20 +4,27 @@
  *                and returning the first two elements that don't 
  *                match each other.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/mismatch.cpp#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/money_get.cpp b/examples/manual/money_get.cpp
new file mode 100644
index 0000000..1c09791
--- /dev/null
+++ b/examples/manual/money_get.cpp
@@ -0,0 +1,96 @@
+/**************************************************************************
+ *
+ * money_get.cpp - Example program for the money_get facet. 
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1998-2006 Rogue Wave Software.
+ * 
+ **************************************************************************/
+
+#include <locale>     // for locale, money_get, use_facet
+#include <sstream>    // for istringstream
+#include <iostream>   // for cout, endl
+#include <iterator>   // for istreambuf_iterator
+
+#include <examples.h>
+
+
+// hardcode the name of the English US locale for known systems
+#if defined (__FreeBSD__) || defined (__osf__)
+// FreeBSD and Tru64 UNIX
+const char en_US[] = "en_US.ISO8859-1";
+#elif defined (__hpux)
+// HP-UX
+const char en_US[] = "en_US.iso88591";
+// Windows
+#elif defined (_WIN32)
+const char en_US[] = "English";
+#else
+// AIX, IRIX, Linux, Solaris
+const char en_US[] = "en_US";
+#endif
+
+
+int main (int argc, char *argv[])
+{
+    // Get the monetary string and locale from the argument vector.
+    const char* const buffer  = 1 < argc ? argv [1] : "$1,234.6789";
+    const char* const locname = 2 < argc ? argv [2] : en_US;
+    const bool        intl    = 3 < argc;
+
+    std::string smon;
+    long double fmon = 0.0;
+
+    std::ios_base::iostate state = std::ios_base::goodbit;
+
+    // Retrieve the money_get facet from the named locale.
+    const std::locale loc (locname);
+
+    typedef std::istreambuf_iterator<char> Iter;
+    typedef std::money_get<char, Iter>     MoneyGet;
+
+    const MoneyGet &mgf = std::use_facet<MoneyGet>(loc);
+
+    {
+        // Build an istringstream object from the buffer
+        // and imbue the locale in it.
+        std::istringstream ins (buffer);
+        ins.imbue (loc);
+
+        // Get a string representation of the monetary value.
+        mgf.get (ins, Iter (), intl, ins, state, smon);
+    }
+    {
+        std::istringstream ins (buffer);
+        ins.imbue (loc);
+
+        // Get a floating point representation of the monetary value.
+        mgf.get (ins, Iter (), intl, ins, state, fmon);
+    }
+
+    // Output the original sequence and its string and floating point
+    // representations.
+    std::cout << buffer << " --> \"" << smon << "\" --> " << fmon << '\n';
+
+    // Return 0 on success, non-zero on failure.
+    return !(std::ios_base::eofbit == state);
+}
diff --git a/examples/manual/money_manip.cpp b/examples/manual/money_manip.cpp
index b3908c6..129ee92 100644
--- a/examples/manual/money_manip.cpp
+++ b/examples/manual/money_manip.cpp
@@ -160,7 +160,7 @@
     std::cout.imbue (std::cin.getloc ());
 
     // output the monetary value specified by the command line argument,
-    // inlcuing the currency symbol, in both the local and international
+    // including the currency symbol, in both the local and international
     // formats
     std::cout.setf (std::cout.showbase);
     std::cout << put_money (valstr) << '\n';
diff --git a/examples/manual/moneyget.cpp b/examples/manual/moneyget.cpp
deleted file mode 100644
index 55a0f23..0000000
--- a/examples/manual/moneyget.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/**************************************************************************
- *
- * moneyget.cpp - Example program for the money_get facet. 
- *
- * $Id: //stdlib/dev/examples/stdlib/manual/moneyget.cpp#15 $
- *
- ***************************************************************************
- *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
- * 
- **************************************************************************/
-
-#include <locale>     // for locale, money_get, use_facet
-#include <sstream>    // for istringstream
-#include <iostream>   // for cout, endl
-#include <iterator>   // for istreambuf_iterator
-
-#include <examples.h>
-
-
-#if defined (__osf__)
-const char en_US[] = "en_US.ISO8859-1";
-#elif defined (__hpux)
-const char en_US[] = "en_US.iso88591";
-#elif defined (_WIN32) || defined (_WIN64)
-const char en_US[] = "English";
-#else
-const char en_US[] = "en_US";
-#endif
-
-
-int main ()
-{
-    typedef std::istreambuf_iterator<char, std::char_traits<char> > Iter;
-  
-    const char buffer[] = "$100.02";
-
-    std::string dest;
-    long double ldest = 0.0;
-
-    std::ios_base::iostate state = std::ios_base::goodbit;
-    Iter end;
-
-    // Retrieve the money_get facet from the global locale.
-    const std::locale loc (en_US);
-
-    const std::money_get<char, Iter> &mgf =
-        std::use_facet<std::money_get<char, Iter> >(loc);
-
-    {
-        // Build an istringstream from the buffer and construct
-        // a beginning iterator on it.
-        std::istringstream ins (buffer);
-        ins.imbue (loc);
-        Iter begin (ins);
-
-        // Get a string representation of the monetary value
-        mgf.get (begin, end, false, ins, state, dest);
-    }
-    {
-        // Build another istringstream from the buffer, etc.
-        // so we have an iterator pointing to the beginning
-        std::istringstream ins (buffer);
-        ins.imbue (loc);
-        Iter begin (ins);
-
-        // Get a a long double representation of the monetary value
-        mgf.get (begin, end, false, ins, state, ldest);
-    }
-
-    std::cout << buffer << " --> "
-              << dest << " --> " << ldest << std::endl;
-
-    // return 0 on success, non-zero on failure
-    return !(std::ios_base::eofbit == state);
-}
diff --git a/examples/manual/moneypunct.cpp b/examples/manual/moneypunct.cpp
index 81908ea..1ba4f99 100644
--- a/examples/manual/moneypunct.cpp
+++ b/examples/manual/moneypunct.cpp
@@ -2,20 +2,27 @@
  *
  * moneypunct.cpp - Example program for the moneypunct facet. 
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/moneypunct.cpp#15 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/moneyput.cpp b/examples/manual/moneyput.cpp
index c420150..6451a0d 100644
--- a/examples/manual/moneyput.cpp
+++ b/examples/manual/moneyput.cpp
@@ -2,20 +2,27 @@
  *
  * moneyput.cpp - Example program for the money_put facet. 
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/moneyput.cpp#10 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -37,9 +44,11 @@
     // Construct a ostreambuf_iterator on cout
     Iter begin (std::cout);
 
+    const std::locale loc;
+
     // Get a money put facet
     const std::money_put<char, Iter> &mp = 
-        std::use_facet<std::money_put<char, Iter> >(std::locale ());
+        std::use_facet<std::money_put<char, Iter> >(loc);
 
     // Put out the string representation of the monetary value
     std::cout << buffer << " --> ";
diff --git a/examples/manual/multimap.cpp b/examples/manual/multimap.cpp
index b2d5e42..f8faf7c 100644
--- a/examples/manual/multimap.cpp
+++ b/examples/manual/multimap.cpp
@@ -2,20 +2,27 @@
  *
  * multimap.cpp - Example program for multimap class.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/multimap.cpp#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/multiset.cpp b/examples/manual/multiset.cpp
index 161904a..8ab8ee7 100644
--- a/examples/manual/multiset.cpp
+++ b/examples/manual/multiset.cpp
@@ -2,20 +2,27 @@
  *
  * multiset.cpp - Example program for multiset class.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/multiset.cpp#14 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/mutex.cpp b/examples/manual/mutex.cpp
index a4772c4..9e7619c 100644
--- a/examples/manual/mutex.cpp
+++ b/examples/manual/mutex.cpp
@@ -10,20 +10,27 @@
  *       from one version of the library to another. Portable code should
  *       avoid relying on any implementation details.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/mutex.cpp#15 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/negator.cpp b/examples/manual/negator.cpp
index 3936a40..ed49f1e 100644
--- a/examples/manual/negator.cpp
+++ b/examples/manual/negator.cpp
@@ -4,20 +4,27 @@
  *               function objects by using function adaptors and function
  *               objects.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/negator.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/nthelem.cpp b/examples/manual/nthelem.cpp
index 7b29ad8..07e1837 100644
--- a/examples/manual/nthelem.cpp
+++ b/examples/manual/nthelem.cpp
@@ -3,20 +3,27 @@
  * nthelem.cpp - Example program for rearranging a collection based on nth
  *               element.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/nthelem.cpp#14 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/num_get.cpp b/examples/manual/num_get.cpp
index 730b7da..5d47103 100644
--- a/examples/manual/num_get.cpp
+++ b/examples/manual/num_get.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -35,9 +42,11 @@
     long        lval  = 0L;
     long double ldval = 0.0;
 
+    const std::locale loc;
+
     // Get a num_get facet
     const std::num_get<char, Iter> &ng =
-        std::use_facet<std::num_get<char, Iter> >(std::locale ());
+        std::use_facet<std::num_get<char, Iter> >(loc);
 
 #ifndef _RWSTD_NO_BOOL
     {
diff --git a/examples/manual/num_put.cpp b/examples/manual/num_put.cpp
index 1629aa0..652e330 100644
--- a/examples/manual/num_put.cpp
+++ b/examples/manual/num_put.cpp
@@ -2,20 +2,27 @@
  *
  * num_put.cpp - Example program for the num_put facet. 
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/num_put.cpp#5 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/ostreambuf_iterator.cpp b/examples/manual/ostreambuf_iterator.cpp
index 766abe3..f663293 100644
--- a/examples/manual/ostreambuf_iterator.cpp
+++ b/examples/manual/ostreambuf_iterator.cpp
@@ -2,20 +2,27 @@
  *
  * ostreambuf_iterator.cpp - ostreambuf_iterator example
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/ostreambuf_iterator.cpp#13 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
  
diff --git a/examples/manual/out/except.out b/examples/manual/out/failure.out
similarity index 100%
rename from examples/manual/out/except.out
rename to examples/manual/out/failure.out
diff --git a/examples/manual/out/fmtflags_manip.out b/examples/manual/out/fmtflags_manip.out
new file mode 100644
index 0000000..1750f4c
--- /dev/null
+++ b/examples/manual/out/fmtflags_manip.out
@@ -0,0 +1,7 @@
+hex 1234: 0x1234
+hex 2345: 0x2345
+dec 3456:   3456
+oct 4567:   4567
+hex 5678: 0x5678
+hex 6789: 0x6789
+hex 789a: 0x789a
diff --git a/examples/manual/out/insert_wchar.out b/examples/manual/out/insert_wchar.out
new file mode 100644
index 0000000..9951fc8
--- /dev/null
+++ b/examples/manual/out/insert_wchar.out
@@ -0,0 +1,8 @@
+UCS-2: U+61  ==> UTF-8: "a"
+UCS-2: U+61 U+62 U+63  ==> UTF-8: "abc"
+UCS-2: U+391  ==> UTF-8: "\xce\x91"
+UCS-2: U+391 U+392  ==> UTF-8: "\xce\x91\xce\x92"
+UCS-2: U+391 U+392 U+393  ==> UTF-8: "\xce\x91\xce\x92\xce\x93"
+UCS-2: U+f20  ==> UTF-8: "\xe0\xbc\xa0"
+UCS-2: U+f21 U+f20  ==> UTF-8: "\xe0\xbc\xa1\xe0\xbc\xa0"
+UCS-2: U+f22 U+f21 U+f20  ==> UTF-8: "\xe0\xbc\xa2\xe0\xbc\xa1\xe0\xbc\xa0"
diff --git a/examples/manual/out/mbsrtowcs.out b/examples/manual/out/mbsrtowcs.out
index 793c106..b1ab095 100644
--- a/examples/manual/out/mbsrtowcs.out
+++ b/examples/manual/out/mbsrtowcs.out
@@ -1,8 +1,8 @@
 UCS-2 (1): U+61  ==> UTF-8: \x61"
 UCS-2 (3): U+61 U+62 U+63  ==> UTF-8: \x61\x62\x63"
 UCS-2 (1): U+391  ==> UTF-8: \xce\x91"
-UCS-2 (3): U+391 U+391 U+392  ==> UTF-8: \xce\x91\xce\x91\xce\x92"
+UCS-2 (2): U+391 U+392  ==> UTF-8: \xce\x91\xce\x92"
 UCS-2 (3): U+391 U+392 U+393  ==> UTF-8: \xce\x91\xce\x92\xce\x93"
 UCS-2 (1): U+966  ==> UTF-8: \xe0\xa5\xa6"
-UCS-2 (2): U+967 U+966 U+393  ==> UTF-8: \xe0\xa5\xa7\xe0\xa5\xa6"
+UCS-2 (2): U+967 U+966  ==> UTF-8: \xe0\xa5\xa7\xe0\xa5\xa6"
 UCS-2 (3): U+968 U+967 U+966  ==> UTF-8: \xe0\xa5\xa8\xe0\xa5\xa7\xe0\xa5\xa6"
diff --git a/examples/manual/out/money_get.out b/examples/manual/out/money_get.out
new file mode 100644
index 0000000..75cab8a
--- /dev/null
+++ b/examples/manual/out/money_get.out
@@ -0,0 +1 @@
+$1,234.6789 --> "123467" --> 123467
diff --git a/examples/manual/out/moneyget.out b/examples/manual/out/moneyget.out
deleted file mode 100644
index b9c8791..0000000
--- a/examples/manual/out/moneyget.out
+++ /dev/null
@@ -1 +0,0 @@
-$100.02 --> 10002 --> 10002
diff --git a/examples/manual/partial_sort.cpp b/examples/manual/partial_sort.cpp
index a798ae3..d13a97f 100644
--- a/examples/manual/partial_sort.cpp
+++ b/examples/manual/partial_sort.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/partial_sum.cpp b/examples/manual/partial_sum.cpp
index f357cd5..a9e6c87 100644
--- a/examples/manual/partial_sum.cpp
+++ b/examples/manual/partial_sum.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/partition.cpp b/examples/manual/partition.cpp
index 0021453..00fe997 100644
--- a/examples/manual/partition.cpp
+++ b/examples/manual/partition.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/permutation.cpp b/examples/manual/permutation.cpp
index 1b14970..ca34c59 100644
--- a/examples/manual/permutation.cpp
+++ b/examples/manual/permutation.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/pnt2fnct.cpp b/examples/manual/pnt2fnct.cpp
index d3f0d5f..d2c2fbe 100644
--- a/examples/manual/pnt2fnct.cpp
+++ b/examples/manual/pnt2fnct.cpp
@@ -2,20 +2,27 @@
  *
  * pnt2fnct.cpp - Example program of pointer to function.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/pnt2fnct.cpp#10 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/priority_queue.cpp b/examples/manual/priority_queue.cpp
index 4947d38..33ac1a7 100644
--- a/examples/manual/priority_queue.cpp
+++ b/examples/manual/priority_queue.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
  
diff --git a/examples/manual/queue.cpp b/examples/manual/queue.cpp
index 44348a2..a13ef18 100644
--- a/examples/manual/queue.cpp
+++ b/examples/manual/queue.cpp
@@ -2,20 +2,27 @@
  *
  * queue.cpp - Example program of queues.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/queue.cpp#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/random_shuffle.cpp b/examples/manual/random_shuffle.cpp
index 8e4a78c..8bc0744 100644
--- a/examples/manual/random_shuffle.cpp
+++ b/examples/manual/random_shuffle.cpp
@@ -2,20 +2,27 @@
  *
  * rndshufl.cpp - Example program of random shuffle algorithm.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/random_shuffle.cpp#2 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/remove.cpp b/examples/manual/remove.cpp
index e02e3d2..02ad7c6 100644
--- a/examples/manual/remove.cpp
+++ b/examples/manual/remove.cpp
@@ -2,20 +2,27 @@
  *
  * remove.cpp - Example program of remove algorithm.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/remove.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/replace.cpp b/examples/manual/replace.cpp
index a2543ef..4b35c17 100644
--- a/examples/manual/replace.cpp
+++ b/examples/manual/replace.cpp
@@ -2,20 +2,27 @@
  *
  * replace.cpp - Example program of replace algorithm 
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/replace.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/reverse.cpp b/examples/manual/reverse.cpp
index cc05ada..85f5fb8 100644
--- a/examples/manual/reverse.cpp
+++ b/examples/manual/reverse.cpp
@@ -2,20 +2,27 @@
  *
  * reverse.cpp - Example program reverse algorithm.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/reverse.cpp#10 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/rotate.cpp b/examples/manual/rotate.cpp
index 3af57a5..148560d 100644
--- a/examples/manual/rotate.cpp
+++ b/examples/manual/rotate.cpp
@@ -2,20 +2,27 @@
  *
  * rotate.cpp - Example program of rotate algorithm. 
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/rotate.cpp#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/rwexcept.cpp b/examples/manual/rwexcept.cpp
index b28e0c6..e477752 100644
--- a/examples/manual/rwexcept.cpp
+++ b/examples/manual/rwexcept.cpp
@@ -3,20 +3,27 @@
  * rwexcept.cpp - Example program demonstrating the use of the optional
  *                C++ Standard Library exception mechanism.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/rwexcept.cpp#10 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -35,9 +42,9 @@
 {
     std::cerr << "exception #" <<  id << ": " << what << '\n';
 
-    // 
-    if (id >= _RWSTD_ERROR_BAD_CAST)
-        delete[] what;
+    // free what buffer
+    if (what)
+        __rw::__rw_free_what_buf (what);
 
     // a real program would call abort() here to prevent the potentially
     // dangerous destruction of objects with static storage duration
diff --git a/examples/manual/rwstdmessages.cpp b/examples/manual/rwstdmessages.cpp
index 77dba93..f42249e 100644
--- a/examples/manual/rwstdmessages.cpp
+++ b/examples/manual/rwstdmessages.cpp
@@ -2,3 +2,4 @@
 int _rw_messages_version()
 {
    return _RW_MSG_START;
+}
diff --git a/examples/manual/rwstdmessages.dll b/examples/manual/rwstdmessages.dll
index 76d6692..a6f945f 100644
--- a/examples/manual/rwstdmessages.dll
+++ b/examples/manual/rwstdmessages.dll
Binary files differ
diff --git a/examples/manual/search.cpp b/examples/manual/search.cpp
index 6e55a25..aaafac7 100644
--- a/examples/manual/search.cpp
+++ b/examples/manual/search.cpp
@@ -2,20 +2,27 @@
  *
  * search.cpp - Example program of search algorithm.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/search.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/set_diff.cpp b/examples/manual/set_diff.cpp
index abc6ffb..7bb7fa8 100644
--- a/examples/manual/set_diff.cpp
+++ b/examples/manual/set_diff.cpp
@@ -2,20 +2,27 @@
  *
  * set_diff.cpp - Example program of set differences algorithm. 
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/set_diff.cpp#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/set_intr.cpp b/examples/manual/set_intr.cpp
index 6921f51..f4a5458 100644
--- a/examples/manual/set_intr.cpp
+++ b/examples/manual/set_intr.cpp
@@ -2,20 +2,27 @@
  *
  * set_intr.cpp - Example program of set intersection algorithm.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/set_intr.cpp#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/set_sym_diff.cpp b/examples/manual/set_sym_diff.cpp
index a0f57cd..96e6959 100644
--- a/examples/manual/set_sym_diff.cpp
+++ b/examples/manual/set_sym_diff.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/set_union.cpp b/examples/manual/set_union.cpp
index e9be3ae..f055646 100644
--- a/examples/manual/set_union.cpp
+++ b/examples/manual/set_union.cpp
@@ -2,20 +2,27 @@
  *
  * set_union.cpp - Example program of set union algorithm.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/set_union.cpp#5 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/setex.cpp b/examples/manual/setex.cpp
index c0fd117..b3885c8 100644
--- a/examples/manual/setex.cpp
+++ b/examples/manual/setex.cpp
@@ -2,20 +2,27 @@
  *
  * setex.cpp - Example program of sets.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/setex.cpp#15 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/slice.cpp b/examples/manual/slice.cpp
index a3825ed..88d1f3a 100644
--- a/examples/manual/slice.cpp
+++ b/examples/manual/slice.cpp
@@ -2,20 +2,27 @@
  *
  * slice.cpp -- Valarray slice examples
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/slice.cpp#13 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/slice_array.cpp b/examples/manual/slice_array.cpp
index 199ce1d..27b4180 100644
--- a/examples/manual/slice_array.cpp
+++ b/examples/manual/slice_array.cpp
@@ -2,20 +2,27 @@
  *
  * slice_array.cpp -- Valarray slice array examples
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/slice_array.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/sort.cpp b/examples/manual/sort.cpp
index 81d8739..372819b 100644
--- a/examples/manual/sort.cpp
+++ b/examples/manual/sort.cpp
@@ -2,20 +2,27 @@
  *
  * sort.cpp - Example program of sort algorithm. See Class Reference Section
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/sort.cpp#15 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/stack.cpp b/examples/manual/stack.cpp
index c670a6f..803310a 100644
--- a/examples/manual/stack.cpp
+++ b/examples/manual/stack.cpp
@@ -2,20 +2,27 @@
  *
  * stack.cpp - Example program of stack. See Class Reference Section
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/stack.cpp#10 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/stream_iterator.cpp b/examples/manual/stream_iterator.cpp
index 5706f43..bd2973e 100644
--- a/examples/manual/stream_iterator.cpp
+++ b/examples/manual/stream_iterator.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/string.cpp b/examples/manual/string.cpp
index 5d00b6e..86860e4 100644
--- a/examples/manual/string.cpp
+++ b/examples/manual/string.cpp
@@ -2,20 +2,27 @@
  *
  * string.cpp - Example program of string.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/string.cpp#10 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/stringbuf.cpp b/examples/manual/stringbuf.cpp
index 820ed08..a00976f 100644
--- a/examples/manual/stringbuf.cpp
+++ b/examples/manual/stringbuf.cpp
@@ -2,20 +2,27 @@
  *
  * stringbuf.cpp - basic_stringbuf example.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/stringbuf.cpp#10 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
  
diff --git a/examples/manual/strstream.cpp b/examples/manual/strstream.cpp
index 2f4d360..6486996 100644
--- a/examples/manual/strstream.cpp
+++ b/examples/manual/strstream.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/strstreambuf.cpp b/examples/manual/strstreambuf.cpp
index 4db8b92..ccd4267 100644
--- a/examples/manual/strstreambuf.cpp
+++ b/examples/manual/strstreambuf.cpp
@@ -2,20 +2,27 @@
  *
  * strstreambuf.cpp - strstreambuf example.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/strstreambuf.cpp#14 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
  
diff --git a/examples/manual/swap.cpp b/examples/manual/swap.cpp
index 8117cbc..e2c424d 100644
--- a/examples/manual/swap.cpp
+++ b/examples/manual/swap.cpp
@@ -2,20 +2,27 @@
  *
  * swap.cpp - Example program of swap algorithm.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/swap.cpp#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/time_get.cpp b/examples/manual/time_get.cpp
index 3d0ff49..1007abf 100644
--- a/examples/manual/time_get.cpp
+++ b/examples/manual/time_get.cpp
@@ -2,20 +2,27 @@
  *
  * timeget.cpp - Example program for the time_get facet. 
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/time_get.cpp#2 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -71,9 +78,11 @@
     Iter begin (ins);
     Iter end;
 
+    const std::locale loc ("C");
+
     // Get a reference to the time_get facet in locale loc.
     const std::time_get<char, Iter> &tg =
-        std::use_facet<std::time_get<char, Iter> >(std::locale ("C"));
+        std::use_facet<std::time_get<char, Iter> >(loc);
 
     // Display time_base::dateorder value.
     std::cout << "time_base::dateorder == " << tg.date_order () << ".\n";
diff --git a/examples/manual/toupper.cpp b/examples/manual/toupper.cpp
index 995a335..3eed2f1 100644
--- a/examples/manual/toupper.cpp
+++ b/examples/manual/toupper.cpp
@@ -2,20 +2,27 @@
  *
  * toupper.cpp - Example program of the toupper and tolower functions. 
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/toupper.cpp#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
  
diff --git a/examples/manual/transform.cpp b/examples/manual/transform.cpp
index 13e92f0..e25d8b1 100644
--- a/examples/manual/transform.cpp
+++ b/examples/manual/transform.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/ul_bound.cpp b/examples/manual/ul_bound.cpp
index 320d71b..d10a5c6 100644
--- a/examples/manual/ul_bound.cpp
+++ b/examples/manual/ul_bound.cpp
@@ -2,20 +2,27 @@
  *
  * ul_bound.cpp - Example program of upper bound algorithm.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/ul_bound.cpp#10 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/unique.cpp b/examples/manual/unique.cpp
index f629075..e265ef1 100644
--- a/examples/manual/unique.cpp
+++ b/examples/manual/unique.cpp
@@ -2,20 +2,27 @@
  *
  * unique.cpp - Example program of unique algorithm.
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/unique.cpp#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/use_facet.cpp b/examples/manual/use_facet.cpp
index 8cb9510..10b8e83 100644
--- a/examples/manual/use_facet.cpp
+++ b/examples/manual/use_facet.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
  
diff --git a/examples/manual/valarray.cpp b/examples/manual/valarray.cpp
index 1bb027c..87c1ff2 100644
--- a/examples/manual/valarray.cpp
+++ b/examples/manual/valarray.cpp
@@ -2,20 +2,27 @@
  *
  * valarray.cpp -- Valarray examples 
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/valarray.cpp#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/manual/vector.cpp b/examples/manual/vector.cpp
index 1b44d09..b836a44 100644
--- a/examples/manual/vector.cpp
+++ b/examples/manual/vector.cpp
@@ -2,20 +2,27 @@
  *
  * vector.cpp - Example program of vector. See Class Reference Section
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/vector.cpp#14 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
  
diff --git a/examples/manual/wostream.cpp b/examples/manual/wostream.cpp
index 1291241..c9d5fdc 100644
--- a/examples/manual/wostream.cpp
+++ b/examples/manual/wostream.cpp
@@ -2,20 +2,27 @@
  *
  * ostream2.cpp - ostream example
  *
- * $Id: //stdlib/dev/examples/stdlib/manual/wostream.cpp#2 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
  
diff --git a/examples/manual/wstringstream.cpp b/examples/manual/wstringstream.cpp
index 990a58e..38ca5b7 100644
--- a/examples/manual/wstringstream.cpp
+++ b/examples/manual/wstringstream.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/tutorial/alg1.cpp b/examples/tutorial/alg1.cpp
index 87e9fb2..198882d 100644
--- a/examples/tutorial/alg1.cpp
+++ b/examples/tutorial/alg1.cpp
@@ -3,20 +3,27 @@
  * alg1.cpp - Example program for STL generic algorithms that initialize 
  *            sequences.
  *
- * $Id: //stdlib/dev/examples/stdlib/tutorial/alg1.cpp#17 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/tutorial/alg2.cpp b/examples/tutorial/alg2.cpp
index e0c515f..0269101 100644
--- a/examples/tutorial/alg2.cpp
+++ b/examples/tutorial/alg2.cpp
@@ -3,20 +3,27 @@
  * alg2.cpp - Examples using STL generic algorithms that search for 
  *            elements that satisfy a condition.
  *
- * $Id: //stdlib/dev/examples/stdlib/tutorial/alg2.cpp#16 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/tutorial/alg3.cpp b/examples/tutorial/alg3.cpp
index a4eb916..e8fb149 100644
--- a/examples/tutorial/alg3.cpp
+++ b/examples/tutorial/alg3.cpp
@@ -3,20 +3,27 @@
  * alg3.cpp - Sample programs for STL generic algorihtms that modify 
  *            their arguments in place.
  *
- * $Id: //stdlib/dev/examples/stdlib/tutorial/alg3.cpp#24 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/tutorial/alg4.cpp b/examples/tutorial/alg4.cpp
index 7e0615f..c7f7058 100644
--- a/examples/tutorial/alg4.cpp
+++ b/examples/tutorial/alg4.cpp
@@ -3,20 +3,27 @@
  * alg4.cpp - Example programs for STL generic algorithms removal 
  *            algorithms.
  *
- * $Id: //stdlib/dev/examples/stdlib/tutorial/alg4.cpp#14 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/tutorial/alg5.cpp b/examples/tutorial/alg5.cpp
index 3f04014..9ed9183 100644
--- a/examples/tutorial/alg5.cpp
+++ b/examples/tutorial/alg5.cpp
@@ -3,20 +3,27 @@
  * alg5.cpp - Example programs for STL generic algorithms those 
  *            producing scalar values.
  *
- * $Id: //stdlib/dev/examples/stdlib/tutorial/alg5.cpp#14 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
  
diff --git a/examples/tutorial/alg6.cpp b/examples/tutorial/alg6.cpp
index 17ffb34..78ffcbb 100644
--- a/examples/tutorial/alg6.cpp
+++ b/examples/tutorial/alg6.cpp
@@ -2,20 +2,27 @@
  *
  * alg6.cpp - STL generic algorithms that produce new sequences.
  *
- * $Id: //stdlib/dev/examples/stdlib/tutorial/alg6.cpp#16 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/tutorial/alg7.cpp b/examples/tutorial/alg7.cpp
index 4bbf651..361ea3c 100644
--- a/examples/tutorial/alg7.cpp
+++ b/examples/tutorial/alg7.cpp
@@ -2,20 +2,27 @@
  *
  * alg7.cpp - Illustrate the use of the sort related generic algorithms.
  *
- * $Id: //stdlib/dev/examples/stdlib/tutorial/alg7.cpp#19 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/tutorial/calc.cpp b/examples/tutorial/calc.cpp
index adc540c..c2ba473 100644
--- a/examples/tutorial/calc.cpp
+++ b/examples/tutorial/calc.cpp
@@ -2,20 +2,27 @@
  *
  * calc.cpp - RPN Calculator -- Illustration of the use of stacks.
  *
- * $Id: //stdlib/dev/examples/stdlib/tutorial/calc.cpp#10 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/tutorial/complx.cpp b/examples/tutorial/complx.cpp
index 8905c3a..91f92ae 100644
--- a/examples/tutorial/complx.cpp
+++ b/examples/tutorial/complx.cpp
@@ -2,20 +2,27 @@
  *
  * complx.cpp - Complex Number example program.
  *
- * $Id: //stdlib/dev/examples/stdlib/tutorial/complx.cpp#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/tutorial/concord.cpp b/examples/tutorial/concord.cpp
index f22ee52..90e61b4 100644
--- a/examples/tutorial/concord.cpp
+++ b/examples/tutorial/concord.cpp
@@ -2,20 +2,27 @@
  *
  * concord.cpp - Concordance sample program.
  *
- * $Id: //stdlib/dev/examples/stdlib/tutorial/concord.cpp#17 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/tutorial/dynatype.cpp b/examples/tutorial/dynatype.cpp
index 8865092..97ebd87 100644
--- a/examples/tutorial/dynatype.cpp
+++ b/examples/tutorial/dynatype.cpp
@@ -2,20 +2,27 @@
  *
  * dynatype.cpp - Example program of map. See Class Reference Section
  *
- * $Id: //stdlib/dev/examples/stdlib/tutorial/dynatype.cpp#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2005 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -51,7 +58,7 @@
     // helper: copies one instance of dynatype to another
     template <class T>
     void copy (const dynatype &rhs) {
-        *this = static_cast<T>(rhs);
+        *this = static_cast<const T&>(rhs);
     }
 
     // pointers to the helpers (do not depend on a template parameter)
@@ -90,11 +97,11 @@
         return map<T>::get () [this];
     }
 
-    // retrieve a value of the concrete type from an instance of
+    // retrieve a const reference to the concrete type from an instance of
     // dynatype throws std::bad_cast if the types don't match exactly
     template <class T>
-    operator T () const {
-        return static_cast<T&> (*const_cast<dynatype*>(this));
+    operator const T& () const {
+        return static_cast<T&> (*const_cast<dynatype*> (this));
     }
 
     // assign a value of any type to an instance of dynatype
@@ -105,27 +112,19 @@
 
 // 14.7.3, p6 - explicit specializations must be defined before first use
 template <>
-inline void dynatype::remove<dynatype::map<void> >()
+inline void dynatype::remove<void> ()
 { /* no-op */ }
 
 
 template <>
-inline void dynatype::copy<dynatype::map<void> >(const dynatype&)
+inline void dynatype::copy<void> (const dynatype&)
 { /* no-op */ }
 
 
-template <>
-inline dynatype& dynatype::operator= (const dynatype::map<void>&)
-{
-    // no-op
-    return *this;
-}
-
-
 // initialize with pointers to no-ops
 inline dynatype::dynatype ()
-    : p_remove (&dynatype::remove<map<void> >),
-      p_copy (&dynatype::copy<map<void> >)
+    : p_remove (&dynatype::remove<void>),
+      p_copy (&dynatype::copy<void>)
 {
 }
 
@@ -220,7 +219,7 @@
 
         // attempt to extract any value from an unitialized dynatype fails
         std::cout << "char (v3) = "
-                  << char (v1) << std::endl;
+                  << char (v3) << std::endl;
         
     }
     catch (...) {
diff --git a/examples/tutorial/graph.cpp b/examples/tutorial/graph.cpp
index e3a3035..3bb25c1 100644
--- a/examples/tutorial/graph.cpp
+++ b/examples/tutorial/graph.cpp
@@ -2,20 +2,27 @@
  *
  * graph.cpp - Example of a Graph built from STL's map.
  *
- * $Id: //stdlib/dev/examples/stdlib/tutorial/graph.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/tutorial/icecream.cpp b/examples/tutorial/icecream.cpp
index 13d36ad..167b888 100644
--- a/examples/tutorial/icecream.cpp
+++ b/examples/tutorial/icecream.cpp
@@ -2,20 +2,27 @@
  *
  * icecream.cpp - Priority queue example program.
  *
- * $Id: //stdlib/dev/examples/stdlib/tutorial/icecream.cpp#16 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/tutorial/out/dynatype.out b/examples/tutorial/out/dynatype.out
new file mode 100644
index 0000000..c9055d6
--- /dev/null
+++ b/examples/tutorial/out/dynatype.out
@@ -0,0 +1,7 @@
+dynatype v1 = 1
+int (v1) = 1
+double (v1 = 3.14) = 3.14
+double (v2 = v1) = 3.14
+(const char*)(v2 = "abc") = abc
+(const char*)(v1 = v2) = abc
+exception
diff --git a/examples/tutorial/out/exceptn.out b/examples/tutorial/out/exceptn.out
deleted file mode 100644
index 880265d..0000000
--- a/examples/tutorial/out/exceptn.out
+++ /dev/null
@@ -1 +0,0 @@
-Got an exception: a runtime error
diff --git a/examples/tutorial/radix.cpp b/examples/tutorial/radix.cpp
index 8b776ea..24800a4 100644
--- a/examples/tutorial/radix.cpp
+++ b/examples/tutorial/radix.cpp
@@ -2,20 +2,27 @@
  *
  * radix.cpp - Radix sort employing various STL classes.
  *
- * $Id: //stdlib/dev/examples/stdlib/tutorial/radix.cpp#14 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/tutorial/sieve.cpp b/examples/tutorial/sieve.cpp
index e0dbe5b..f0c6dc8 100644
--- a/examples/tutorial/sieve.cpp
+++ b/examples/tutorial/sieve.cpp
@@ -2,20 +2,27 @@
  *
  * sieve.cpp - Prime numbers sieve program.
  *
- * $Id: //stdlib/dev/examples/stdlib/tutorial/sieve.cpp#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/tutorial/spell.cpp b/examples/tutorial/spell.cpp
index d93dcab..2330653 100644
--- a/examples/tutorial/spell.cpp
+++ b/examples/tutorial/spell.cpp
@@ -2,20 +2,27 @@
  *
  * spell.cpp - A spell checking program.
  *
- * $Id: //stdlib/dev/examples/stdlib/tutorial/spell.cpp#13 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/tutorial/exceptn.cpp b/examples/tutorial/stdexcept.cpp
similarity index 67%
rename from examples/tutorial/exceptn.cpp
rename to examples/tutorial/stdexcept.cpp
index 09e85af..bb79971 100644
--- a/examples/tutorial/exceptn.cpp
+++ b/examples/tutorial/stdexcept.cpp
@@ -1,21 +1,28 @@
 /**************************************************************************
  *
- * exceptn.cpp - Illustrate the use of Standard exceptions.
+ * stdexcept.cpp - Illustrate the use of C++ Standard Library exceptions.
  *
- * $Id: //stdlib/dev/examples/stdlib/tutorial/exceptn.cpp#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2005 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/tutorial/stocks.cpp b/examples/tutorial/stocks.cpp
index 65eb465..686d56c 100644
--- a/examples/tutorial/stocks.cpp
+++ b/examples/tutorial/stocks.cpp
@@ -3,20 +3,27 @@
  * stocks.cpp - An example program using STL's  money_punct, num_put
  *              and time_put locale facets.
  *
- * $Id: //stdlib/dev/examples/stdlib/tutorial/stocks.cpp#21 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/tutorial/tele.cpp b/examples/tutorial/tele.cpp
index 63ad7d0..175dc54 100644
--- a/examples/tutorial/tele.cpp
+++ b/examples/tutorial/tele.cpp
@@ -2,20 +2,27 @@
  *
  * tele.cpp - Telephone directory sample program.
  *
- * $Id: //stdlib/dev/examples/stdlib/tutorial/tele.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/tutorial/teller.cpp b/examples/tutorial/teller.cpp
index 8d261e0..fb204fe 100644
--- a/examples/tutorial/teller.cpp
+++ b/examples/tutorial/teller.cpp
@@ -2,20 +2,27 @@
  *
  * teller.cpp - Bank teller sample program.
  *
- * $Id: //stdlib/dev/examples/stdlib/tutorial/teller.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/examples/tutorial/widwork.cpp b/examples/tutorial/widwork.cpp
index f99e6b0..4d90199 100644
--- a/examples/tutorial/widwork.cpp
+++ b/examples/tutorial/widwork.cpp
@@ -2,20 +2,27 @@
  *
  * widwork.cpp - Widget works inventory example.
  *
- * $Id: //stdlib/dev/examples/stdlib/tutorial/widwork.cpp#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/algorithm b/include/algorithm
index c2d517b..084d634 100644
--- a/include/algorithm
+++ b/include/algorithm
@@ -21,16 +21,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/_cassert.h b/include/ansi/_cassert.h
index 07db1da..7fed78f 100644
--- a/include/ansi/_cassert.h
+++ b/include/ansi/_cassert.h
@@ -3,20 +3,27 @@
  *
  * _cassert.h - C++ Standard library interface to the ANSI C header assert.h
  *
- * $Id: //stdlib/dev/include/ansi/_cassert.h#10 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/_cctype.h b/include/ansi/_cctype.h
index 0edd973..ad716a2 100644
--- a/include/ansi/_cctype.h
+++ b/include/ansi/_cctype.h
@@ -3,20 +3,27 @@
  *
  * _cctype.h - C++ Standard library interface to the ANSI C header ctype.h
  *
- * $Id: //stdlib/dev/include/ansi/_cctype.h#7 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/_cerrno.h b/include/ansi/_cerrno.h
index e8beb63..f95ea06 100644
--- a/include/ansi/_cerrno.h
+++ b/include/ansi/_cerrno.h
@@ -3,20 +3,27 @@
  *
  * _cerrno.h - C++ Standard library interface to the ANSI C header errno.h
  *
- * $Id: //stdlib/dev/include/ansi/_cerrno.h#10 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/_cfloat.h b/include/ansi/_cfloat.h
index 92d24e6..3fb0842 100644
--- a/include/ansi/_cfloat.h
+++ b/include/ansi/_cfloat.h
@@ -3,20 +3,27 @@
  *
  * _cfloat.h - C++ Standard library interface to the ANSI C header float.h
  *
- * $Id: //stdlib/dev/include/ansi/_cfloat.h#10 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/_clocale.h b/include/ansi/_clocale.h
index 75d3203..e5ccc73 100644
--- a/include/ansi/_clocale.h
+++ b/include/ansi/_clocale.h
@@ -3,20 +3,27 @@
  *
  * _clocale.h - C++ Standard library interface to the ANSI C header locale.h
  *
- * $Id: //stdlib/dev/include/ansi/_clocale.h#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/_cmath.h b/include/ansi/_cmath.h
index d8b4c34..d3ff793 100644
--- a/include/ansi/_cmath.h
+++ b/include/ansi/_cmath.h
@@ -3,20 +3,27 @@
  *
  * cmath - C++ Standard library interface to the ANSI C header math.h
  *
- * $Id: //stdlib/dev/include/ansi/_cmath.h#8 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/_csetjmp.h b/include/ansi/_csetjmp.h
index b56d834..49fd342 100644
--- a/include/ansi/_csetjmp.h
+++ b/include/ansi/_csetjmp.h
@@ -3,20 +3,27 @@
  *
  * csetjmp - C++ Standard library interface to the ANSI C header setjmp.h
  *
- * $Id: //stdlib/dev/include/ansi/_csetjmp.h#8 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/_cstdarg.h b/include/ansi/_cstdarg.h
index c83ef5f..f8afcc7 100644
--- a/include/ansi/_cstdarg.h
+++ b/include/ansi/_cstdarg.h
@@ -3,20 +3,27 @@
  *
  * _cstdarg.h - C++ Standard library interface to the ANSI C header stdarg.h
  *
- * $Id: //stdlib/dev/include/ansi/_cstdarg.h#8 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/_cstddef.h b/include/ansi/_cstddef.h
index e721986..2d2f808 100644
--- a/include/ansi/_cstddef.h
+++ b/include/ansi/_cstddef.h
@@ -3,20 +3,27 @@
  *
  * _cstddef.h - C++ Standard library interface to the ANSI C header stddef.h
  *
- * $Id: //stdlib/dev/include/ansi/_cstddef.h#7 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/_cstdio.h b/include/ansi/_cstdio.h
index e010971..b6597d1 100644
--- a/include/ansi/_cstdio.h
+++ b/include/ansi/_cstdio.h
@@ -3,20 +3,27 @@
  *
  * cstdio - C++ Standard library interface to the ANSI C header stdio.h
  *
- * $Id: //stdlib/dev/include/ansi/_cstdio.h#14 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/_cstring.h b/include/ansi/_cstring.h
index 118f73c..fdf92d9 100644
--- a/include/ansi/_cstring.h
+++ b/include/ansi/_cstring.h
@@ -3,20 +3,27 @@
  *
  * cstring - C++ Standard library interface to the ANSI C header string.h
  *
- * $Id: //stdlib/dev/include/ansi/_cstring.h#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/_ctime.h b/include/ansi/_ctime.h
index 97698e4..672a79e 100644
--- a/include/ansi/_ctime.h
+++ b/include/ansi/_ctime.h
@@ -3,20 +3,27 @@
  *
  * ctime - C++ Standard library interface to the ANSI C header time.h
  *
- * $Id: //stdlib/dev/include/ansi/_ctime.h#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/_cwchar.h b/include/ansi/_cwchar.h
index 5a80a52..8f59905 100644
--- a/include/ansi/_cwchar.h
+++ b/include/ansi/_cwchar.h
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/_cwctype.h b/include/ansi/_cwctype.h
index bbf4984..a4b4d00 100644
--- a/include/ansi/_cwctype.h
+++ b/include/ansi/_cwctype.h
@@ -3,20 +3,27 @@
  *
  * cwctype - C++ Standard library interface to the ANSI C header wctype.h
  *
- * $Id: //stdlib/dev/include/ansi/_cwctype.h#8 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/assert.h b/include/ansi/assert.h
index 808b0a0..3d2781d 100644
--- a/include/ansi/assert.h
+++ b/include/ansi/assert.h
@@ -2,20 +2,27 @@
  *
  * assert.h
  *
- * $Id: //stdlib/dev/include/ansi/assert.h#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/cassert b/include/ansi/cassert
index 4da46a0..80d183c 100644
--- a/include/ansi/cassert
+++ b/include/ansi/cassert
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/cctype b/include/ansi/cctype
index 1328176..f0d42e7 100644
--- a/include/ansi/cctype
+++ b/include/ansi/cctype
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/cerrno b/include/ansi/cerrno
index 23fb1d7..fd32031 100644
--- a/include/ansi/cerrno
+++ b/include/ansi/cerrno
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/cfloat b/include/ansi/cfloat
index 1dd1dc3..1ffa7ea 100644
--- a/include/ansi/cfloat
+++ b/include/ansi/cfloat
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/ciso646 b/include/ansi/ciso646
index 3b01f5b..373bdab 100644
--- a/include/ansi/ciso646
+++ b/include/ansi/ciso646
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/climits b/include/ansi/climits
index 06ebeea..195c5ca 100644
--- a/include/ansi/climits
+++ b/include/ansi/climits
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/clocale b/include/ansi/clocale
index 307f0b6..63ea844 100644
--- a/include/ansi/clocale
+++ b/include/ansi/clocale
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/cmath b/include/ansi/cmath
index 0b5c4d5..1b963b6 100644
--- a/include/ansi/cmath
+++ b/include/ansi/cmath
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/csetjmp b/include/ansi/csetjmp
index 2c80b54..f273bb9 100644
--- a/include/ansi/csetjmp
+++ b/include/ansi/csetjmp
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/csignal b/include/ansi/csignal
index 5620784..ad0d006 100644
--- a/include/ansi/csignal
+++ b/include/ansi/csignal
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/cstdarg b/include/ansi/cstdarg
index b2017e7..551c554 100644
--- a/include/ansi/cstdarg
+++ b/include/ansi/cstdarg
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/cstddef b/include/ansi/cstddef
index 1b09fce..544c8c7 100644
--- a/include/ansi/cstddef
+++ b/include/ansi/cstddef
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/cstdio b/include/ansi/cstdio
index 99dee2f..b86f86d 100644
--- a/include/ansi/cstdio
+++ b/include/ansi/cstdio
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/cstdlib b/include/ansi/cstdlib
index 6c30514..6b447e1 100644
--- a/include/ansi/cstdlib
+++ b/include/ansi/cstdlib
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/cstring b/include/ansi/cstring
index c362b77..4dd0b11 100644
--- a/include/ansi/cstring
+++ b/include/ansi/cstring
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/ctime b/include/ansi/ctime
index 985b30e..154d3a9 100644
--- a/include/ansi/ctime
+++ b/include/ansi/ctime
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/ctype.h b/include/ansi/ctype.h
index b563d8f..4fa3c32 100644
--- a/include/ansi/ctype.h
+++ b/include/ansi/ctype.h
@@ -2,20 +2,27 @@
  *
  * ctype.h
  *
- * $Id: //stdlib/dev/include/ansi/ctype.h#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/cwchar b/include/ansi/cwchar
index aba283e..d78b908 100644
--- a/include/ansi/cwchar
+++ b/include/ansi/cwchar
@@ -673,7 +673,7 @@
 
 namespace std {
 
-using ::wcscpy
+using ::wcscpy;
 
 #  undef _RWSTD_NO_WCSCPY
 #endif   // _RWSTD_NO_WCSCPY
@@ -728,7 +728,7 @@
 
 namespace std {
 
-using ::wcsftime
+using ::wcsftime;
 
 #endif   // _RWSTD_NO_WCSFTIME
 
diff --git a/include/ansi/cwctype b/include/ansi/cwctype
index 1b301da..8affdc1 100644
--- a/include/ansi/cwctype
+++ b/include/ansi/cwctype
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/errno.h b/include/ansi/errno.h
index 9b1e5c8..7acb057 100644
--- a/include/ansi/errno.h
+++ b/include/ansi/errno.h
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/float.h b/include/ansi/float.h
index 9f87704..765fb19 100644
--- a/include/ansi/float.h
+++ b/include/ansi/float.h
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/limits.h b/include/ansi/limits.h
index e4dd209..fb2bcd1 100644
--- a/include/ansi/limits.h
+++ b/include/ansi/limits.h
@@ -2,20 +2,27 @@
  *
  * limits.h
  *
- * $Id: //stdlib/dev/include/ansi/limits.h#17 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/locale.h b/include/ansi/locale.h
index d96524f..3cc2c97 100644
--- a/include/ansi/locale.h
+++ b/include/ansi/locale.h
@@ -2,20 +2,27 @@
  *
  * locale.h
  *
- * $Id: //stdlib/dev/include/ansi/locale.h#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/math.h b/include/ansi/math.h
index caee259..bf639cb 100644
--- a/include/ansi/math.h
+++ b/include/ansi/math.h
@@ -2,20 +2,27 @@
  *
  * math.h - C++ Standard library wrapper for the ANSI C library header
  *
- * $Id: //stdlib/dev/include/ansi/math.h#13 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/setjmp.h b/include/ansi/setjmp.h
index faad207..a0804f6 100644
--- a/include/ansi/setjmp.h
+++ b/include/ansi/setjmp.h
@@ -2,20 +2,27 @@
  *
  * setjmp.h
  *
- * $Id: //stdlib/dev/include/ansi/setjmp.h#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/signal.h b/include/ansi/signal.h
index 06077d6..39432d8 100644
--- a/include/ansi/signal.h
+++ b/include/ansi/signal.h
@@ -2,20 +2,27 @@
  *
  * signal.h
  *
- * $Id: //stdlib/dev/include/ansi/signal.h#13 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/stdarg.h b/include/ansi/stdarg.h
index d32dfb6..d53f26b 100644
--- a/include/ansi/stdarg.h
+++ b/include/ansi/stdarg.h
@@ -2,20 +2,27 @@
  *
  * stdarg.h
  *
- * $Id: //stdlib/dev/include/ansi/stdarg.h#14 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/stddef.h b/include/ansi/stddef.h
index 5aba953..4778ad4 100644
--- a/include/ansi/stddef.h
+++ b/include/ansi/stddef.h
@@ -2,20 +2,27 @@
  *
  * stddef.h
  *
- * $Id: //stdlib/dev/include/ansi/stddef.h#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/stdio.h b/include/ansi/stdio.h
index 0c4313e..5facb89 100644
--- a/include/ansi/stdio.h
+++ b/include/ansi/stdio.h
@@ -2,20 +2,27 @@
  *
  * stdio.h
  *
- * $Id: //stdlib/dev/include/ansi/stdio.h#12 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/stdlib.h b/include/ansi/stdlib.h
index aa331aa..9a5c6d5 100644
--- a/include/ansi/stdlib.h
+++ b/include/ansi/stdlib.h
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/string.h b/include/ansi/string.h
index 23ff4bd..6210876 100644
--- a/include/ansi/string.h
+++ b/include/ansi/string.h
@@ -2,20 +2,27 @@
  *
  * string.h
  *
- * $Id: //stdlib/dev/include/ansi/string.h#15 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2005 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -92,6 +99,34 @@
 #    undef strncpy
 
 
+#if defined (_RWSTD_NO_MEMCHR) && !defined (_RWSTD_NO_MEMCHR_IN_LIBC)
+
+extern "C" void* memchr (void*, int, _RWSTD_SIZE_T);
+
+inline const void* memchr (const void *__s, int __c, _RWSTD_SIZE_T __n)
+{
+    return memchr (_RWSTD_CONST_CAST (void*, __s), __c, __n);
+}
+
+#  undef _RWSTD_NO_MEMCHR
+
+#endif   // _RWSTD_NO_MEMCHR && !_RWSTD_NO_MEMCHR_IN_LIBC
+
+
+#if defined (_RWSTD_NO_STRPBRK) && !defined (_RWSTD_NO_STRPBRK_IN_LIBC)
+
+extern "C" char* strpbrk (char*, const char*);
+
+inline const char* strpbrk (const char *__s, const char *__pat)
+{
+    return strpbrk (_RWSTD_CONST_CAST (char*, __s), __pat);
+}
+
+#  undef _RWSTD_NO_STRPBRK
+
+#endif   // _RWSTD_NO_STRPBRK && !_RWSTD_NO_STRPBRK_IN_LIBC
+
+
 #if defined (_RWSTD_NO_STRCHR) && !defined (_RWSTD_NO_STRCHR_IN_LIBC)
 
 extern "C" char* strchr (char*, int);
diff --git a/include/ansi/time.h b/include/ansi/time.h
index 030f9c0..b9229c4 100644
--- a/include/ansi/time.h
+++ b/include/ansi/time.h
@@ -2,20 +2,27 @@
  *
  * time.h
  *
- * $Id: //stdlib/dev/include/ansi/time.h#14 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/wchar.h b/include/ansi/wchar.h
index 0a585bb..2807222 100644
--- a/include/ansi/wchar.h
+++ b/include/ansi/wchar.h
@@ -2,20 +2,27 @@
  *
  * wchar.h
  *
- * $Id: //stdlib/dev/include/ansi/wchar.h#19 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/wctype.h b/include/ansi/wctype.h
index 279d86f..9e13f05 100644
--- a/include/ansi/wctype.h
+++ b/include/ansi/wctype.h
@@ -2,20 +2,27 @@
  *
  * wctype.h
  *
- * $Id: //stdlib/dev/include/ansi/wctype.h#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/bitset b/include/bitset
index 93d003f..9054d15 100644
--- a/include/bitset
+++ b/include/bitset
@@ -7,22 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
- * Copyright 1994-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -108,8 +109,6 @@
                 _C_elembits - _Size % _C_elembits) % _C_elembits));
     }
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     template <class _CharT, class _Traits>
     void _C_from_char (const _CharT *__str, _RWSTD_SIZE_T __len,
                        const _Traits *__traits, _CharT __b0, _CharT __b1,
@@ -120,32 +119,6 @@
                           __pos, __n, __file, __fun);
     }
 
-#else   // ifdef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
-    void _C_from_char (const char *__str, _RWSTD_SIZE_T __len,
-                       const char_traits<char>* __traits, char __b0, char __b1,
-                       _RWSTD_SIZE_T __pos, _RWSTD_SIZE_T __n,
-                       const char *__file, const char *__fun) {
-        _RW::__rw_bitset (_C_bits, _Size, __str, __len,
-                          __traits, __b0, __b1,
-                          __pos, __n, __file, __fun);
-    }
-
-#  ifndef _RWSTD_NO_WCHAR_T
-
-    void _C_from_char (const wchar_t *__str, _RWSTD_SIZE_T __len,
-                       const char_traits<wchar_t*> __traits,
-                       wchar_t __b0, wchar_t __b1,
-                       _RWSTD_SIZE_T __pos, _RWSTD_SIZE_T __n,
-                       const char *__file, const char *__fun) {
-        _RW::__rw_bitset (_C_bits, _Size, __str, __len,
-                          __traits, __b0, __b1,
-                          __pos, __n, __file, __fun);
-    }
-
-#  endif   // _RWSTD_NO_WCHAR_T
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
 public:
 
     class reference {
@@ -189,10 +162,8 @@
         _C_from_ulong (__n);
     }
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
-#  if    !defined (_RWSTD_NO_NONDEDUCED_CONTEXT) \
-      && (!defined (__SUNPRO_CC) || __SUNPRO_CC > 0x550)
+#if    !defined (_RWSTD_NO_NONDEDUCED_CONTEXT) \
+    && (!defined (__SUNPRO_CC) || __SUNPRO_CC > 0x550)
 
     // 23.3.5.1, p3
     template <class _CharT, class _Traits, class _Allocator>
@@ -210,7 +181,7 @@
                                    "size_type, size_type)"));
     }
 
-#  else   // if defined (_RWSTD_NO_NONDEDUCED_CONTEXT)
+#else   // if defined (_RWSTD_NO_NONDEDUCED_CONTEXT)
 
     // working around a SunPro 5.5 and prior bug (PR #28992)
 
@@ -226,8 +197,7 @@
                                    "size_t, size_t)"));
     }
 
-#  endif   // _RWSTD_NO_NONDEDUCED_CONTEXT
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // _RWSTD_NO_NONDEDUCED_CONTEXT
 
 
 #ifndef _RWSTD_NO_EXT_BITSET_CTOR_STRING
@@ -290,8 +260,6 @@
 
 #  endif   // _RWSTD_NO_WCHAR_T
 
-#  ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     // extension:
     // uses char_traits<CharT>::length() to compute the length of the string
     // and char_traits<CharT>::eq() to compare characters with `b0' and `b1'
@@ -306,8 +274,6 @@
                                    "size_t, size_t)"));
     }
 
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     // extensions:
     // prevent ambiguities between the above and bitset(unsigned long)
     bitset (int __n) _THROWS (()) {
@@ -420,8 +386,7 @@
 # define _RWSTD_BITSET_TO_STRING(charT, Traits) \
     template to_string<charT, Traits, allocator <charT> >()
 
-#  if    !defined (_RWSTD_NO_EXT_BITSET_TO_STRING) \
-      && !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#  ifndef _RWSTD_NO_EXT_BITSET_TO_STRING
 
     // convenience extensions
     template <class _CharT, class _Traits>
@@ -443,7 +408,7 @@
             (__b0, __b1);
     }
 
-#  endif   // !_NO_EXT_BITSET_TO_STRING && !NO_INLINE_MEMBER_TEMPLATES
+#  endif   // !_NO_EXT_BITSET_TO_STRING
 
 #else   // if _MEMBER_TEMPLATES || _NO_TEMPLATE_ON_RETURN_TYPE || ...
 
diff --git a/include/complex b/include/complex
index e252804..4d22e52 100644
--- a/include/complex
+++ b/include/complex
@@ -748,84 +748,36 @@
 
 // complex number `a' raised to an integer power `n'
 //     a**n = r**n * (cos(n theta) + i sin (n theta))
+_EXPORT
 template <class _TypeT>
-inline complex<_TypeT> pow (const complex<_TypeT>& __a, int __n)
-{
-    if (__a == complex<_TypeT>())
-        return complex<_TypeT>(0 == __n);
-
-    if (_TypeT () == __a.imag ()) {
-        if (__a.real () < _TypeT ())
-            return pow (__a, complex<_TypeT>(__n));
-
-        return complex<_TypeT>(_RWSTD_C::pow (__a.real (), __n));
-    }
-
-    _TypeT __r  = _RWSTD_C::pow (_TypeT (abs (__a)), __n);
-    _TypeT __th = __n * arg (__a);
-
-    return complex<_TypeT>(__r * _RWSTD_C::cos (__th),
-                           __r * _RWSTD_C::sin (__th));
-}
+complex<_TypeT>
+pow (const complex<_TypeT>&, int);
 
 
 // complex number `a' raised to a real power `s'
 //     a**s = exp(s * log(a))
+_EXPORT
 template <class _TypeT>
-inline complex<_TypeT> pow (const complex<_TypeT> &__a, const _TypeT &__s)
-{
-    if (__a == complex<_TypeT>())
-        return complex<_TypeT>(_TypeT () == __s);
-
-    if (_TypeT () == __a.imag ()) {
-        if (__a.real () < _TypeT ())
-            return pow (__a, complex<_TypeT>(__s));
-
-        return complex<_TypeT>(_RWSTD_C::pow (__a.real (), __s));
-    }
-    return exp (__s * log (__a));
-}
+complex<_TypeT>
+pow (const complex<_TypeT>&, const _TypeT&);
 
 
 // real number `s' raised to a complex power `a'
 //     s**a = exp(a * log (s))
+_EXPORT
 template <class _TypeT>
-inline complex<_TypeT> pow (const _TypeT& __s, const complex<_TypeT>& __a)
-{
-    if (_TypeT() == __s)
-        return complex<_TypeT>(complex<_TypeT>() == __a);
-
-    if (__s < _TypeT ())
-        return pow (complex<_TypeT>(__s), __a);
-
-    if (_TypeT () == __a.imag ())
-        return complex<_TypeT>(_RWSTD_C::pow (__s, __a.real ()));
-
-    return complex<_TypeT>(exp(__a * _TypeT (_RWSTD_C::log (__s))));
-}
+complex<_TypeT>
+pow (const _TypeT&, const complex<_TypeT>&);
 
 
 // complex<T> number `a1' raised to `a' complex<T> power `a2'
 //     a1**a2 = rho * (cos(phi) + i sin(phi))
 //     rho = r1 ** u2   *  exp (-v2 * theta1)
 //     phi = v2 * log(r1) + u2 * theta1
+_EXPORT
 template <class _TypeT>
 inline complex<_TypeT>
-pow (const complex<_TypeT>& __x, const complex<_TypeT>& __y)
-{
-    if (complex<_TypeT>() == __x)
-        return complex<_TypeT>(complex<_TypeT>() == __y);
-
-    _TypeT __r1  = abs (__x);
-    _TypeT __u2  = real (__y);
-    _TypeT __v2  = imag (__y);
-    _TypeT __th1 = arg (__x);
-    _TypeT __rho = _RWSTD_C::pow (__r1, __u2) * _RWSTD_C::exp (-__v2 * __th1);
-    _TypeT __phi = __v2 * _RWSTD_C::log (__r1) + __u2 * __th1;
-
-    return complex<_TypeT>(__rho * _RWSTD_C::cos (__phi),
-                           __rho * _RWSTD_C::sin (__phi));
-}      
+pow (const complex<_TypeT>&, const complex<_TypeT>&);
 
 
 // complex<T> sine of complex<T> number `a'
@@ -887,61 +839,17 @@
 
 
 // 26.2.6, p12: MT-safe extractor (not atomic)
+_EXPORT
 template <class _TypeT, class _CharT, class _Traits>
-inline basic_istream<_CharT, _Traits >&
-operator>> (basic_istream<_CharT, _Traits>& __strm, complex<_TypeT> &__val)
-{
-    // read a complex number in one of the following forms:
-    // "r", "(r)", "(r, i)"
-
-    // lwg issue 156: extraction is performed as a series of simpler
-    // extractions. Therefore, the skipping of whitespace is specified
-    // to be the same for each of the simpler extractions.
-
-    _TypeT __re = _TypeT (),
-           __im = _TypeT ();
-
-    _CharT __ch;
-
-    if (!(__strm >> __ch))
-        return __strm;
-
-    if ('(' == __ch) {
-        if (__strm >> __re && __strm >> __ch) {
-            if (',' == __ch && __strm >> __im)
-                __strm >> __ch;
-
-            // avoid setting failbit if either badbit
-            // or failbit is already set in the stream
-            if (')' != __ch && __strm)
-                __strm.setstate (__strm.failbit);
-        }
-    }
-    else if (__strm.putback (__ch)) {
-        __strm >> __re;
-    }
-
-    if (__strm)
-      __val = complex<_TypeT>(__re, __im);
-
-    return __strm;
-}
+basic_istream<_CharT, _Traits >&
+operator>> (basic_istream<_CharT, _Traits>&, complex<_TypeT>&);
 
 
 // 26.2.6, p15: MT-safe atomic inserter
+_EXPORT
 template <class _TypeT, class _CharT, class _Traits>
-inline basic_ostream<_CharT, _Traits>&
-operator<< (basic_ostream<_CharT, _Traits >& __strm,
-            const complex<_TypeT>&           __val)
-{
-    basic_ostringstream<_CharT, _Traits, allocator<_CharT> > __ss;
-    __ss.flags (__strm.flags ());
-    __ss.imbue (__strm.getloc ());
-    __ss.precision (__strm.precision ());
-    __ss << '(' << __val.real () << ',' << __val.imag () << ')';
-    return __strm << __ss.str ();
-}
-
+basic_ostream<_CharT, _Traits>&
+operator<< (basic_ostream<_CharT, _Traits>&, const complex<_TypeT>&);
 
 }   // namespace std
 
@@ -951,4 +859,9 @@
 #endif   // _MSC_VER
 
 
+#if _RWSTD_DEFINE_TEMPLATE (_COMPLEX)
+#  include <complex.cc>
+#endif   // _RWSTD_DEFINE_TEMPLATE (_BASIC_OSTREAM)
+
+
 #endif   // _RWSTD_COMPLEX_INCLUDED
diff --git a/include/complex.c b/include/complex.c
new file mode 100644
index 0000000..5173d6c
--- /dev/null
+++ b/include/complex.c
@@ -0,0 +1,29 @@
+/***************************************************************************
+ *
+ * complex.c
+ *
+ * $Id:$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2000-2006 Rogue Wave Software.
+ * 
+ **************************************************************************/
+
+#include <complex.cc>
diff --git a/include/complex.cc b/include/complex.cc
new file mode 100644
index 0000000..46a95ff
--- /dev/null
+++ b/include/complex.cc
@@ -0,0 +1,180 @@
+// -*- C++ -*-
+/***************************************************************************
+ *
+ * complex.cc - definitions of the template complex and specializations
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2000-2006 Rogue Wave Software.
+ * 
+ **************************************************************************/
+
+
+_RWSTD_NAMESPACE (std) { 
+
+
+// complex number `a' raised to an integer power `n'
+//     a**n = r**n * (cos(n theta) + i sin (n theta))
+_EXPORT
+template <class _TypeT>
+complex<_TypeT>
+pow (const complex<_TypeT>& __a, int __n)
+{
+    if (__a == complex<_TypeT>())
+        return complex<_TypeT>(0 == __n);
+
+    if (_TypeT () == __a.imag ()) {
+        if (__a.real () < _TypeT ())
+            return pow (__a, complex<_TypeT>(__n));
+
+        return complex<_TypeT>(_RWSTD_C::pow (__a.real (), __n));
+    }
+
+    _TypeT __r  = _RWSTD_C::pow (_TypeT (abs (__a)), __n);
+    _TypeT __th = __n * arg (__a);
+
+    return complex<_TypeT>(__r * _RWSTD_C::cos (__th),
+                           __r * _RWSTD_C::sin (__th));
+}
+
+
+// complex number `a' raised to a real power `s'
+//     a**s = exp(s * log(a))
+_EXPORT
+template <class _TypeT>
+complex<_TypeT>
+pow (const complex<_TypeT> &__a, const _TypeT &__s)
+{
+    if (__a == complex<_TypeT>())
+        return complex<_TypeT>(_TypeT () == __s);
+
+    if (_TypeT () == __a.imag ()) {
+        if (__a.real () < _TypeT ())
+            return pow (__a, complex<_TypeT>(__s));
+
+        return complex<_TypeT>(_RWSTD_C::pow (__a.real (), __s));
+    }
+    return exp (__s * log (__a));
+}
+
+
+// real number `s' raised to a complex power `a'
+//     s**a = exp(a * log (s))
+_EXPORT
+template <class _TypeT>
+complex<_TypeT>
+pow (const _TypeT& __s, const complex<_TypeT>& __a)
+{
+    if (_TypeT() == __s)
+        return complex<_TypeT>(complex<_TypeT>() == __a);
+
+    if (__s < _TypeT ())
+        return pow (complex<_TypeT>(__s), __a);
+
+    if (_TypeT () == __a.imag ())
+        return complex<_TypeT>(_RWSTD_C::pow (__s, __a.real ()));
+
+    return complex<_TypeT>(exp(__a * _TypeT (_RWSTD_C::log (__s))));
+}
+
+
+// complex<T> number `a1' raised to `a' complex<T> power `a2'
+//     a1**a2 = rho * (cos(phi) + i sin(phi))
+//     rho = r1 ** u2   *  exp (-v2 * theta1)
+//     phi = v2 * log(r1) + u2 * theta1
+_EXPORT
+template <class _TypeT>
+complex<_TypeT>
+pow (const complex<_TypeT>& __x, const complex<_TypeT>& __y)
+{
+    if (complex<_TypeT>() == __x)
+        return complex<_TypeT>(complex<_TypeT>() == __y);
+
+    _TypeT __r1  = abs (__x);
+    _TypeT __u2  = real (__y);
+    _TypeT __v2  = imag (__y);
+    _TypeT __th1 = arg (__x);
+    _TypeT __rho = _RWSTD_C::pow (__r1, __u2) * _RWSTD_C::exp (-__v2 * __th1);
+    _TypeT __phi = __v2 * _RWSTD_C::log (__r1) + __u2 * __th1;
+
+    return complex<_TypeT>(__rho * _RWSTD_C::cos (__phi),
+                           __rho * _RWSTD_C::sin (__phi));
+}      
+
+
+_EXPORT
+template <class _TypeT, class _CharT, class _Traits>
+basic_istream<_CharT, _Traits >&
+operator>> (basic_istream<_CharT, _Traits>& __strm, complex<_TypeT> &__val)
+{
+    // read a complex number in one of the following forms:
+    // "r", "(r)", "(r, i)"
+
+    // lwg issue 156: extraction is performed as a series of simpler
+    // extractions. Therefore, the skipping of whitespace is specified
+    // to be the same for each of the simpler extractions.
+
+    _TypeT __re = _TypeT (),
+           __im = _TypeT ();
+
+    _CharT __ch;
+
+    if (!(__strm >> __ch))
+        return __strm;
+
+    if ('(' == __ch) {
+        if (__strm >> __re && __strm >> __ch) {
+            if (',' == __ch && __strm >> __im)
+                __strm >> __ch;
+
+            // avoid setting failbit if either badbit
+            // or failbit is already set in the stream
+            if (')' != __ch && __strm)
+                __strm.setstate (__strm.failbit);
+        }
+    }
+    else if (__strm.putback (__ch)) {
+        __strm >> __re;
+    }
+
+    if (__strm)
+      __val = complex<_TypeT>(__re, __im);
+
+    return __strm;
+}
+
+
+_EXPORT
+template <class _TypeT, class _CharT, class _Traits>
+basic_ostream<_CharT, _Traits>&
+operator<< (basic_ostream<_CharT, _Traits >& __strm,
+            const complex<_TypeT>&           __val)
+{
+    basic_ostringstream<_CharT, _Traits, allocator<_CharT> > __ss;
+    __ss.flags (__strm.flags ());
+    __ss.imbue (__strm.getloc ());
+    __ss.precision (__strm.precision ());
+    __ss << '(' << __val.real () << ',' << __val.imag () << ')';
+    return __strm << __ss.str ();
+}
+
+
+}   // namespace std
diff --git a/include/deque b/include/deque
index 1fc6e65..12eff56 100644
--- a/include/deque
+++ b/include/deque
@@ -58,8 +58,7 @@
 template <class _TypeT, class _Allocator = allocator<_TypeT> >
 class deque;
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-#  ifdef _RWSTD_NO_MEMBER_TEMPLATES
+#ifdef _RWSTD_NO_MEMBER_TEMPLATES
 
 // declarations of non-member function templates implementing
 // the functionality of deque member function templates
@@ -84,8 +83,7 @@
 void __rw_insert_range (deque<_TypeT, _Allocator>*, _DequeIter,
                         _BidirIter, _BidirIter, bidirectional_iterator_tag);
 
-#  endif   // _RWSTD_NO_MEMBER_TEMPLATES
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // _RWSTD_NO_MEMBER_TEMPLATES
 
 
 template <class _TypeT, class _DiffT, class _Pointer,
@@ -442,8 +440,6 @@
         assign (__n, __x);
     }
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     template <class _InputIter>
     deque (_InputIter __first, _InputIter __last,
            const allocator_type &__alloc = allocator_type ())
@@ -452,26 +448,6 @@
         assign (__first, __last);
     }
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
-    deque (const_iterator __first, const_iterator __last,
-           const allocator_type &__alloc = allocator_type ())
-        : allocator_type (__alloc) {
-        _RWSTD_ASSERT_RANGE (__first, __last);
-        _C_init ();
-        assign (__first, __last);
-    }
-    
-    deque (const_pointer __first, const_pointer __last,
-           const allocator_type &__alloc = allocator_type ())
-        : allocator_type (__alloc) {
-        _RWSTD_ASSERT_RANGE (__first, __last);
-        _C_init ();
-        assign (__first, __last);
-    }
-
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     deque (const deque &__rhs)
         : allocator_type (__rhs.get_allocator ()) {
         _C_init ();
@@ -484,22 +460,12 @@
 
     deque& operator= (const deque&);
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     template <class _InputIter>
     void assign (_InputIter __first, _InputIter __last) {
         // dispatch either to a range assign or to an assign with repetition
         _C_assign (__first, __last, _RWSTD_DISPATCH (_InputIter));
     }
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
-    void assign (const_iterator, const_iterator);
-
-    void assign (const_pointer, const_pointer);
-
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     void assign (size_type __n, const_reference __x) {
         _C_assign_n (__n, __x);
     }
@@ -615,27 +581,11 @@
         _C_insert_n (__it, __n, __x);
     }
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     template <class _InputIter>
     void insert (iterator __it, _InputIter __first, _InputIter __last) {
         _C_insert (__it, __first, __last, _RWSTD_DISPATCH (_InputIter));
     }
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
-    void insert (iterator __it,
-                 const_pointer __first, const_pointer __last) {
-        _RWSTD_INSERT_RANGE (__it, __first, __last);
-    }
-
-    void insert (iterator __it,
-                 const_iterator __first, const_iterator __last) {
-        _RWSTD_INSERT_RANGE (__it, __first, __last);
-    }
-    
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     void pop_front ();
 
     void pop_back ();
@@ -755,8 +705,6 @@
 
 #endif   // _RWSTD_NO_MEMBER_TEMPLATES
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     // implements range assign
     template <class _InputIter>
     void _C_assign (_InputIter __first, _InputIter __last, void*) {
@@ -796,8 +744,6 @@
         _C_insert_n (__it, __n, __x);
     }
 
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
 
     bool _C_is_valid (int = -1) const;
 };
diff --git a/include/deque.cc b/include/deque.cc
index 5628e39..8b6fcd3 100644
--- a/include/deque.cc
+++ b/include/deque.cc
@@ -19,16 +19,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/deque_spec.h b/include/deque_spec.h
index a9e5a61..35beb30 100644
--- a/include/deque_spec.h
+++ b/include/deque_spec.h
@@ -18,16 +18,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/exception b/include/exception
index 80b1997..54364d2 100644
--- a/include/exception
+++ b/include/exception
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/functional b/include/functional
index a8bc51f..d85edaa 100644
--- a/include/functional
+++ b/include/functional
@@ -20,16 +20,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/iomanip b/include/iomanip
index c93616b..e9eacf1 100644
--- a/include/iomanip
+++ b/include/iomanip
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2005 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -92,24 +99,11 @@
 template <class _CharT>
 struct __rw_setfill
 {
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     template <class _Traits>
     void operator() (_STD::basic_ios<_CharT, _Traits> &__strm,
                      _CharT                            __ch) const {
         __strm.fill (__ch);
     }
-
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
-    typedef _STD::basic_ios<_CharT, _STD::char_traits<_CharT> > _BasicIos;
-
-    void operator() (_BasicIos &__strm, _CharT __ch) const {
-        __strm.fill (__ch);
-    }
-
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
 };
 
 
diff --git a/include/ios b/include/ios
index 60ef76b..d34fbec 100644
--- a/include/ios
+++ b/include/ios
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/iostream b/include/iostream
index 18629f5..fdc2c61 100644
--- a/include/iostream
+++ b/include/iostream
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/istream b/include/istream
index d0cfe5e..9f050bd 100644
--- a/include/istream
+++ b/include/istream
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/iterator b/include/iterator
index 3546d29..31e0c89 100644
--- a/include/iterator
+++ b/include/iterator
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/limits.cc b/include/limits.cc
index bb266d0..af67c73 100644
--- a/include/limits.cc
+++ b/include/limits.cc
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/list b/include/list
index 8f9ba26..2b2fd82 100644
--- a/include/list
+++ b/include/list
@@ -394,8 +394,7 @@
         _C_init (__n, __x);
     }
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     template<class _InputIterator>
     void _C_init (_InputIterator __first, _InputIterator __last, void*) {
@@ -419,7 +418,7 @@
         _C_init (__first, __last, _RWSTD_DISPATCH (_InputIterator));
     }
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else   // if _MSC_VER < 1300
 
     list (const_iterator __first, const_iterator __last, 
           const allocator_type& __alloc = allocator_type ())
@@ -439,7 +438,7 @@
         _RWSTD_LIST_INSERT_RANGE (begin (), __first, __last);
     }
 
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
 
     list (const list &__rhs)
         : allocator_type(__rhs.get_allocator()), _RWSTD_NODE_BUFFER_INIT(0,0) 
@@ -452,8 +451,7 @@
 
     list& operator= (const list&);   
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)  \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     template<class _InputIterator>
     void assign (_InputIterator __first, _InputIterator __last) {
@@ -469,7 +467,7 @@
         insert (begin (), __n, __val);
     }
 
-#else
+#else // if _MSC_VER < 1300
     
     void assign (const_iterator __first, const_iterator __last) {
         _RWSTD_ASSERT_RANGE (__first, __last);
@@ -490,7 +488,7 @@
         insert (begin (), __n, __val);
     }
 
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
 
     allocator_type get_allocator () const {
         return *this;
@@ -588,8 +586,7 @@
 
     iterator insert (iterator __it, const_reference __x);
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)  \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     // handles nonintegral types
     template<class _InputIterator>
@@ -628,7 +625,7 @@
         _C_insert (__it, __n, __val);
     }
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else   // if _MSC_VER < 1300
 
     void insert (iterator __it, size_type __n, const_reference __x) {
         _RWSTD_ASSERT_RANGE (begin (), __it);
@@ -645,7 +642,7 @@
         _RWSTD_LIST_SAFE_INSERT_RANGE (__it, __first, __last);
     }
 
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // !defined (_MSC_VER) || _MSC_VER >= 1300
 
     iterator erase (iterator);
 
diff --git a/include/list.cc b/include/list.cc
index d0ea47c..1d30baa 100644
--- a/include/list.cc
+++ b/include/list.cc
@@ -19,16 +19,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/list_spec.h b/include/list_spec.h
index 1e26460..0f20a98 100644
--- a/include/list_spec.h
+++ b/include/list_spec.h
@@ -21,16 +21,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_codecvt.cc b/include/loc/_codecvt.cc
index b1b1174..b8a82d4 100644
--- a/include/loc/_codecvt.cc
+++ b/include/loc/_codecvt.cc
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_codecvt.h b/include/loc/_codecvt.h
index 262d45e..4251a02 100644
--- a/include/loc/_codecvt.h
+++ b/include/loc/_codecvt.h
@@ -9,16 +9,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_collate.cc b/include/loc/_collate.cc
index 61a9adb..39840f3 100644
--- a/include/loc/_collate.cc
+++ b/include/loc/_collate.cc
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_collate.h b/include/loc/_collate.h
index 562151d..0f05742 100644
--- a/include/loc/_collate.h
+++ b/include/loc/_collate.h
@@ -5,20 +5,27 @@
  * This is an internal header file used to implement the C++ Standard
  * Library. It should never be #included directly by a program.
  *
- * $Id: //stdlib/dev/include/loc/_collate.h#22 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_convenience.h b/include/loc/_convenience.h
index 200800d..de560a0 100644
--- a/include/loc/_convenience.h
+++ b/include/loc/_convenience.h
@@ -6,20 +6,27 @@
  * This is an internal header file used to implement the C++ Standard
  * Library. It should never be #included directly by a program.
  *
- * $Id: //stdlib/dev/include/loc/_convenience.h#7 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_ctype.cc b/include/loc/_ctype.cc
index c423886..855c5d1 100644
--- a/include/loc/_ctype.cc
+++ b/include/loc/_ctype.cc
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_ctype.h b/include/loc/_ctype.h
index a6ed212..0580e5a 100644
--- a/include/loc/_ctype.h
+++ b/include/loc/_ctype.h
@@ -1,24 +1,31 @@
 /***************************************************************************
  *
- * _ctype.h - 
+ * _ctype.h
  *
  * This is an internal header file used to implement the C++ Standard
  * Library. It should never be #included directly by a program.
  *
- * $Id: //stdlib/dev/include/loc/_ctype.h#57 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2001-2005 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -426,34 +433,21 @@
     virtual const char_type*
     do_is (const char_type*, const char_type*, mask*) const;
 
-// for convenience
-#define _RWSTD_CONVERT(tab, c)   \
-   _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, c) < _C_tab_size ? tab [_UChar (c)] : c
-
     // 22.2.1.1.2, p7
-    virtual char_type do_toupper (char_type __c) const {
-        return _RWSTD_CONVERT (_C_upper_tab, __c);
-    }
+    virtual char_type do_toupper (char_type) const;
 
     // 22.2.1.1.2, p9
-    virtual char_type do_tolower (char_type __c) const {
-        return _RWSTD_CONVERT (_C_lower_tab, __c);
-    }
+    virtual char_type do_tolower (char_type) const;
 
     // 22.2.1.1.2, p11
-    virtual char_type do_widen (char __c) const {
-        return _RWSTD_CONST_CAST (ctype*, this)->
-            _C_wide_tab [_UChar (__c)] = char_type (_UChar (__c));
-    }
+    virtual char_type do_widen (char) const;
 
     virtual const char*
     do_widen (const char*, const char*, char_type*) const;
 
     // 22.2.1.1.2, p13
-    virtual char do_narrow (char_type __c, char __dfault) const {
-        return _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, __c) <= _RWSTD_SCHAR_MAX ?
-            _RWSTD_STATIC_CAST (char, __c) : __dfault;
-    }
+    virtual char
+    do_narrow (char_type, char) const;
 
     virtual const char_type*
     do_toupper (char_type*, const char_type*) const;
@@ -474,7 +468,7 @@
 
 public:
 
-    _EXPLICIT ctype (_RWSTD_SIZE_T __ref = 0);
+    _EXPLICIT ctype (_RWSTD_SIZE_T = 0);
 
 
     // 22.2.1.1.1, p1
diff --git a/include/loc/_facet.h b/include/loc/_facet.h
index b99b26b..0f9d6cc 100644
--- a/include/loc/_facet.h
+++ b/include/loc/_facet.h
@@ -5,20 +5,27 @@
  * This is an internal header file used to implement the C++ Standard
  * Library. It should never be #included directly by a program.
  *
- * $Id: //stdlib/dev/include/loc/_facet.h#45 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_locale.h b/include/loc/_locale.h
index 2c73c4f..5ad348c 100644
--- a/include/loc/_locale.h
+++ b/include/loc/_locale.h
@@ -9,16 +9,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2005 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -185,7 +192,7 @@
     template <class _Facet>
     locale combine (const locale&) const;
 
-#endif   // _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE
+#  endif   // _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE
 
     // 22.1.1.4, p3
     template <class _CharT, class _Traits, class _Allocator>
@@ -194,8 +201,6 @@
 
 #else   // if defined (_RWSTD_NO_MEMBER_TEMPLATES)
 
-#  ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     template <class _Facet>
     locale (const locale &__rhs, _Facet *__facet)
         : _C_body (0) {
@@ -218,7 +223,7 @@
         *this = locale (*__rhs._C_body, __facet);
     }
 
-#      ifndef _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE
+#  ifndef _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE
 
     template <class _Facet>
     locale combine (const locale &__rhs) const {
@@ -232,7 +237,7 @@
         return locale (__rhs, &use_facet<_Facet>(__rhs));
     }
 
-#    endif   // _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE
+#  endif   // _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE
 
     template <class _CharT, class _Traits, class _Allocator>
     bool
@@ -244,7 +249,6 @@
                       __y.data (), __y.data () + __y.length ()) < 0;
     }
 
-#   endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
 #endif   // _RWSTD_NO_MEMBER_TEMPLATES
 
 
diff --git a/include/loc/_messages.h b/include/loc/_messages.h
index 560626b..b051920 100644
--- a/include/loc/_messages.h
+++ b/include/loc/_messages.h
@@ -5,20 +5,27 @@
  * This is an internal header file used to implement the C++ Standard
  * Library. It should never be #included directly by a program.
  *
- * $Id: //stdlib/dev/include/loc/_messages.h#29 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_money_put.cc b/include/loc/_money_put.cc
index 934d2cc..63ba11a 100644
--- a/include/loc/_money_put.cc
+++ b/include/loc/_money_put.cc
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_moneypunct.cc b/include/loc/_moneypunct.cc
index 814487d..9e9d29e 100644
--- a/include/loc/_moneypunct.cc
+++ b/include/loc/_moneypunct.cc
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_moneypunct.h b/include/loc/_moneypunct.h
index 674d9fd..980a43d 100644
--- a/include/loc/_moneypunct.h
+++ b/include/loc/_moneypunct.h
@@ -5,20 +5,27 @@
  * This is an internal header file used to implement the C++ Standard
  * Library. It should never be #included directly by a program.
  *
- * $Id: //stdlib/dev/include/loc/_moneypunct.h#26 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_num_put.h b/include/loc/_num_put.h
index 4b7f691..552af83 100644
--- a/include/loc/_num_put.h
+++ b/include/loc/_num_put.h
@@ -9,16 +9,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_numpunct.cc b/include/loc/_numpunct.cc
index e058f71..8dca2cb 100644
--- a/include/loc/_numpunct.cc
+++ b/include/loc/_numpunct.cc
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_numpunct.h b/include/loc/_numpunct.h
index 2d4f8a0..9d6f676 100644
--- a/include/loc/_numpunct.h
+++ b/include/loc/_numpunct.h
@@ -5,20 +5,27 @@
  * This is an internal header file used to implement the C++ Standard
  * Library. It should never be #included directly by a program.
  *
- * $Id: //stdlib/dev/include/loc/_numpunct.h#29 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_punct.cc b/include/loc/_punct.cc
index 5ffd2b7..fcc85e4 100644
--- a/include/loc/_punct.cc
+++ b/include/loc/_punct.cc
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_punct.h b/include/loc/_punct.h
index ba3343b..62009f8 100644
--- a/include/loc/_punct.h
+++ b/include/loc/_punct.h
@@ -5,20 +5,27 @@
  * This is an internal header file used to implement the C++ Standard
  * Library. It should never be #included directly by a program.
  *
- * $Id: //stdlib/dev/include/loc/_punct.h#29 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_time_get.cc b/include/loc/_time_get.cc
index e31d6fb..cd6c296 100644
--- a/include/loc/_time_get.cc
+++ b/include/loc/_time_get.cc
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_time_put.cc b/include/loc/_time_put.cc
index 3b8bfe8..4542718 100644
--- a/include/loc/_time_put.cc
+++ b/include/loc/_time_put.cc
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/locale b/include/locale
index 93b0373..7118c3e 100644
--- a/include/locale
+++ b/include/locale
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/map b/include/map
index 3609151..9d9b9ec 100644
--- a/include/map
+++ b/include/map
@@ -124,8 +124,7 @@
         : _C_rep (__cmp, __alloc) { }
 
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     // 23.3.1.1, p3
     template <class _InputIter>
@@ -134,7 +133,7 @@
          const _Allocator& __alloc = _Allocator ())
       : _C_rep (__first, __last, __cmp, __alloc, false) { }
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else   // if _MSC_VER < 1300
 
     map (const value_type* __first, const value_type* __last, 
          const key_compare &__cmp = key_compare (),
@@ -146,7 +145,7 @@
          const allocator_type &__alloc = allocator_type ())
       : _C_rep (__first, __last, __cmp, __alloc, false) { }
 
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // !defined (_MSC_VER) || _MSC_VER >= 1300
 
 
     map (const map &__rhs): _C_rep (__rhs._C_rep) { /* empty */ }
@@ -217,15 +216,14 @@
         return _C_rep.insert (__it, __x, false);
     }
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     template<class _InputIter>
     void insert (_InputIter __first, _InputIter __last) {
         _C_rep.insert (__first, __last, false);
     }
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else   // if _MSC_VER < 1300
 
     void insert (const value_type* __first, const value_type* __last) {
         _C_rep.insert (__first, __last, false);
@@ -235,7 +233,7 @@
         _C_rep.insert (__first, __last, false);
     }
 
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // !defined (_MSC_VER) || _MSC_VER >= 1300
 
 
     void erase (iterator __it) {
@@ -364,8 +362,7 @@
               const allocator_type &__alloc = allocator_type ())
       : _C_rep (__cmp, __alloc) { }
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     template<class _InputIter>
     multimap (_InputIter __first, _InputIter __last, 
@@ -373,7 +370,7 @@
               const _Allocator& __alloc = _Allocator ()) 
       : _C_rep (__first, __last, __cmp, __alloc, true) { }
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else   // if _MSC_VER < 1300
 
     multimap (const value_type* __first, const value_type* __last, 
               const key_compare &__cmp = key_compare (),
@@ -385,7 +382,7 @@
               const allocator_type &__alloc = allocator_type ())
       : _C_rep (__first, __last, __cmp, __alloc, true) { }
 
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // !defined (_MSC_VER) || _MSC_VER >= 1300
 
 
     multimap (const multimap &__rhs)
@@ -451,15 +448,14 @@
         return _C_rep.insert (__it, __x, true);
     }
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     template<class _InputIter>
     void insert (_InputIter __first, _InputIter __last) {
         _C_rep.insert (__first, __last, true);
     }
 
-#else  // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else  // if _MSC_VER < 1300
 
     void insert (const value_type* __first, const value_type* __last) {
         _C_rep.insert (__first, __last, true);
@@ -469,7 +465,7 @@
         _C_rep.insert (__first, __last, true);
     }
 
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // !defined (_MSC_VER) || _MSC_VER >= 1300
 
 
     void erase (iterator __it) {
diff --git a/include/memory b/include/memory
index ab2f2a0..377f018 100644
--- a/include/memory
+++ b/include/memory
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/new b/include/new
index 92fed28..f2f8d85 100644
--- a/include/new
+++ b/include/new
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/numeric b/include/numeric
index 69dc3bc..5cd7152 100644
--- a/include/numeric
+++ b/include/numeric
@@ -20,16 +20,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ostream.cc b/include/ostream.cc
index 1fb4cae..13114ea 100644
--- a/include/ostream.cc
+++ b/include/ostream.cc
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/queue b/include/queue
index bab3e73..48dcd16 100644
--- a/include/queue
+++ b/include/queue
@@ -7,6 +7,26 @@
  *
  ***************************************************************************
  *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ * 
+ ***************************************************************************
+ *
  * Copyright (c) 1994
  * Hewlett-Packard Company
  *
@@ -18,25 +38,6 @@
  * representations about the suitability of this software for any
  * purpose.  It is provided "as is" without express or implied warranty.
  *
- ***************************************************************************
- *
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
- *
- * Copyright 1994-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
  **************************************************************************/
 
 #ifndef _RWSTD_QUEUE_INCLUDED
@@ -199,8 +200,6 @@
             _STD::make_heap (c.begin (), c.end (), comp);
     }
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     template <class _InputIter>
     priority_queue (_InputIter __first, _InputIter __last,
                     const _Compare   &__cmp = _Compare (),
@@ -210,19 +209,6 @@
             _STD::make_heap (c.begin (), c.end (), comp);
         }
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
-    priority_queue (_TYPENAME _Container::const_iterator __first,
-                    _TYPENAME _Container::const_iterator __last,
-                    const _Compare   &__cmp = _Compare (),
-                    const _Container &__c   = container_type ())
-        : c (__c), comp (__cmp) {
-            c.insert (c.end (), __first, __last);
-            _STD::make_heap (c.begin (), c.end (), comp);
-        }
-
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     bool empty () const {
         return c.empty ();
     }
diff --git a/include/rw/_algobase.cc b/include/rw/_algobase.cc
index e226874..89e5ee0 100644
--- a/include/rw/_algobase.cc
+++ b/include/rw/_algobase.cc
@@ -19,16 +19,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/rw/_algobase.h b/include/rw/_algobase.h
index 3b45dd3..936990f 100644
--- a/include/rw/_algobase.h
+++ b/include/rw/_algobase.h
@@ -10,6 +10,26 @@
  *
  ***************************************************************************
  *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2005 Rogue Wave Software.
+ * 
+ ***************************************************************************
+ *
  * Copyright (c) 1994
  * Hewlett-Packard Company
  *
@@ -21,19 +41,6 @@
  * representations about the suitability of this software for any
  * purpose.  It is provided "as is" without express or implied warranty.
  *
- ***************************************************************************
- *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
- * 
  **************************************************************************/
 
 #ifndef _RWSTD_RW_ALGOBASE_H_INCLUDED
@@ -130,8 +137,6 @@
 
 _RWSTD_NAMESPACE (__rw) {
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
 // `less than' function object - used by non-predicate forms
 // of algorithms to invoke the predicate forms for code reuse
 struct __rw_lt
@@ -147,35 +152,6 @@
 
 #  define _RWSTD_LESS(ignore) _RW::__rw_lt ()
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
-template <class _TypeT>
-struct __rw_lt
-{
-    bool operator() (const _TypeT &__lhs, const _TypeT &__rhs) const {
-        return __lhs < __rhs;
-    }
-};
-
-#  ifndef _RWSTD_NO_CLASS_PARTIAL_SPEC
-
-#    define _RWSTD_LESS(iterT) \
-       _RW::__rw_lt<_TYPENAME _STD::iterator_traits< iterT >::value_type>()
-
-#  else   // if defined (_RWSTD_NO_PARTIAL_CLASS_SPEC)
-
-#    define _RWSTD_LESS(iterT) \
-       _RW::__rw_make_lt (_RWSTD_VALUE_TYPE (iterT))
-
-template <class _TypeT>
-__rw_lt<_TypeT> __rw_make_lt (const _TypeT*)
-{
-    return __rw_lt<_TypeT>();
-}
-
-#  endif   // _RWSTD_NO_PARTIAL_CLASS_SPEC
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
 
 // swaps values of 2 (possibly distinct) types
 template <class _TypeT, class _TypeU>
diff --git a/include/rw/_allocator.h b/include/rw/_allocator.h
index 0a226fd..b981589 100644
--- a/include/rw/_allocator.h
+++ b/include/rw/_allocator.h
@@ -23,16 +23,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/rw/_array.h b/include/rw/_array.h
index 853766d..7a3755d 100644
--- a/include/rw/_array.h
+++ b/include/rw/_array.h
@@ -67,9 +67,7 @@
 
     __rw_array (const __rw_array&);
 
-    ~__rw_array () {
-        resize (0);
-    }
+    ~__rw_array ();
 
     __rw_array& operator= (const __rw_array&);
 
@@ -184,6 +182,16 @@
 
 
 template <class _TypeT>
+inline
+__rw_array<_TypeT>::
+~__rw_array ()
+{
+    __rw_destroy (_C_data, _C_data + _C_size);
+    ::operator delete (_C_data);
+}
+
+
+template <class _TypeT>
 inline void __rw_array<_TypeT>::swap (__rw_array<_TypeT> &__rhs)
 {
     pointer __tmp_data   = begin ();
@@ -200,9 +208,9 @@
 inline void __rw_array<_TypeT>::
 resize (size_type __size, const_reference __val /* = value_type () */)
 {
-    if (begin ()) {
-        __rw_destroy (begin (), end ());
-        ::operator delete (begin ());
+    if (_C_data) {
+        __rw_destroy (_C_data, _C_data + _C_size);
+        ::operator delete (_C_data);
         _C_data = 0;
     }
 
diff --git a/include/rw/_basic_ios.cc b/include/rw/_basic_ios.cc
index 10c35b4..94dbba7 100644
--- a/include/rw/_basic_ios.cc
+++ b/include/rw/_basic_ios.cc
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/rw/_bitmask.h b/include/rw/_bitmask.h
index 351777c..8c91bde 100644
--- a/include/rw/_bitmask.h
+++ b/include/rw/_bitmask.h
@@ -9,16 +9,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/rw/_config-icc.h b/include/rw/_config-icc.h
index f0477d3..495c101 100644
--- a/include/rw/_config-icc.h
+++ b/include/rw/_config-icc.h
@@ -43,10 +43,20 @@
 #  undef _RWSTD_NO_NEW_HEADER
 #  undef _RWSTD_NO_LIBC_IN_STD
 
-#else   // if defined (_WIN{32,64}
+#else   // if defined (_WIN{32,64})
+
+#  include "_config-msvcrt.h"
+
 #  if defined (_RWSHARED)
      // only when using shared libstd and Intel C++/MSVC
      // working around an Intel C++ 7.1 bug (PR #29178)
 #    define _RWSTD_NO_OUTLINED_USE_FACET_SPECIALIZATIONS
-#  endif   // _MSC_VER > 1200 && _RWSHARED
-#endif
+#  endif   // _RWSHARED
+
+// disable "function was declared "deprecated"
+#  pragma warning (disable: 1478)
+
+// disable "dllexport/dllimport conflict with ... ; dllexport assumed"
+#  pragma warning (disable: 1740)
+
+#endif   // (_WIN{32,64})
diff --git a/include/rw/_config-msvc.h b/include/rw/_config-msvc.h
index 458d044..0fbb44e 100644
--- a/include/rw/_config-msvc.h
+++ b/include/rw/_config-msvc.h
@@ -29,12 +29,9 @@
  * 
  **************************************************************************/
 
-#if _MSC_VER <= 1310   // MSVC <= 7.1
-#endif   // MSVC <= 7.1
+#include "_config-msvcrt.h"
 
 #if _MSC_VER <= 1300   // MSVC <= 7.0
-#  define _RWSTD_EXCEPTION_HANDLER_IN_STD
-#  define _RWSTD_NO_STATIC_DEF3
 #  define _RWSTD_NO_PTR_VALUE_TEMPLATE_OVERLOAD
 #  define _RWSTD_NO_PRAGMA_INSTANTIATE
      // disable explicit instantiation extensions if building
@@ -54,204 +51,24 @@
 #if _MSC_VER <= 1200   // MSVC <= 6.0
 #  define _RWSTD_NO_TYPENAME
 
-   // static data members of cass templates aren't properly collapsed
-   // (compiler emits one copy per each translation unit that contains
-   // the definition of the template member, and the linker fails to
-   // multiple copies that reside in shared libraries)
-#ifndef _RWSTD_NO_COLLAPSE_TEMPLATE_STATICS
-#  define _RWSTD_NO_COLLAPSE_TEMPLATE_STATICS
-#endif   // _RWSTD_NO_COLLAPSE_TEMPLATE_STATICS
-
-   // not declared/defined in libc
-#if !defined (_RWSTD_NO_STRTOLL_IN_LIBC)
-#  define _RWSTD_NO_STRTOLL_IN_LIBC
-#endif   // _RWSTD_NO_STRTOLL_IN_LIBC
-
-#if !defined (_RWSTD_NO_STRTOULL_IN_LIBC)
-#  define _RWSTD_NO_STRTOULL_IN_LIBC
-#endif   // _RWSTD_NO_STRTOULL_IN_LIBC
-
 #ifndef _RWSTD_NO_EXPORT
      // not implemented
 #  define _RWSTD_NO_EXPORT
 #endif   // _RWSTD_NO_EXPORT
 
-#define _RWSTD_NO_NL_LANGINFO
-
-   // functions are defined in MSVC's msvcprt.lib and msvcprtd.lib
-   // which include the compiler's implementation of the C++ Standard
-   // library and with which we (obviously) cannot use
-#ifndef _RWSTD_NO_WCTOB
-#  define _RWSTD_NO_WCTOB
-#endif   // _RWSTD_NO_WCTOB
-
-#ifndef _RWSTD_NO_WCTOB_IN_LIBC
-#  define _RWSTD_NO_WCTOB_IN_LIBC
-#endif   // _RWSTD_NO_WCTOB_IN_LIBC
-
-#ifndef _RWSTD_NO_MBRTOWC
-#  define _RWSTD_NO_MBRTOWC
-#endif   // _RWSTD_NO_MBRTOWC
-
-#ifndef _RWSTD_NO_MBRTOWC_IN_LIBC
-#  define _RWSTD_NO_MBRTOWC_IN_LIBC
-#endif   // _RWSTD_NO_MBRTOWC_IN_LIBC
-
-#ifndef _RWSTD_NO_WCRTOMB
-#  define _RWSTD_NO_WCRTOMB
-#endif   // _RWSTD_NO_WCRTOMB
-
-#ifndef _RWSTD_NO_WCRTOMB_IN_LIBC
-#  define _RWSTD_NO_WCRTOMB_IN_LIBC
-#endif   // _RWSTD_NO_WCRTOMB_IN_LIBC
-
-#ifndef _RWSTD_NO_MBSTOWCS
-#  define _RWSTD_NO_MBSTOWCS
-#endif   // _RWSTD_NO_MBSTOWCS
-
-#ifndef _RWSTD_NO_MBSTOWCS_IN_LIBC
-#  define _RWSTD_NO_MBSTOWCS_IN_LIBC
-#endif   // _RWSTD_NO_MBSTOWCS_IN_LIBC
-
-#ifndef _RWSTD_NO_MBRLEN
-#  define _RWSTD_NO_MBRLEN
-#endif   // _RWSTD_NO_MBRLEN
-
-#ifndef _RWSTD_NO_MBRLEN_IN_LIBC
-#  define _RWSTD_NO_MBRLEN_IN_LIBC
-#endif   // _RWSTD_NO_MBRLEN_IN_LIBC
-
-#ifndef _RWSTD_NO_WCSRTOMBS
-#  define _RWSTD_NO_WCSRTOMBS
-#endif   // _RWSTD_NO_WCSRTOMBS
-
-#ifndef _RWSTD_NO_WCSRTOMBS_IN_LIBC
-#  define _RWSTD_NO_WCSRTOMBS_IN_LIBC
-#endif   // _RWSTD_NO_WCSRTOMBS_IN_LIBC
-
-#ifndef _RWSTD_NO_BTOWC
-#  define _RWSTD_NO_BTOWC
-#endif   // _RWSTD_NO_BTOWC
-
-#ifndef _RWSTD_NO_BTOWC_IN_LIBC
-#  define _RWSTD_NO_BTOWC_IN_LIBC
-#endif   // _RWSTD_NO_BTOWC_IN_LIBC
-
-#ifndef _RWSTD_NO_MBSRTOWCS
-#  define _RWSTD_NO_MBSRTOWCS
-#endif   // _RWSTD_NO_MBSRTOWCS
-
-#ifndef _RWSTD_NO_MBSRTOWCS_IN_LIBC
-#  define _RWSTD_NO_MBSRTOWCS_IN_LIBC
-#endif   // _RWSTD_NO_MBSRTOWCS_IN_LIBC
-
 #endif   // MSVC <= 6.0
 
-   // enable the <cxxx> form of libc headers
-   // we can only use the rw version in include/ansi
-#ifndef _RWSTD_NO_PURE_C_HEADERS
-#  define _RWSTD_NO_PURE_C_HEADERS
-#endif   // _RWSTD_NO_PURE_C_HEADERS
-
-#if defined _RWSTD_NO_NEW_HEADER
-#  undef _RWSTD_NO_NEW_HEADER
-#endif   // _RWSTD_NO_NEW_HEADER
-
-   // our <cxxx> libc headers put the libc functions in namespace std
-#ifdef _RWSTD_NO_LIBC_IN_STD
-#  undef _RWSTD_NO_LIBC_IN_STD
-#endif   // _RWSTD_NO_LIBC_IN_STD
-
-#ifndef _RWSTD_NO_DEPRECATED_C_HEADERS
-#  define _RWSTD_NO_DEPRECATED_C_HEADERS
-#endif   // _RWSTD_NO_DEPRECATED_C_HEADERS
-
-   // operator new and delete is not reliably replaceable across
-   // shared library boundaries, which includes the shared library
-   // version of the language support library
-#define _RWSTD_NO_REPLACEABLE_NEW_DELETE
-
-   // names of (most) extern "C" libc symbols begin with an underscore
-#define _RWSTD_LIBC_SYM(name)   _ ## name
-
-#ifdef _DLL
-   // the _DLL macro is defined by the compiler when building a shared
-   // library, i.e., in response to either of the /MD and /MDd options
-   // _RWSTD_DLLIMPORT is used when declaring libc functions that need
-   // to be "imported" into the shared library
-#  define _RWSTD_DLLIMPORT   __declspec (dllimport)
-#endif   // _DLL
-
-#ifndef _RWSTD_NO_STATIC_CONST_MEMBER_DEFINITION
-     // both MSVC 7.x and Intel C++/Windows allow "inline" initializers
-     // for static const integral data members but out-of-line definitions
-     // cause multiply defined symbol errors (see PR #26562 and #30260)
-     // disable their definitions in source files (the members are still
-     // declared)
-#  define _RWSTD_NO_STATIC_CONST_MEMBER_DEFINITION
-#endif   // _RWSTD_NO_STATIC_CONST_MEMBER_DEFINITION
-
-   // enable iostream and locale support for long long integers
-#define _RWSTD_LONG_LONG __int64
-
-#if defined (_WIN64)
-     // FIXME: handle by forward declaring fuctions in <rw/_mutex.h>
-#  define _RWSTD_NO_FWD_DECLARATIONS
-#endif   // _WIN64
-
    // disable "Same type qualifier used more than once"
-#pragma warning (disable: 4114)
+#  pragma warning (disable: 4114)
 
    // disable "return type for operator->' is not a UDT"
-#pragma warning (disable: 4284)
+#  pragma warning (disable: 4284)
 
    // disable "decorated name length exceeded"
-#pragma warning (disable: 4503)
+#  pragma warning (disable: 4503)
 
    // disable "identifier was truncated to 255 characters"
-#pragma warning (disable: 4786)
+#  pragma warning (disable: 4786)
 
-#if defined (WIN32) && !defined(_WIN32)
-#  define _WIN32
-#endif
-
-#ifdef _MT
-#  ifndef _RWSTD_REENTRANT
-#    define _RWSTD_REENTRANT 1
-#  endif   // _RWSTD_REENTRANT
-
-#  ifndef _RWSTD_NO_TLS
-       // thread-local stoprage declaration specifier
-#    ifndef _RWSTD_THREAD
-#      define _RWSTD_THREAD   __declspec (thread)
-#    endif   // _RWSTD_THREAD
-#  endif   // _RWSTD_NO_TLS
-#else   // if !defined (_MT)
-#  ifndef _RWSTD_THREAD
-#    define _RWSTD_THREAD   /* empty */
-#  endif   // _RWSTD_THREAD
-#endif   //_MT
-
-   // clean C++ C headers (the <cxxx> kind) not provided
-#ifndef _RWSTD_NO_PURE_C_HEADERS
-#  define _RWSTD_NO_PURE_C_HEADERS
-#endif   // _RWSTD_NO_PURE_C_HEADERS
-
-#define _RWSTD_MUNMAP_ARG1_T void*
-
-#if defined (_CPPRTTI)
-     // override in case library was configured with -GR-
-     // (i.e., with RTTI disabled)
-#  undef _RWSTD_NO_DYNAMIC_CAST
-#elif !defined (_RWSTD_NO_DYNAMIC_CAST)
-     // override in case library was configured with -GR
-     // (i.e., with RTTI enabled)
-#  define _RWSTD_NO_DYNAMIC_CAST
-#endif   // _CPPRTTI
-
-#ifndef _NATIVE_WCHAR_T_DEFINED
-   // define wchar_t if it is not a keyword recognized by the compiler
-   // (use the /Zc:wchar_t compiler option to enable wchar_t as a keyword)
-typedef unsigned short wchar_t;
-
-#endif   // _NATIVE_WCHAR_T_DEFINED
+   // disable "'function': was declared deprecated"
+#  pragma warning (disable: 4996)
diff --git a/include/rw/_config-msvcrt.h b/include/rw/_config-msvcrt.h
new file mode 100644
index 0000000..fffcff6
--- /dev/null
+++ b/include/rw/_config-msvcrt.h
@@ -0,0 +1,221 @@
+/***************************************************************************
+ *
+ * _config-msvcrt.h - Microsoft Visual C++ run-time library
+ *                    configuration definitions
+ *
+ * This is an internal header file used to implement the C++ Standard
+ * Library. It should never be #included directly by a program.
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ * 
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ * 
+ **************************************************************************/
+
+#if _MSC_VER <= 1300   // MSVC <= 7.0
+#  define _RWSTD_EXCEPTION_HANDLER_IN_STD
+#  define _RWSTD_NO_STATIC_DEF3
+#endif   // MSVC <= 7.0
+
+#if _MSC_VER <= 1200   // MSVC <= 6.0
+
+// static data members of class templates aren't properly collapsed
+// (compiler emits one copy per each translation unit that contains
+// the definition of the template member, and the linker fails to
+// multiple copies that reside in shared libraries)
+#ifndef _RWSTD_NO_COLLAPSE_TEMPLATE_STATICS
+#  define _RWSTD_NO_COLLAPSE_TEMPLATE_STATICS
+#endif   // _RWSTD_NO_COLLAPSE_TEMPLATE_STATICS
+
+#define _RWSTD_NO_NL_LANGINFO
+
+#if defined _RWSTD_NO_NEW_HEADER
+#  undef _RWSTD_NO_NEW_HEADER
+#endif   // _RWSTD_NO_NEW_HEADER
+
+// not declared/defined in libc
+#if !defined (_RWSTD_NO_STRTOLL_IN_LIBC)
+#  define _RWSTD_NO_STRTOLL_IN_LIBC
+#endif   // _RWSTD_NO_STRTOLL_IN_LIBC
+
+#if !defined (_RWSTD_NO_STRTOULL_IN_LIBC)
+#  define _RWSTD_NO_STRTOULL_IN_LIBC
+#endif   // _RWSTD_NO_STRTOULL_IN_LIBC
+
+   // functions are defined in MSVC's msvcprt.lib and msvcprtd.lib
+   // which include the compiler's implementation of the C++ Standard
+   // library and with which we (obviously) cannot use
+#ifndef _RWSTD_NO_WCTOB
+#  define _RWSTD_NO_WCTOB
+#endif   // _RWSTD_NO_WCTOB
+
+#ifndef _RWSTD_NO_WCTOB_IN_LIBC
+#  define _RWSTD_NO_WCTOB_IN_LIBC
+#endif   // _RWSTD_NO_WCTOB_IN_LIBC
+
+#ifndef _RWSTD_NO_MBRTOWC
+#  define _RWSTD_NO_MBRTOWC
+#endif   // _RWSTD_NO_MBRTOWC
+
+#ifndef _RWSTD_NO_MBRTOWC_IN_LIBC
+#  define _RWSTD_NO_MBRTOWC_IN_LIBC
+#endif   // _RWSTD_NO_MBRTOWC_IN_LIBC
+
+#ifndef _RWSTD_NO_WCRTOMB
+#  define _RWSTD_NO_WCRTOMB
+#endif   // _RWSTD_NO_WCRTOMB
+
+#ifndef _RWSTD_NO_WCRTOMB_IN_LIBC
+#  define _RWSTD_NO_WCRTOMB_IN_LIBC
+#endif   // _RWSTD_NO_WCRTOMB_IN_LIBC
+
+#ifndef _RWSTD_NO_MBSTOWCS
+#  define _RWSTD_NO_MBSTOWCS
+#endif   // _RWSTD_NO_MBSTOWCS
+
+#ifndef _RWSTD_NO_MBSTOWCS_IN_LIBC
+#  define _RWSTD_NO_MBSTOWCS_IN_LIBC
+#endif   // _RWSTD_NO_MBSTOWCS_IN_LIBC
+
+#ifndef _RWSTD_NO_MBRLEN
+#  define _RWSTD_NO_MBRLEN
+#endif   // _RWSTD_NO_MBRLEN
+
+#ifndef _RWSTD_NO_MBRLEN_IN_LIBC
+#  define _RWSTD_NO_MBRLEN_IN_LIBC
+#endif   // _RWSTD_NO_MBRLEN_IN_LIBC
+
+#ifndef _RWSTD_NO_WCSRTOMBS
+#  define _RWSTD_NO_WCSRTOMBS
+#endif   // _RWSTD_NO_WCSRTOMBS
+
+#ifndef _RWSTD_NO_WCSRTOMBS_IN_LIBC
+#  define _RWSTD_NO_WCSRTOMBS_IN_LIBC
+#endif   // _RWSTD_NO_WCSRTOMBS_IN_LIBC
+
+#ifndef _RWSTD_NO_BTOWC
+#  define _RWSTD_NO_BTOWC
+#endif   // _RWSTD_NO_BTOWC
+
+#ifndef _RWSTD_NO_BTOWC_IN_LIBC
+#  define _RWSTD_NO_BTOWC_IN_LIBC
+#endif   // _RWSTD_NO_BTOWC_IN_LIBC
+
+#ifndef _RWSTD_NO_MBSRTOWCS
+#  define _RWSTD_NO_MBSRTOWCS
+#endif   // _RWSTD_NO_MBSRTOWCS
+
+#ifndef _RWSTD_NO_MBSRTOWCS_IN_LIBC
+#  define _RWSTD_NO_MBSRTOWCS_IN_LIBC
+#endif   // _RWSTD_NO_MBSRTOWCS_IN_LIBC
+
+#endif   // MSVC <= 6.0
+
+   // enable the <cxxx> form of libc headers
+   // we can only use the rw version in include/ansi
+#ifndef _RWSTD_NO_PURE_C_HEADERS
+#  define _RWSTD_NO_PURE_C_HEADERS
+#endif   // _RWSTD_NO_PURE_C_HEADERS
+
+#if defined _RWSTD_NO_NEW_HEADER
+#  undef _RWSTD_NO_NEW_HEADER
+#endif   // _RWSTD_NO_NEW_HEADER
+
+   // our <cxxx> libc headers put the libc functions in namespace std
+#ifdef _RWSTD_NO_LIBC_IN_STD
+#  undef _RWSTD_NO_LIBC_IN_STD
+#endif   // _RWSTD_NO_LIBC_IN_STD
+
+#ifndef _RWSTD_NO_DEPRECATED_C_HEADERS
+#  define _RWSTD_NO_DEPRECATED_C_HEADERS
+#endif   // _RWSTD_NO_DEPRECATED_C_HEADERS
+
+   // operator new and delete is not reliably replaceable across
+   // shared library boundaries, which includes the shared library
+   // version of the language support library
+#define _RWSTD_NO_REPLACEABLE_NEW_DELETE
+
+   // names of (most) extern "C" libc symbols begin with an underscore
+#define _RWSTD_LIBC_SYM(name)   _ ## name
+
+#ifdef _DLL
+   // the _DLL macro is defined by the compiler when building a shared
+   // library, i.e., in response to either of the /MD and /MDd options
+   // _RWSTD_DLLIMPORT is used when declaring libc functions that need
+   // to be "imported" into the shared library
+#  define _RWSTD_DLLIMPORT   __declspec (dllimport)
+#endif   // _DLL
+
+#ifndef _RWSTD_NO_STATIC_CONST_MEMBER_DEFINITION
+     // both MSVC 7.x and Intel C++/Windows allow "inline" initializers
+     // for static const integral data members but out-of-line definitions
+     // cause multiply defined symbol errors (see PR #26562 and #30260)
+     // disable their definitions in source files (the members are still
+     // declared)
+#  define _RWSTD_NO_STATIC_CONST_MEMBER_DEFINITION
+#endif   // _RWSTD_NO_STATIC_CONST_MEMBER_DEFINITION
+
+   // enable iostream and locale support for long long integers
+#define _RWSTD_LONG_LONG __int64
+
+#if defined (_WIN64)
+     // FIXME: handle by forward declaring fuctions in <rw/_mutex.h>
+#  define _RWSTD_NO_FWD_DECLARATIONS
+#endif   // _WIN64
+
+#if defined (WIN32) && !defined(_WIN32)
+#  define _WIN32
+#endif
+
+#ifdef _MT
+#  ifndef _RWSTD_REENTRANT
+#    define _RWSTD_REENTRANT 1
+#  endif   // _RWSTD_REENTRANT
+
+#  ifndef _RWSTD_NO_TLS
+       // thread-local stoprage declaration specifier
+#    ifndef _RWSTD_THREAD
+#      define _RWSTD_THREAD   __declspec (thread)
+#    endif   // _RWSTD_THREAD
+#  endif   // _RWSTD_NO_TLS
+#else   // if !defined (_MT)
+#  ifndef _RWSTD_THREAD
+#    define _RWSTD_THREAD   /* empty */
+#  endif   // _RWSTD_THREAD
+#endif   //_MT
+
+#if defined (_CPPRTTI)
+     // override in case library was configured with -GR-
+     // (i.e., with RTTI disabled)
+#  undef _RWSTD_NO_DYNAMIC_CAST
+#elif !defined (_RWSTD_NO_DYNAMIC_CAST)
+     // override in case library was configured with -GR
+     // (i.e., with RTTI enabled)
+#  define _RWSTD_NO_DYNAMIC_CAST
+#endif   // _CPPRTTI
+
+#pragma warning (error: 4541)
+#ifndef _NATIVE_WCHAR_T_DEFINED
+   // define wchar_t if it is not a keyword recognized by the compiler
+   // (use the /Zc:wchar_t compiler option to enable wchar_t as a keyword)
+typedef unsigned short wchar_t;
+
+#endif   // _NATIVE_WCHAR_T_DEFINED
diff --git a/include/rw/_config.h b/include/rw/_config.h
index 985c8d8..5ba0c7a 100644
--- a/include/rw/_config.h
+++ b/include/rw/_config.h
@@ -164,8 +164,12 @@
 
 #if    defined (__EDG__)                \
     && !defined (__DECCXX)              \
+    && !defined (__HP_aCC)              \
     && !defined (__INTEL_COMPILER)      \
     && !defined (_SGI_COMPILER_VERSION)
+   // FIXME: make this more robust by detecting the EDG eccp demo
+   // during library configuration (and avoid relying on compiler
+   // specific macros)
 #  include "_config-eccp.h"
 #endif   // __EDG__
 
@@ -203,11 +207,11 @@
 #  endif   // _SGI_COMPILER_VERSION || !__GNUG__
 #endif   // _RWSTD_OS_IRIX64
 
-/*** MSVC (and Intel C++/Win{32,64}) **************************************/
+/*** MSVC *****************************************************************/
 
-#ifdef _MSC_VER
+#if defined (_MSC_VER) && !defined (__INTEL_COMPILER)
 #  include "_config-msvc.h"
-#endif   // _MSC_VER
+#endif   // _MSC_VER && !__INTEL_COMPILER
 
 /*** Siemens CDS++ ********************************************************/
 
diff --git a/include/rw/_defs.h b/include/rw/_defs.h
index cb1a95e..c4caa2e 100644
--- a/include/rw/_defs.h
+++ b/include/rw/_defs.h
@@ -619,19 +619,11 @@
 // If compiler supports member and default templates then it supports
 // the _RWSTD_ALLOCATOR
 //
-#if    !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)  \
-    && !defined (_RWSTD_NO_SIMPLE_DEFAULT_TEMPLATES) \
+#if    !defined (_RWSTD_NO_SIMPLE_DEFAULT_TEMPLATES) \
     && (!defined (_MSC_VER) || _MSC_VER >= 1300)
 #  define _RWSTD_ALLOCATOR
 #endif
 
-#ifdef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-   // disable container member function templates
-#  ifndef _RWSTD_NO_CONTAINER_TEMPLATE_MEMBERS
-#    define _RWSTD_NO_CONTAINER_TEMPLATE_MEMBERS
-#  endif   // _RWSTD_NO_CONTAINER_TEMPLATE_MEMBERS
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
 
 #define _RWSTD_MB_CUR_MAX 16  // FIXME: must be determined dynamically
 
diff --git a/include/rw/_error.h b/include/rw/_error.h
index 8c97bab..c228a3e 100644
--- a/include/rw/_error.h
+++ b/include/rw/_error.h
@@ -9,16 +9,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -37,14 +44,17 @@
 
 // throws an exception identified by first argument, optional arguments
 // (if any) used to format the exception object's what() string
-void _RWSTD_EXPORT __rw_throw (int, ...);
+_RWSTD_EXPORT void __rw_throw (int, ...);
+
+// frees memory buffer used for what() message
+_RWSTD_EXPORT void __rw_free_what_buf (char*);
 
 // throws an exception identified by first argument with the second
 // argument containing the exception object's what() string, which
-// if non-0, is dynamically allocated and must be delete[]'d
+// if non-0, is must be freed using __rw_free_what_buf()
 // may be assigned to a user-defined handler (e.g., to prevent
 // the library from throwing exceptions or to implement logging)
-extern void _RWSTD_EXPORT (*__rw_throw_proc)(int, char*);
+_RWSTD_EXPORT extern void (*__rw_throw_proc)(int, char*);
 
 }   // namespace __rw
 
diff --git a/include/rw/_exception.h b/include/rw/_exception.h
index 3a9192d..e86a939 100644
--- a/include/rw/_exception.h
+++ b/include/rw/_exception.h
@@ -9,16 +9,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/rw/_file.h b/include/rw/_file.h
index 91557d4..003dda4 100644
--- a/include/rw/_file.h
+++ b/include/rw/_file.h
@@ -9,16 +9,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/rw/_funcbase.h b/include/rw/_funcbase.h
index e9b11eb..5aae733 100644
--- a/include/rw/_funcbase.h
+++ b/include/rw/_funcbase.h
@@ -20,16 +20,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/rw/_heap.cc b/include/rw/_heap.cc
index 819519d..398b08e 100644
--- a/include/rw/_heap.cc
+++ b/include/rw/_heap.cc
@@ -20,16 +20,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/rw/_heap.h b/include/rw/_heap.h
index ee41832..329368f 100644
--- a/include/rw/_heap.h
+++ b/include/rw/_heap.h
@@ -24,16 +24,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/rw/_iosbase.h b/include/rw/_iosbase.h
index 056fbd3..c147e31 100644
--- a/include/rw/_iosbase.h
+++ b/include/rw/_iosbase.h
@@ -291,13 +291,13 @@
 
     typedef void (*event_callback)(event, ios_base&, int);
 
-    // 27.5.2.6, p1
+    // 27.4.2.6, p1
     void register_callback (event_callback, int);
     
     // 27.4.2.4, p1
     static bool sync_with_stdio (bool = true);
 
-    // 27.5.2.7, p2
+    // 27.4.2.7, p2
     virtual ~ios_base ();    
 
     // returns a numeric base as per 22.2.2.1.2, p4
@@ -307,7 +307,7 @@
 
 protected:
 
-    // 27.5.2.7, p1
+    // 27.4.2.7, p1
     ios_base ();
 
     // implements basic_ios<T>::init()
diff --git a/include/rw/_iosfailure.h b/include/rw/_iosfailure.h
index 08e291c..c8f0718 100644
--- a/include/rw/_iosfailure.h
+++ b/include/rw/_iosfailure.h
@@ -9,16 +9,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/rw/_iosfwd.h b/include/rw/_iosfwd.h
index 9088567..caa3032 100644
--- a/include/rw/_iosfwd.h
+++ b/include/rw/_iosfwd.h
@@ -9,16 +9,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/rw/_math.h b/include/rw/_math.h
index ce719e8..93d1c9d 100644
--- a/include/rw/_math.h
+++ b/include/rw/_math.h
@@ -9,16 +9,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/rw/_new.h b/include/rw/_new.h
index dabc27f..e972fe3 100644
--- a/include/rw/_new.h
+++ b/include/rw/_new.h
@@ -10,16 +10,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/rw/_pair.h b/include/rw/_pair.h
index 51b288b..92425cf 100644
--- a/include/rw/_pair.h
+++ b/include/rw/_pair.h
@@ -7,6 +7,26 @@
  *
  ***************************************************************************
  *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2005 Rogue Wave Software.
+ * 
+ ***************************************************************************
+ *
  * Copyright (c) 1994
  * Hewlett-Packard Company
  *
@@ -18,19 +38,6 @@
  * representations about the suitability of this software for any
  * purpose.  It is provided "as is" without express or implied warranty.
  *
- ***************************************************************************
- *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
- * 
  **************************************************************************/
 
 #ifndef _RWSTD_RW_PAIR_H_INCLUDED
@@ -67,8 +74,6 @@
     pair (const first_type &__x, const second_type &__y)
         : first (__x), second (__y) { }
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     // 20.2.2, p4
     template <class _TypeX, class _TypeY>
     pair (const pair <_TypeX, _TypeY> &__rhs) 
@@ -80,8 +85,6 @@
         return first = __rhs.first, second = __rhs.second, *this;
     }
 
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
 };
 
 
diff --git a/include/rw/_rawiter.h b/include/rw/_rawiter.h
index 2319f01..ebfcfc0 100644
--- a/include/rw/_rawiter.h
+++ b/include/rw/_rawiter.h
@@ -20,16 +20,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/rw/_relops.h b/include/rw/_relops.h
index 4b66d23..d308c5c 100644
--- a/include/rw/_relops.h
+++ b/include/rw/_relops.h
@@ -20,16 +20,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/rw/_tree.cc b/include/rw/_tree.cc
index f7f020d..de68d0c 100644
--- a/include/rw/_tree.cc
+++ b/include/rw/_tree.cc
@@ -19,16 +19,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/rw/_tree.h b/include/rw/_tree.h
index f167b57..9a72288 100644
--- a/include/rw/_tree.h
+++ b/include/rw/_tree.h
@@ -9,6 +9,26 @@
  *
  ***************************************************************************
  *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ * 
+ ***************************************************************************
+ *
  * Copyright (c) 1994
  * Hewlett-Packard Company
  *
@@ -20,25 +40,6 @@
  * representations about the suitability of this software for any
  * purpose.  It is provided "as is" without express or implied warranty.
  *
- ***************************************************************************
- *
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
- *
- * Copyright 1994-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
  **************************************************************************/
 
 /***************************************************************************
@@ -151,15 +152,14 @@
     __rw_tree_iter (const _C_iterator &__rhs)
         : _C_node (__rhs._C_node) { }
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     template <class _Ptr, class _Ref>
     __rw_tree_iter (const __rw_tree_iter<_TypeT, _DiffT, _Ptr, _Ref, _Node>&
                     __rhs)
         : _C_node (__rhs._C_node) { }
 
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES && ...
+#endif   // !defined (_MSC_VER) || _MSC_VER >= 1300
 
     __rw_tree_iter (_C_link_t __lnk)
         : _C_node (__lnk) {}        
@@ -472,8 +472,7 @@
     __rb_tree (const key_compare& = key_compare (),
                const allocator_type& = allocator_type ());
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     template<class _InputIter>
     __rb_tree (_InputIter __first, _InputIter __last,
@@ -494,7 +493,7 @@
         }
     }
 
-#else   // if defined (_RWSTD_NO_MEMBER_TEMPLATES)
+#else   // if _MSC_VER < 1300
 
     __rb_tree (const value_type* __first, const value_type* __last, 
                const key_compare& __cmp,
@@ -532,7 +531,7 @@
         }
     }
    
-#endif   // _RWSTD_NO_MEMBER_TEMPLATES
+#endif   // !defined (_MSC_VER) || _MSC_VER >= 1300
 
     __rb_tree (const __rb_tree&);
 
@@ -619,8 +618,7 @@
 
     iterator insert (iterator, const value_type&, bool);
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)  \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     template<class _Iterator>
     void insert (_Iterator __first, _Iterator __last, bool __dup) {
@@ -629,12 +627,12 @@
     }
 
 
-#else   // if defined (_RWSTD_NO_MEMBER_TEMPLATES)
+#else   // if _MSC_VER < 1300
 
     void insert (const_iterator, const_iterator, bool);
     void insert (const value_type*, const value_type*, bool);
 
-#endif   // _RWSTD_NO_MEMBER_TEMPLATES
+#endif   // !defined (_MSC_VER) || _MSC_VER >= 1300
 
     iterator erase (iterator);
 
@@ -867,8 +865,7 @@
 #endif   // _RWSTD_NO_OPTIMIZE_SPEED
 
 
-#if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    || (defined (_MSC_VER) && _MSC_VER < 1300)
+#if defined (_MSC_VER) && _MSC_VER < 1300
 
 template <class _Key, class _Val, class _KeyOf, class _Comp, class _Alloc>
 inline void __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::
@@ -886,7 +883,7 @@
         insert (*__first, __dup);
 }
 
-#endif   // _RWSTD_NO_MEMBER_TEMPLATES
+#endif   // defined (_MSC_VER) && _MSC_VER < 1300
          
 
 template <class _Key, class _Val, class _KeyOf, class _Comp, class _Alloc>
diff --git a/include/rw/_typetraits.h b/include/rw/_typetraits.h
index 35ce207..fc55b30 100644
--- a/include/rw/_typetraits.h
+++ b/include/rw/_typetraits.h
@@ -10,16 +10,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/set b/include/set
index 9fb29cd..545f6b3 100644
--- a/include/set
+++ b/include/set
@@ -122,15 +122,15 @@
                    const allocator_type &__alloc = allocator_type ())
         : _C_rep (__cmp, __alloc) { }
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     template<class _InputIter>
     set (_InputIter __first, _InputIter __last,
          const key_compare& __cmp = key_compare (),
          const allocator_type& __al = allocator_type ())
         : _C_rep (__first, __last, __cmp, __al, false) { }
-#else
+
+#else // if _MSC_VER < 1300
 
     set (const value_type* __first, const value_type* __last,
          const key_compare &__cmp = key_compare (),
@@ -142,7 +142,7 @@
          const allocator_type &__alloc = allocator_type ())
         : _C_rep (__first, __last, __cmp, __alloc, false) { }
 
-#endif
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
 
     set (const set &__x)
         : _C_rep (__x._C_rep) { }
@@ -219,8 +219,7 @@
 
 #endif
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     template<class _InputIter>
     void insert (_InputIter __first, _InputIter __last) {
@@ -228,7 +227,7 @@
             _C_rep.insert (*__first, false);
     }
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else   // if _MSC_VER < 1300
 
     void insert (const value_type* __first, const value_type* __last) {
         for ( ;__first != __last; ++__first)
@@ -240,7 +239,7 @@
               _C_rep.insert (*__first, false);
       }
 
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // !defined (_MSC_VER) || _MSC_VER >= 1300
 
     size_type erase (const key_type& __x)  {
         return _C_rep.erase (__x); 
@@ -357,8 +356,7 @@
               const allocator_type &__alloc = allocator_type ())
         : _C_rep (__cmp, __alloc) { }
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     template<class _InputIter>
     multiset (_InputIter __first, _InputIter __last, 
@@ -366,7 +364,7 @@
               const allocator_type &__alloc = allocator_type ())
         : _C_rep (__first, __last, __cmp, __alloc, true) { }
 
-#else
+#else // _MSC_VER < 1300
 
     multiset (const value_type* __first, const value_type* __last, 
               const key_compare &__cmp = key_compare (),
@@ -378,7 +376,7 @@
               const allocator_type &__alloc = allocator_type ())
         : _C_rep (__first, __last, __cmp, __alloc, true) { }
 
-#endif
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
 
     multiset (const multiset &__x)
         : _C_rep (__x._C_rep) { }
@@ -421,8 +419,7 @@
         return _C_rep.insert (__it, __x, true);
     }
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     template<class _InputIter>
     void insert (_InputIter __first, _InputIter __last) {
@@ -430,7 +427,7 @@
             _C_rep.insert (*__first, true);
     }
 
-#else
+#else // _MSC_VER < 1300
 
     void insert (const value_type* __first, const value_type* __last) {
         for ( ;__first != __last; ++__first)
@@ -442,7 +439,7 @@
             _C_rep.insert (*__first, true);
     }
 
-#endif
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
 
     void erase (iterator __it) {
         _C_rep.erase (__it);
diff --git a/include/sstream b/include/sstream
index 79e47c3..2eafa1d 100644
--- a/include/sstream
+++ b/include/sstream
@@ -124,11 +124,7 @@
 
     virtual ~basic_stringbuf ();
     
-    _C_string_type str () const {
-        const _RWSTD_SIZE_T __slen = (this->egptr () < this->pptr () ?
-            this->pptr () : this->egptr ()) - this->pbase ();
-        return _C_string_type (this->_C_buffer, __slen);
-    }
+    _C_string_type str () const;
 
 #ifdef _RWSTD_NO_EXT_STRINGBUF_STR
 
@@ -181,6 +177,28 @@
     void _C_catchup (char_type*);
 };
 
+template <class _CharT, class _Traits, class _Allocator>
+inline basic_string<_CharT, _Traits, _Allocator>
+basic_stringbuf<_CharT, _Traits, _Allocator>::
+str () const {
+
+    const char_type * __first = 0;
+    const char_type * __last = 0;
+
+    if (this->_C_is_out ()) {
+        // in out only or in|out mode
+        __first = this->pbase ();
+        __last = this->egptr () < this->pptr () ?
+            this->pptr () : this->egptr ();
+    }
+    else if (this->_C_is_in ()) {
+        // in in only mode
+        __first = this->eback ();
+        __last = this->egptr ();
+    }
+
+    return _C_string_type (__first, __last - __first);
+}
 
 template <class _CharT, class _Traits, class _Allocator>
 inline _RWSTD_STREAMSIZE
diff --git a/include/stdexcept b/include/stdexcept
index 4f36a0e..aefe42a 100644
--- a/include/stdexcept
+++ b/include/stdexcept
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -44,6 +51,8 @@
     // extension
     _EXPLICIT logic_error (const char *__s = 0)
         : _RW::__rw_exception (__s) { }
+
+    virtual ~logic_error () _THROWS (());
 };
 
 
diff --git a/include/string b/include/string
index a78b69f..531f056 100644
--- a/include/string
+++ b/include/string
@@ -47,9 +47,15 @@
 _RWSTD_NAMESPACE (std) { 
 
 
-#if    !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)                           \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))\
-    && defined (_RWSTD_NO_MEMBER_TEMPLATES)
+#if    (   defined (_RWSTD_NO_MEMBER_TEMPLATES)   \
+        || defined (_RWSTD_NO_EXTERN_MEMBER_TEMPLATE)) \
+    && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
+#  define _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
+#endif   // _RWSTD_NO_STRING_MEMBER_TEMPLATES
+
+
+#ifndef _RWSTD_NO_MEMBER_TEMPLATES
+#  ifdef _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
 
 template <class _CharT, class _Traits, class _Alloc,
           class _StringIter, class _InputIter>
@@ -63,7 +69,8 @@
 __rw_replace_aux (std::basic_string<_CharT, _Traits, _Alloc>&, 
                   _StringIter, _StringIter, _InputIter, _InputIter);
 
-#endif   // !NO_INLINE_MEMBER_TEMPLATES && NO_MEMBER_TEMPLATES
+#  endif   // _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
+#endif   // _RWSTD_NO_MEMBER_TEMPLATES
 
 
 _EXPORT
@@ -172,8 +179,7 @@
                   const allocator_type& = allocator_type ());
 
 
-#if    !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)  \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
+#ifndef _RWSTD_NO_MEMBER_TEMPLATES
 
     // 21.3.1, p15
     template <class _InputIter>
@@ -184,7 +190,7 @@
                  __first, __last);
     }
 
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // _RWSTD_NO_MEMBER_TEMPLATES
 
     basic_string (const_pointer, const_pointer, const allocator_type&
                   _RWSTD_REDECLARED_DEFAULT (allocator_type ()));
@@ -298,8 +304,7 @@
         return replace (size (), size_type (), __s);
     }
 
-#if    !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
+#ifndef _RWSTD_NO_MEMBER_TEMPLATES
 
     template<class _InputIter>
     basic_string& append (_InputIter __first, _InputIter __last) {
@@ -321,14 +326,14 @@
         return replace (size (), size_type (), __n, __c);
     }
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else   // if defined (_RWSTD_NO_MEMBER_TEMPLATES)
 
     basic_string& append (const_pointer __first, const_pointer __last) {
         replace (size (), size_type (), __first, __last - __first);
         return *this;
     }
 
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // _RWSTD_NO_MEMBER_TEMPLATES
 
     basic_string& append (size_type __n, value_type __c) {
         return replace (size (), size_type (), __n, __c);
@@ -354,8 +359,7 @@
     }
 
 
-#if    !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
+#ifndef _RWSTD_NO_MEMBER_TEMPLATES
 
     template<class _InputIter>
     basic_string& assign (_InputIter __first, _InputIter __last) {
@@ -378,14 +382,14 @@
         return replace (size_type (), size (), __n, __c);
     }
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else   // if defined (_RWSTD_NO_MEMBER_TEMPLATES)
 
     basic_string& assign (const_pointer __first, const_pointer __last) {
         replace (size_type (), size (), __first, __last - __first);
         return *this;
     }
 
-#endif  // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // _RWSTD_NO_MEMBER_TEMPLATES
 
     basic_string& assign (size_type __n, value_type __c) {
         return replace (size_type (), size (), __n, __c);
@@ -410,8 +414,7 @@
         return insert (__inx, &__c, 1), begin () + __inx;
     }
 
-#if    !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATE) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
+#ifndef _RWSTD_NO_MEMBER_TEMPLATES
 
     template<class _InputIter>
     void insert (iterator __p, _InputIter __first, _InputIter __last) {
@@ -457,7 +460,7 @@
 
 #  endif   // _RWSTD_NO_DEBUG_ITER
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else   // if defined (_RWSTD_NO_MEMBER_TEMPLATES)
 
     void insert (iterator __p, const_pointer __first, const_pointer __last) {
         if (__first >= _C_data && __first <= _C_data + size ())
@@ -466,7 +469,7 @@
             replace (__p, __p, __first, __last);
     }
 
-#endif  // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // _RWSTD_NO_MEMBER_TEMPLATES
     
 
     void insert (iterator __it, size_type __n, value_type __c) {
@@ -506,18 +509,14 @@
         return _C_make_iter (_C_data + __pos1);
     }
 
+public:
 
-#if    !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)  \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
-
-#  ifndef _RWSTD_NO_MEMBER_TEMPLATES
+#ifndef _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
 
     template <class _InputIter>
     basic_string& __replace_aux (iterator, iterator, _InputIter, _InputIter);
 
-#  else   // if defined (_RWSTD_NO_MEMBER_TEMPLATES)
-
-public:
+#else
 
     template <class _InputIter>
     basic_string& __replace_aux (iterator __first1, iterator __last1, 
@@ -525,9 +524,7 @@
         return __rw_replace_aux (*this, __first1, __last1, __first2, __last2);
     }
 
-#  endif   // _RWSTD_NO_MEMBER_TEMPLATES
-
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
 
     size_type _C_grow (size_type, size_type) const;
 
@@ -583,17 +580,16 @@
         return replace (_C_off (__first), _C_off (__first, __last), __n, __c);
     }
 
-#if    !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
+#ifndef _RWSTD_NO_MEMBER_TEMPLATES
 
-#  ifndef _RWSTD_NO_MEMBER_TEMPLATES
+#  ifndef _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
 
     template<class _InputIter>
     basic_string&
     replace (iterator __first1, iterator __last1, 
              _InputIter __first2, _InputIter __last2, void*);
 
-#  else   // if defined (_RWSTD_NO_MEMBER_TEMPLATES)
+#  else   // if defined (_RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES)
 
     template<class _InputIter>
     basic_string&
@@ -602,7 +598,7 @@
         return __rw_replace (*this, __first1, __last1, __first2, __last2);
     }
 
-#  endif   // _RWSTD_NO_MEMBER_TEMPLATES
+#  endif   // _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
 
     basic_string&
     replace (iterator __first, iterator __last,
@@ -619,17 +615,17 @@
                         _RWSTD_DISPATCH (_InputIter));
     }
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else   // if defined (_RWSTD_NO_MEMBER_TEMPLATES)
 
     basic_string&
     replace (iterator __first1, iterator __last1,
              const_pointer __first2, const_pointer __last2) {
         replace (_C_off (__first1), _C_off (__first1, __last1),
-                 __first2, _C_off (__first2, __last2));
+                 __first2, size_type (__last2 - __first2));
         return *this;
     }
 
-#endif  // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // _RWSTD_NO_MEMBER_TEMPLATES
 
 
     // 21.3.5.7, p1
@@ -819,17 +815,15 @@
     }
 #endif
 
-#if    !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)                            \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER)) \
-    && defined (_RWSTD_NO_MEMBER_TEMPLATES)
-
-public:
-
-#else
+#ifndef _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
 
 private:
 
-#endif
+#else   // if defined (_RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATSE)
+
+public:
+
+#endif   // _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
 
     static size_type
     _C_off (const_iterator __first, const_iterator __last) {
diff --git a/include/string.cc b/include/string.cc
index b92ea7a..815fde4 100644
--- a/include/string.cc
+++ b/include/string.cc
@@ -479,12 +479,12 @@
 }
 
 
-#if    !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER)) 
+#ifndef _RWSTD_NO_MEMBER_TEMPLATES
 
-#  ifdef _RWSTD_NO_MEMBER_TEMPLATES
+#  ifdef _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
 
-template<class _CharT, class _Traits, class _Alloc, class _StringIter, class _InputIter>
+template <class _CharT, class _Traits, class _Alloc,
+          class _StringIter, class _InputIter>
 _STD::basic_string<_CharT, _Traits, _Alloc>& 
 __rw_replace (_STD::basic_string<_CharT, _Traits, _Alloc> &__s, 
               _StringIter __first1, _StringIter __last1,
@@ -499,7 +499,7 @@
      _C_string_ref_type;
 
 
-#  else   // !defined (_RWSTD_NO_MEMBER_TEMPLATES)
+#  else   // !defined (_RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES)
 
 template<class _CharT, class _Traits, class _Allocator>
 template<class _InputIter>
@@ -510,7 +510,7 @@
 {
   basic_string &__s = *this;
 
-#  endif   // _RWSTD_NO_MEMBER_TEMPLATES
+#  endif   // _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
 
     _RWSTD_ASSERT_RANGE (__first1, __s._C_make_iter (__s._C_data + __s.size ()));
     _RWSTD_ASSERT_RANGE (__first1, __last1);
@@ -571,9 +571,10 @@
 // Avoids the possibility of multiple allocations
 // We still have to copy characters over one at a time.
 
-#ifdef _RWSTD_NO_MEMBER_TEMPLATES
+#  ifdef _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
 
-template<class _CharT, class _Traits, class _Alloc, class _StringIter, class _InputIter>
+template <class _CharT, class _Traits, class _Alloc,
+          class _StringIter, class _InputIter>
 _STD::basic_string<_CharT, _Traits, _Alloc>& 
 __rw_replace_aux (_STD::basic_string<_CharT, _Traits, _Alloc> &__s, 
                   _StringIter __first1, _StringIter __last1,
@@ -588,7 +589,7 @@
     typedef _RW::__string_ref<value_type, traits_type, allocator_type>
      _C_string_ref_type;
 
-#  else
+#  else   // if !defined (_RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES)
 
 template<class _CharT, class _Traits, class _Allocator>
 template<class _InputIter>
@@ -599,7 +600,7 @@
 {
   basic_string &__s = *this;
 
-#  endif  // _RWSTD_NO_MEMBER_TEMPLATES
+#  endif  // _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
 
     _RWSTD_ASSERT_RANGE (__first1, __s._C_make_iter (__s._C_data 
                                                      + __s.size ()));
@@ -665,7 +666,7 @@
     return __s;
 }
 
-#endif   //_RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // _RWSTD_NO_MEMBER_TEMPLATES
 
 
 template <class _CharT, class _Traits, class _Allocator>
diff --git a/include/strstream b/include/strstream
index 9183d30..95222b7 100644
--- a/include/strstream
+++ b/include/strstream
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/tr1/array b/include/tr1/array
index 05532ec..9764902 100644
--- a/include/tr1/array
+++ b/include/tr1/array
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/typeinfo b/include/typeinfo
index 197f16d..3c3ef15 100644
--- a/include/typeinfo
+++ b/include/typeinfo
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/utility b/include/utility
index 8854fae..9d4c183 100644
--- a/include/utility
+++ b/include/utility
@@ -20,16 +20,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/vector b/include/vector
index 40507de..5881a98 100644
--- a/include/vector
+++ b/include/vector
@@ -58,8 +58,7 @@
 template <class _TypeT, class _Allocator = allocator<_TypeT> >
 class vector;
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-#  ifdef _RWSTD_NO_MEMBER_TEMPLATES
+#ifdef _RWSTD_NO_MEMBER_TEMPLATES
 
 // declarations of non-member function templates implementing
 // the functionality of vector member function templates
@@ -84,8 +83,7 @@
 void __rw_insert_range (vector<_TypeT, _Allocator>*, _VectorIter,
                         _FwdIter, _FwdIter, forward_iterator_tag);
 
-#  endif   // _RWSTD_NO_MEMBER_TEMPLATES
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // _RWSTD_NO_MEMBER_TEMPLATES
 
 
 _EXPORT
@@ -168,9 +166,7 @@
         assign (__n, __x);
     }
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
-#  if !defined (_MSC_VER) || _MSC_VER >= 1300
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     template <class _InputIter>
     vector (_InputIter __first, _InputIter __last,
@@ -179,7 +175,7 @@
         assign (__first, __last);
     }
 
-#  else   // if !MSVC || MSVC <= 6.0
+#else   // if !MSVC || MSVC <= 6.0
 
     // working around an MSVC 6.0 ICE (bug #554)
     template <class _InputIter>
@@ -195,18 +191,8 @@
         assign (__first, __last);
     }
 
-#  endif   // MSVC <= 6.0
+#endif   // MSVC <= 6.0
     
-#else  // defined _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
-    vector (const_iterator __first, const_iterator __last,
-            const _Allocator &__alloc = allocator_type ())
-        : allocator_type (__alloc), _C_begin (), _C_end (), _C_bufend () {
-        assign (__first, __last);
-    }
-    
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     vector (const vector &__rhs)
         : allocator_type (__rhs.get_allocator ()),
           _C_begin (), _C_end (), _C_bufend () {
@@ -222,27 +208,12 @@
     
     vector& operator= (const vector&);
     
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     template <class _InputIter>
     void assign (_InputIter __first, _InputIter __last) {
         // dispatch either to a range assign or to an assign with repetition
         _C_assign (__first, __last, _RWSTD_DISPATCH (_InputIter));
     }
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
-    void assign (const_iterator, const_iterator);
-
-#  ifndef _RWSTD_NO_DEBUG_ITER
-
-    // otherwise, const_pointer is the same as const_iterator
-    void assign (const_pointer, const_pointer);
-
-#  endif   // _RWSTD_NO_DEBUG_ITER
-
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     void assign (size_type __n, const_reference __x) {
         _C_assign_n (__n, __x);
     }
@@ -341,22 +312,11 @@
 
     iterator insert (iterator, const_reference);
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     template <class _InputIter>
     void insert (iterator __it, _InputIter __first, _InputIter __last) {
         _C_insert (__it, __first, __last, _RWSTD_DISPATCH (_InputIter));
     }
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
-    void insert (iterator __it,
-                 const_iterator __first, const_iterator __last) {
-        _RWSTD_INSERT_RANGE (__it, __first, __last);
-    }
-    
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     void insert (iterator __it, size_type __n, const_reference __x) {
         _C_insert_n (__it, __n, __x);
     }
@@ -406,8 +366,6 @@
 
 #endif   // _RWSTD_NO_MEMBER_TEMPLATES
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     // implements range assign
     template <class _InputIter>
     void _C_assign (_InputIter __first, _InputIter __last, void*) {
@@ -451,8 +409,6 @@
         _C_insert_n (__it, size_type (__n), __x);
     }
 
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     void _C_realloc (size_type);
 
     // constructs a copy at the end and grows the size of container
@@ -1121,8 +1077,6 @@
         while (__n-- > 0) *__first++ = __val;
     }
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     template <class _Iterator>
     iterator _C_copy (_Iterator __first, _Iterator __last, iterator __res) {
         while (__first != __last)
@@ -1137,36 +1091,6 @@
         return __res;
     }
 
-#else
-    iterator
-    _C_copy (const_iterator __first, const_iterator __last, iterator __res) {
-        while (__first != __last)
-            *__res++ = *__first++;
-        return __res;
-    }
-
-    iterator _C_copy (const bool* __first, const bool* __last, iterator __res) {
-        while (__first != __last)
-            *__res++ = *__first++;
-        return __res;
-    }
-
-    iterator _C_copy_backward (const_iterator __first, const_iterator __last,
-                               iterator __res) {
-        while (__first != __last)
-            *--__res = *--__last;
-        return __res;
-    }
-
-    iterator
-    _C_copy_backward (const bool* __first, const bool* __last, iterator __res) {
-        while (__first != __last)
-            *--__res = *--__last;
-        return __res;
-    }
-
-#endif
-
 private:
 
     iterator       _C_begin;
@@ -1213,8 +1137,6 @@
         _C_copy (__x.begin (), __x.end (), _C_begin);
     }
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     template<class _InputIter>
     vector  (_InputIter __first, _InputIter __last)
         : allocator_type (), _C_bufend ()
@@ -1223,22 +1145,6 @@
       _C_init(__n); 
       _C_copy(__first, __last, _C_begin);
     }
-#else
-    vector (const_iterator __first, const_iterator __last)
-        : allocator_type (), _C_bufend ()
-    {
-      size_type __n = _DISTANCE (__first, __last, size_type);
-      _C_init(__n);
-      _C_copy(__first, __last, _C_begin);
-    }
-    vector (const bool* __first, const bool* __last)
-        : allocator_type (), _C_bufend ()
-    {
-      size_type __n = _DISTANCE (__first, __last, size_type);
-      _C_init(__n);
-      _C_copy(__first, __last, _C_begin);
-    }
-#endif
   
     ~vector () {
       _C_value_alloc_type(*this).deallocate(_C_begin._C_p,  
@@ -1258,23 +1164,12 @@
       return *this;
     }
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     template<class _InputIter>
     void assign (_InputIter __first, _InputIter __last) {
         clear ();
         insert (begin (), __first, __last);
     }
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
-    void assign (const_iterator __first, const_iterator __last) {
-        clear ();
-        insert (begin (), __first, __last);
-    }
-
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     void assign (size_type __n, const bool& __x = bool()) { 
         clear ();
         insert (begin (), __n, __x);
diff --git a/include/vector_spec.h b/include/vector_spec.h
index 092d92c..c2c33b2 100644
--- a/include/vector_spec.h
+++ b/include/vector_spec.h
@@ -18,16 +18,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/access.h b/src/access.h
index 7b6ce02..2c84506 100644
--- a/src/access.h
+++ b/src/access.h
@@ -5,20 +5,27 @@
  * This is an internal header file used to implement the C++ Standard
  * Library. It should never be #included directly by a program.
  *
- * $Id: //stdlib/dev/source/stdlib/access.h#6 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
  
diff --git a/src/assert.cpp b/src/assert.cpp
index 9b39225..af77e28 100644
--- a/src/assert.cpp
+++ b/src/assert.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/catalog.cpp b/src/catalog.cpp
index bcbd41e..0b6a623 100644
--- a/src/catalog.cpp
+++ b/src/catalog.cpp
@@ -2,20 +2,27 @@
  *
  * rwcats.cpp - Implementation of XPG4 messages
  *
- * $Id: //stdlib/dev/source/stdlib/catalog.cpp#5 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/catalog.h b/src/catalog.h
index 5413c5f..8982b12 100644
--- a/src/catalog.h
+++ b/src/catalog.h
@@ -5,20 +5,27 @@
  * This is an internal header file used to implement the C++ Standard
  * Library. It should never be #included directly by a program.
  *
- * $Id: //stdlib/dev/source/stdlib/catalog.h#6 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/codecvt.cpp b/src/codecvt.cpp
index 311e28a..ce0d259 100644
--- a/src/codecvt.cpp
+++ b/src/codecvt.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ctype_bits.cpp b/src/ctype_bits.cpp
index eaa6933..f235744 100644
--- a/src/ctype_bits.cpp
+++ b/src/ctype_bits.cpp
@@ -2,20 +2,27 @@
  *
  * ctype_bits.cpp - definitions of std::ctype_base constant data members
  *
- * $Id: //stdlib/dev/source/stdlib/ctype_bits.cpp#4 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/exception.cpp b/src/exception.cpp
index b8c24b4..21eecfd 100644
--- a/src/exception.cpp
+++ b/src/exception.cpp
@@ -1,4 +1,4 @@
- /***************************************************************************
+/***************************************************************************
  *
  * exception.cpp - Source for the Standard Library exception classes
  *
@@ -40,14 +40,15 @@
 
 #include <rw/_defs.h>
 
-#if !defined (__EDG__) || defined (__DECCXX) || defined (__INTEL_COMPILER)
+#ifndef _RWSTD_EDG_ECCP
 #  include <stdarg.h>
 #else
+   // use "special" magic for the EDG eccp demo
 #  include <ansi/_cstdarg.h>
 
 _USING (_STD::va_list);
 
-#endif   // __EDG__ ...
+#endif   // EDG eccp demo
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -437,6 +438,16 @@
 static _RWSTD_THREAD int
 __rw_what_refcnt;
 
+// free memory buffer allocated in __rw_vfmtwhat()
+_RWSTD_EXPORT void __rw_free_what_buf (char* buf)
+{
+    if (__rw_what_buf == buf) {
+        _RWSTD_ASSERT (0 < __rw_what_refcnt);
+        _RWSTD_THREAD_PREDECREMENT (__rw_what_refcnt, false);
+    }
+    else
+        delete[] buf;
+}
 
 // allocate a char array and format it sprintf-style
 // caller responsible for calling delete[] on returned pointer
@@ -546,14 +557,8 @@
         if (bufsize)
             return 0;
 
-        if (buf == __rw_what_buf) {
-            _RWSTD_THREAD_PREDECREMENT (__rw_what_refcnt, false);
-        }
-        else {
-            delete[] buf;
-        }
+        __rw_free_what_buf (buf);
         buf = new char [size];
-
     }
 
     return buf;
@@ -740,13 +745,13 @@
             _STD::runtime_error ()._C_assign (what, 0);
     }
 
-    delete[] what;
+    __rw_free_what_buf (what);
 
 #else   // if defined (_RWSTD_NO_EXCEPTIONS)
 
     if (what) {
         fprintf (stderr,"Exception: %s.\n", what);
-        delete[] what;
+        __rw_free_what_buf (what);
     }
     else {
         const char *__str;
@@ -825,9 +830,6 @@
 
         // throw_proc takes ownership of allocated string
         __rw_throw_proc (id, what);
-
-        // if throw_proc returns, delete allocated what string
-        delete[] what;
     }
 }
 
@@ -839,12 +841,7 @@
 __rw_exception::__rw_exception (const __rw_exception &rhs)
     : _STD::exception (rhs), _C_what (0)
 {
-    if (rhs._C_what == __rw_what_buf) {
-        _RWSTD_THREAD_PREINCREMENT (__rw_what_refcnt, false);
-        _C_what = __rw_what_buf;
-    }
-    else
-        _C_assign (rhs.what ());
+    _C_assign (rhs.what ());
 }
 
   
@@ -866,12 +863,7 @@
 // outlined to avoid functional compatibility issues
 /* virtual */ __rw_exception::~__rw_exception () _THROWS (())
 {
-    if (_C_what == __rw_what_buf) {
-        _RWSTD_THREAD_PREDECREMENT (__rw_what_refcnt, false);
-    }
-    else {
-        delete[] _C_what;
-    }
+    __rw_free_what_buf (_C_what);
 
 #ifdef _C_dummy_what
     // zero out dummy member of the base exception class
@@ -916,21 +908,28 @@
 
         if (whatstr && *whatstr) {
 
-            if (_RWSTD_SIZE_MAX == len)
-                len = strlen (whatstr);
-
-            if (len) {
-                // allocate own buffer and copy string
-                tmp = new char [len + 1];
-                memcpy (tmp, whatstr, len + 1);
+            if (whatstr == __rw_what_buf) {
+                if (len)
+                    _RWSTD_THREAD_PREINCREMENT (__rw_what_refcnt, false);
+                tmp = __rw_what_buf;
             }
             else {
-                // special case: do not allocate, just use passed in pointer
-                tmp = _RWSTD_CONST_CAST (char*, whatstr);
+                if (_RWSTD_SIZE_MAX == len)
+                    len = strlen (whatstr);
+
+                if (len) {
+                    // allocate own buffer and copy string
+                    tmp = new char [len + 1];
+                    memcpy (tmp, whatstr, len + 1);
+                }
+                else {
+                    // special case: do not allocate, just use passed in pointer
+                    tmp = _RWSTD_CONST_CAST (char*, whatstr);
+                }
             }
         }
 
-        delete[] _C_what;
+        __rw_free_what_buf (_C_what);
         _C_what = tmp;
     }
     return *this;
diff --git a/src/export.cpp b/src/export.cpp
index 4e06d07..f613cc2 100644
--- a/src/export.cpp
+++ b/src/export.cpp
@@ -2,20 +2,27 @@
  *
  * export.cpp - exported templates
  *
- * $Id: //stdlib/dev/source/stdlib/export.cpp#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2004-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -33,6 +40,9 @@
 #include <bitset>
 #include <bitset.cc>
 
+#include <complex>
+#include <complex.cc>
+
 #include <deque>
 #include <deque.cc>
 
diff --git a/src/i86/atomic.s b/src/i86/atomic.s
index a52388d..0dda781 100644
--- a/src/i86/atomic.s
+++ b/src/i86/atomic.s
@@ -6,25 +6,33 @@
  *
  ***************************************************************************
  *
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
- * Copyright 2003-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2003-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
+#if defined (__ELF__)
+   /* GNU as supports this .type directive only on ELF targets */
+#  define TYPE_DIR(name, kind)    .type name, kind
+#else
+#  define TYPE_DIR(ign1, ign2)
+#endif
+
     .text
     .align 4
 
@@ -36,6 +44,8 @@
  **************************************************************************/
 
     .globl __rw_atomic_xchg8
+    TYPE_DIR (__rw_atomic_xchg8, @function)
+
 __rw_atomic_xchg8:                 /* ; char (char *x, char y)        */
     mov           4(%esp), %ecx    /* ; %ecx = x                      */
     movb          8(%esp), %al     /* ; %al = y                       */
@@ -51,6 +61,8 @@
  **************************************************************************/
 
     .globl __rw_atomic_xchg16
+    TYPE_DIR (__rw_atomic_xchg16, @function)
+
 __rw_atomic_xchg16:                /* ; short (short *x, short y)     */
     mov           4(%esp), %ecx    /* ; %ecx = x                      */
     mov           8(%esp), %eax    /* ; %eax = y                      */
@@ -66,6 +78,8 @@
  **************************************************************************/
 
     .globl __rw_atomic_xchg32
+    TYPE_DIR (__rw_atomic_xchg32, @function)
+
 __rw_atomic_xchg32:                /* ; int (int *x, int y)           */
     movl          4(%esp), %ecx    /* ; %ecx = x                      */
     movl          8(%esp), %eax    /* ; %eax = y                      */
@@ -81,6 +95,8 @@
  **************************************************************************/
 
     .globl __rw_atomic_add8
+    TYPE_DIR (__rw_atomic_add8, @function)
+
 __rw_atomic_add8:                  /* ; char (char *dst, int inc)     */
     mov            4(%esp), %ecx   /* ; %ecx = dst                    */
     mov            8(%esp), %eax   /* ; %eax = inc                    */
@@ -103,6 +119,8 @@
  **************************************************************************/
 
      .globl __rw_atomic_add16
+    TYPE_DIR (__rw_atomic_add16, @function)
+
 __rw_atomic_add16:                 /* ; long (long *dst, long inc)    */
     mov            4(%esp), %ecx   /* ; %ecx = dst                    */
     mov            8(%esp), %eax   /* ; %eax = inc                    */
@@ -125,6 +143,8 @@
  **************************************************************************/
 
     .globl __rw_atomic_add32
+    TYPE_DIR (__rw_atomic_add32, @function)
+
 __rw_atomic_add32:                 /* ; long (long *dst, long inc)    */
     movl           4(%esp), %ecx   /* ; %ecx = dst                    */
     movl           8(%esp), %edx   /* ; %edx = inc                    */
diff --git a/src/ios.cpp b/src/ios.cpp
index 3bc5933..7269142 100644
--- a/src/ios.cpp
+++ b/src/ios.cpp
@@ -2,20 +2,27 @@
  *
  * ios.cpp - Source for the Standard Library ios classes
  *
- * $Id: //stdlib/dev/source/stdlib/ios.cpp#80 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ios_bits.cpp b/src/ios_bits.cpp
index c553691..bda6060 100644
--- a/src/ios_bits.cpp
+++ b/src/ios_bits.cpp
@@ -2,20 +2,27 @@
  *
  * ios_bits.cpp - definitions of ios_base static const data members
  *
- * $Id: //stdlib/dev/source/stdlib/ios_bits.cpp#5 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/iosdata.h b/src/iosdata.h
index 2a31513..f9c2dd9 100644
--- a/src/iosdata.h
+++ b/src/iosdata.h
@@ -2,20 +2,27 @@
  *
  * iosdata.h
  *
- * $Id: //stdlib/dev/source/stdlib/iosdata.h#8 $ 
+ * $Id$ 
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/iso2022.cpp b/src/iso2022.cpp
index 99d4c45..d1c3ef8 100644
--- a/src/iso2022.cpp
+++ b/src/iso2022.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/iso2022.h b/src/iso2022.h
index 46612bf..c84adb7 100644
--- a/src/iso2022.h
+++ b/src/iso2022.h
@@ -9,16 +9,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/limits.cpp b/src/limits.cpp
index 48bf27c..3c72c34 100644
--- a/src/limits.cpp
+++ b/src/limits.cpp
@@ -2,20 +2,27 @@
  *
  * limits.cpp - Source for the Standard Library limits class
  *
- * $Id: //stdlib/dev/source/stdlib/limits.cpp#25 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/limits_bits.cpp b/src/limits_bits.cpp
index 4a0a3c0..70ffe52 100644
--- a/src/limits_bits.cpp
+++ b/src/limits_bits.cpp
@@ -2,20 +2,27 @@
  *
  * limits_bits.cpp - source for the C++ Standard Library limits constants
  *
- * $Id: //stdlib/dev/source/stdlib/limits_bits.cpp#6 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/locale_bits.cpp b/src/locale_bits.cpp
index b887aea..239377e 100644
--- a/src/locale_bits.cpp
+++ b/src/locale_bits.cpp
@@ -2,20 +2,27 @@
  *
  * locale_bits.cpp - definitions of std::locale constant data members
  *
- * $Id: //stdlib/dev/source/stdlib/locale_bits.cpp#4 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/locale_body.h b/src/locale_body.h
index f426018..0e7f1e2 100644
--- a/src/locale_body.h
+++ b/src/locale_body.h
@@ -5,20 +5,27 @@
  * This is an internal header file used to implement the C++ Standard
  * Library. It should never be #included directly by a program.
  *
- * $Id: //stdlib/dev/source/stdlib/locale_body.h#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/locale_classic.cpp b/src/locale_classic.cpp
index 6a0febf..4fa2e60 100644
--- a/src/locale_classic.cpp
+++ b/src/locale_classic.cpp
@@ -2,20 +2,27 @@
  *
  * locale_classic.cpp - definition of std::locale::classic()
  *
- * $Id: //stdlib/dev/source/stdlib/locale_classic.cpp#6 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/locale_combine.cpp b/src/locale_combine.cpp
index d48da52..58e841f 100644
--- a/src/locale_combine.cpp
+++ b/src/locale_combine.cpp
@@ -3,20 +3,27 @@
  * locale_combine.cpp - definition of std::locale::combine() and related
  *                      member functions
  *
- * $Id: //stdlib/dev/source/stdlib/locale_combine.cpp#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/locale_core.cpp b/src/locale_core.cpp
index 332fd38..50af7e4 100644
--- a/src/locale_core.cpp
+++ b/src/locale_core.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/locale_eq.cpp b/src/locale_eq.cpp
index 4da8a12..7d44417 100644
--- a/src/locale_eq.cpp
+++ b/src/locale_eq.cpp
@@ -2,20 +2,27 @@
  *
  * locale_eq.cpp - definition of std::locale::operator==()
  *
- * $Id: //stdlib/dev/source/stdlib/locale_eq.cpp#5 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/locale_global.cpp b/src/locale_global.cpp
index 475fe07..e2bac05 100644
--- a/src/locale_global.cpp
+++ b/src/locale_global.cpp
@@ -2,20 +2,27 @@
  *
  * locale_global.cpp - definition of std::locale::global()
  *
- * $Id: //stdlib/dev/source/stdlib/locale_global.cpp#5 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/locale_name.cpp b/src/locale_name.cpp
index d0271d3..dc2ff64 100644
--- a/src/locale_name.cpp
+++ b/src/locale_name.cpp
@@ -2,20 +2,27 @@
  *
  * locale_name.cpp - definition of std::locale::name()
  *
- * $Id: //stdlib/dev/source/stdlib/locale_name.cpp#6 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/logic_error.cpp b/src/logic_error.cpp
new file mode 100644
index 0000000..3b2a93b
--- /dev/null
+++ b/src/logic_error.cpp
@@ -0,0 +1,43 @@
+/***************************************************************************
+ *
+ * logic_error.cpp - definitions of class logic_error members
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#define _RWSTD_LIB_SRC
+
+#include <stdexcept>
+#include <rw/_defs.h>
+
+
+_RWSTD_NAMESPACE (std) {
+
+// outlined to avoid generating a vtable in each translation unit
+// that uses the class
+/* virtual */ logic_error::
+~logic_error () _THROWS (())
+{
+    // no-op
+}
+
+}   // namespace std
diff --git a/src/memory.cpp b/src/memory.cpp
index 3519672..5bcf901 100644
--- a/src/memory.cpp
+++ b/src/memory.cpp
@@ -3,20 +3,27 @@
  * memory.cpp - source for the C++ Standard Library
  *              dynamic memory management functions
  *
- * $Id: //stdlib/dev/source/stdlib/memory.cpp#16 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/num_put.cpp b/src/num_put.cpp
index 9db4d4c..bea2418 100644
--- a/src/num_put.cpp
+++ b/src/num_put.cpp
@@ -2,20 +2,27 @@
  *
  * num_put.cpp
  *
- * $Id: //stdlib/dev/source/stdlib/num_put.cpp#51 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/podarray.c b/src/podarray.c
index e8c468c..ccb9d51 100644
--- a/src/podarray.c
+++ b/src/podarray.c
@@ -2,20 +2,27 @@
  *
  * podarray.c
  *
- * $Id: //stdlib/dev/source/stdlib/podarray.c#2 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/podarray.cc b/src/podarray.cc
index 3f67b72..0b75685 100644
--- a/src/podarray.cc
+++ b/src/podarray.cc
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/punct.cpp b/src/punct.cpp
index 8694172..22c8dc2 100644
--- a/src/punct.cpp
+++ b/src/punct.cpp
@@ -6,31 +6,29 @@
  *
  ***************************************************************************
  *
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
- * Copyright 2001-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2001-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
 #define _RWSTD_LIB_SRC
-
 #include <rw/_defs.h>
 
-#ifndef _RWSTD_NO_V3_LOCALE
-
 #include <locale.h>   // for lconv, localeconv(), setlocale()
 #include <stdio.h>    // for sprintf()
 #include <stdlib.h>   // for mbstowcs()
@@ -59,15 +57,17 @@
 _RWSTD_NAMESPACE (__rw) {
 
 
-static inline void __rw_copy (void *dst, const void *src, _RWSTD_SIZE_T n)
+static inline void
+__rw_copy (void *dst, const void *src, size_t n)
 {
-    ::memcpy (dst, src, n);
+    memcpy (dst, src, n);
 }
 
-static inline void __rw_widen (void *dst, const void *src, _RWSTD_SIZE_T n)
+static inline void
+__rw_widen (void *dst, const void *src, size_t n)
 {
-    ::mbstowcs (_RWSTD_STATIC_CAST (wchar_t*, dst),
-                _RWSTD_STATIC_CAST (const char*, src), n);
+    mbstowcs (_RWSTD_STATIC_CAST (wchar_t*, dst),
+              _RWSTD_STATIC_CAST (const char*, src), n);
 }
 
 
@@ -80,7 +80,7 @@
 
     if (pdata) {
 
-        const __rw_punct_t *pun =
+        const __rw_punct_t* const pun =
             _RWSTD_STATIC_CAST (const __rw_punct_t*, pdata);
 
         const __rw_num_t *num;
@@ -144,13 +144,13 @@
     const char* const ts  = pconv->thousands_sep ? pconv->thousands_sep : "";
 
     // the size of the narrow grouping string in bytes
-    const _RWSTD_SIZE_T grsz = strlen (grp) + 1;
+    const size_t grsz = strlen (grp) + 1;
 
     // compute the sizes of all members in bytes
-    _RWSTD_SIZE_T dpsz = strlen (dp) + 1;
-    _RWSTD_SIZE_T tssz = strlen (ts) + 1;
-    _RWSTD_SIZE_T tnsz = sizeof "true";
-    _RWSTD_SIZE_T fnsz = sizeof "false";
+    size_t dpsz = strlen (dp) + 1;
+    size_t tssz = strlen (ts) + 1;
+    size_t tnsz = sizeof "true";
+    size_t fnsz = sizeof "false";
 
     if (winx) {
         // adjust for wide characters
@@ -161,10 +161,10 @@
     }
 
     // compute the actual size of the variable size structure
-    const _RWSTD_SIZE_T size =
+    const size_t size =
           sizeof (__rw_punct_t)
         + sizeof (__rw_num_t)
-        + sizeof (_RWSTD_SIZE_T)   // maximum padding for alignment
+        + sizeof (size_t)   // maximum padding for alignment
         + grsz + dpsz + tssz + tnsz + fnsz;
 
     // allocate variable size structure(s)
@@ -176,7 +176,7 @@
     pun->thousands_sep_off [winx] = pun->decimal_point_off [winx] + int (dpsz);
 
     // point widen to a wrapper for mbstowcs() for wchar_t or memcpy otherwise
-    void (*widen)(void*, const void*, _RWSTD_SIZE_T) =
+    void (*widen)(void*, const void*, size_t) =
         winx ? __rw_widen : __rw_copy;
 
     // copy strings from lconv data members to the varaiable size structure
@@ -189,9 +189,9 @@
     pun->punct_ext_off = pun->thousands_sep_off [winx] + int (tssz);
 
     // adjust alignment
-    const _RWSTD_SIZE_T misalign = pun->punct_ext_off % sizeof (_RWSTD_SIZE_T);
+    const size_t misalign = pun->punct_ext_off % sizeof (size_t);
     if (misalign)
-        pun->punct_ext_off += int (sizeof (_RWSTD_SIZE_T) - misalign);
+        pun->punct_ext_off += int (sizeof (size_t) - misalign);
 
     s = _RWSTD_REINTERPRET_CAST (char*, pun + 1) + pun->punct_ext_off;
 
@@ -220,7 +220,7 @@
         pun;
 
     __rw_access::_C_get_impsize (*_RWSTD_CONST_CAST (__rw_facet*, pfacet)) =
-        (_RWSTD_SIZE_T)(-1);
+        (size_t)(-1);
 
     // call self recursively on already initialized `impdata'
     return __rw_get_numpunct (pfacet, flags);
@@ -239,7 +239,7 @@
 
     if (pdata) {
 
-        const __rw_punct_t *pun =
+        const __rw_punct_t* const pun =
             _RWSTD_STATIC_CAST (const __rw_punct_t*, pdata);
 
         const __rw_mon_t *mon;
@@ -267,7 +267,7 @@
         case __rw_nf: return mon->neg_format [intl];
 
         case __rw_fd:
-            return _RWSTD_REINTERPRET_CAST (void*, (_RWSTD_SIZE_T)
+            return _RWSTD_REINTERPRET_CAST (void*, (size_t)
                                             UChar (mon->frac_digits [intl]));
 
         default: _RWSTD_ASSERT (!"bad discriminant");
@@ -318,18 +318,18 @@
     _RWSTD_ASSERT (pconv->mon_thousands_sep);
 
     // the size of the narrow grouping string in bytes
-    const _RWSTD_SIZE_T grsz = ::strlen (pconv->mon_grouping) + 1;
+    const size_t grsz = strlen (pconv->mon_grouping) + 1;
 
     // compute the sizes of all members in bytes
-    _RWSTD_SIZE_T dpsz = ::strlen (pconv->mon_decimal_point) + 1;
-    _RWSTD_SIZE_T tssz = ::strlen (pconv->mon_thousands_sep) + 1;
-    _RWSTD_SIZE_T pssz = ::strlen (pconv->positive_sign) + 1;
-    _RWSTD_SIZE_T nssz = ::strlen (pconv->negative_sign) + 1;
+    size_t dpsz = strlen (pconv->mon_decimal_point) + 1;
+    size_t tssz = strlen (pconv->mon_thousands_sep) + 1;
+    size_t pssz = strlen (pconv->positive_sign) + 1;
+    size_t nssz = strlen (pconv->negative_sign) + 1;
 
     const char* const cs = intl ? pconv->int_curr_symbol
                                 : pconv->currency_symbol;
 
-    _RWSTD_SIZE_T cssz = ::strlen (cs) + 1;
+    size_t cssz = strlen (cs) + 1;
 
     if (winx) {
         // adjust for wide characters
@@ -341,10 +341,10 @@
     }
 
     // compute the actual size of the variable size structure
-    const _RWSTD_SIZE_T size =
+    const size_t size =
           sizeof (__rw_punct_t)
         + sizeof (__rw_mon_t)
-        + sizeof (_RWSTD_SIZE_T)   // maximum padding for alignment
+        + sizeof (size_t)   // maximum padding for alignment
         + grsz + dpsz + tssz + pssz + nssz + cssz;
 
     // allocate variable size structure(s)
@@ -356,7 +356,7 @@
     pun->thousands_sep_off [winx] = pun->decimal_point_off [winx] + int (dpsz);
 
     // point widen to a wrapper for mbstowcs() for wchar_t or memcpy otherwise
-    void (*widen)(void*, const void*, _RWSTD_SIZE_T) =
+    void (*widen)(void*, const void*, size_t) =
         winx ? __rw_widen : __rw_copy;
 
     // copy strings from lconv data members to the varaiable size structure
@@ -369,9 +369,9 @@
     pun->punct_ext_off = pun->thousands_sep_off [winx] + int (tssz);
 
     // adjust alignment
-    const _RWSTD_SIZE_T misalign = pun->punct_ext_off % sizeof (_RWSTD_SIZE_T);
+    const size_t misalign = pun->punct_ext_off % sizeof (size_t);
     if (misalign)
-        pun->punct_ext_off += int (sizeof (_RWSTD_SIZE_T) - misalign);
+        pun->punct_ext_off += int (sizeof (size_t) - misalign);
 
     s = _RWSTD_REINTERPRET_CAST (char*, pun + 1) + pun->punct_ext_off;
 
@@ -380,7 +380,7 @@
     s += sizeof *mon;
 
     // invalidate members (offsets) by setting them to 0xff
-    ::memset (mon, ~0, sizeof *mon);
+    memset (mon, ~0, sizeof *mon);
 
     mon->positive_sign_off [winx] = 0;
     mon->negative_sign_off [winx] = mon->positive_sign_off [winx] + int (pssz);
@@ -399,7 +399,7 @@
         + mon->curr_symbol_off [intl][winx] + cssz);
 
     // place narrow grouping string last to avoid alignment issues
-    ::memcpy (s + mon->curr_symbol_off [intl][winx] + cssz,
+    memcpy (s + mon->curr_symbol_off [intl][winx] + cssz,
             pconv->mon_grouping, grsz);
 
     mon->frac_digits [0]    = pconv->frac_digits;
@@ -437,14 +437,14 @@
 
     enum {
         // for syntactic convenience
-        none   = _V3_LOCALE::money_base::none,
-        space  = _V3_LOCALE::money_base::space,
-        symbol = _V3_LOCALE::money_base::symbol,
-        sign   = _V3_LOCALE::money_base::sign,
-        value  = _V3_LOCALE::money_base::value
+        none   = _STD::money_base::none,
+        space  = _STD::money_base::space,
+        symbol = _STD::money_base::symbol,
+        sign   = _STD::money_base::sign,
+        value  = _STD::money_base::value
     };
 
-    static const _V3_LOCALE::money_base::pattern pat[] = {
+    static const _STD::money_base::pattern pat[] = {
 
         // cs_precedes [0..1]:
         //
@@ -517,32 +517,30 @@
         /* 124: $ -1 */ { { symbol, space, sign, value } }   // "\2\1\3\4"
     };
 
-    typedef _RWSTD_SIZE_T SizeT;
-
-    _RWSTD_SIZE_T inx =   SizeT (mon->p_cs_precedes [intl]) * (3U * 5U)
-                        + SizeT (mon->p_sep_by_space [intl]) * 5U
-                        + SizeT (mon->p_sign_posn [intl]);
+    size_t inx =   size_t (mon->p_cs_precedes [intl]) * (3U * 5U)
+                 + size_t (mon->p_sep_by_space [intl]) * 5U
+                 + size_t (mon->p_sign_posn [intl]);
 
     if (inx < sizeof pat / sizeof *pat)
-        ::memcpy (mon->pos_format [intl], pat + inx, sizeof *pat);
+        memcpy (mon->pos_format [intl], pat + inx, sizeof *pat);
     else
-        ::memset (mon->pos_format [intl], none, sizeof *pat);
+        memset (mon->pos_format [intl], none, sizeof *pat);
 
-    inx =   SizeT (mon->n_cs_precedes [intl]) * (3U * 5U)
-          + SizeT (mon->n_sep_by_space [intl]) * 5U
-          + SizeT (mon->n_sign_posn [intl]);
+    inx =   size_t (mon->n_cs_precedes [intl]) * (3U * 5U)
+          + size_t (mon->n_sep_by_space [intl]) * 5U
+          + size_t (mon->n_sign_posn [intl]);
 
     if (inx < sizeof pat / sizeof *pat)
-        ::memcpy (mon->neg_format [intl], pat + inx, sizeof *pat);
+        memcpy (mon->neg_format [intl], pat + inx, sizeof *pat);
     else
-        ::memset (mon->neg_format [intl], none, sizeof *pat);
+        memset (mon->neg_format [intl], none, sizeof *pat);
 
     // set `impdata' and `impsize' (facet base dtor will delete)
     __rw_access::_C_get_impdata (*_RWSTD_CONST_CAST (__rw_facet*, pfacet)) =
         pun;
 
     __rw_access::_C_get_impsize(*_RWSTD_CONST_CAST (__rw_facet*, pfacet)) =
-        (_RWSTD_SIZE_T)(-1);
+        (size_t)(-1);
 
     // call self recursively on already initialized `impdata'
     return __rw_get_moneypunct (pfacet, flags);
@@ -641,7 +639,7 @@
 
 #ifdef _RWSTD_LLONG_PRINTF_PREFIX
 
-        ::memcpy (pbuf, _RWSTD_LLONG_PRINTF_PREFIX,
+        memcpy (pbuf, _RWSTD_LLONG_PRINTF_PREFIX,
                 sizeof _RWSTD_LLONG_PRINTF_PREFIX - 1);
         pbuf += sizeof _RWSTD_LLONG_PRINTF_PREFIX - 1;
 
@@ -695,6 +693,3 @@
 
 
 }   // namespace __rw
-
-
-#endif   // _RWSTD_NO_V3_LOCALE
diff --git a/src/random.cpp b/src/random.cpp
index 8c1d97a..adf743d 100644
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -2,7 +2,7 @@
  *
  * random.cpp - random number generator
  *
- * $Id: //stdlib/dev/source/stdlib/random.cpp#8 $
+ * $Id$
  *
  ***************************************************************************
  *
@@ -19,16 +19,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/rwstderr.cpp b/src/rwstderr.cpp
index 4cccc74..073fb1a 100644
--- a/src/rwstderr.cpp
+++ b/src/rwstderr.cpp
@@ -2,20 +2,27 @@
  *
  * rwstderr.cpp - translation unit used to generate a Win32/64 resource DLL
  *
- * $Id: //stdlib/dev/source/stdlib/rwstderr.cpp#14 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/setlocale.h b/src/setlocale.h
index 621f901..e269b09 100644
--- a/src/setlocale.h
+++ b/src/setlocale.h
@@ -5,20 +5,27 @@
  * This is an internal header file used to implement the C++ Standard
  * Library. It should never be #included directly by a program.
  *
- * $Id: //stdlib/dev/source/stdlib/setlocale.h#5 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/strstream.cpp b/src/strstream.cpp
index c4ec986..97a7516 100644
--- a/src/strstream.cpp
+++ b/src/strstream.cpp
@@ -2,20 +2,27 @@
  *
  * strstream.cpp - Source for the Standard Library string stream classes
  *
- * $Id: //stdlib/dev/source/stdlib/strstream.cpp#36 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/strtol.cpp b/src/strtol.cpp
index bfed93b..5fd37d2 100644
--- a/src/strtol.cpp
+++ b/src/strtol.cpp
@@ -2,20 +2,27 @@
  *
  * strtol.cpp - definitions of __rw_strtol, __rw_strtoul, and other helpers
  *
- * $Id: //stdlib/dev/source/stdlib/strtol.cpp#7 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -145,6 +152,8 @@
 // SHift Left and OR: helper macro used by __rw_strtol
 // to multiply a number by a power of 2 (SHL) and add
 // another number less than the power (OR)
+//
+// IMPORTANT: each argument must be evaluated exactly once
 #undef SHLOR
 #define SHLOR(x, dig)   (((x) << shift) | __rw_digit_map [UChar (dig)])
 
@@ -163,6 +172,8 @@
 
 
 // MULtiply and ADD: helper macro used by __rw_strtol
+//
+// IMPORTANT: each argument must be evaluated exactly once
 #undef MULADD
 #define MULADD(x, dig)   (((x) * base) + __rw_digit_map [UChar (dig)])
 
@@ -199,6 +210,8 @@
 
     unsigned long res = __rw_digit_map [UChar (*nptr)];
 
+    _RWSTD_ASSERT (res < unsigned (base));
+
     if (shift) {
 
         // process subject sequence by shifting
@@ -245,6 +258,8 @@
                         const unsigned digit =
                             __rw_digit_map [UChar (*nptr)];
 
+                        _RWSTD_ASSERT (digit < unsigned (base));
+
                         // check for overflow
                         const unsigned long save = res;
 
@@ -353,6 +368,8 @@
 
                 const unsigned digit = __rw_digit_map [UChar (*nptr)];
 
+                _RWSTD_ASSERT (digit < unsigned (base));
+
                 // check for overflow
                 if (maxres < res)
                     goto overflow;
@@ -395,6 +412,8 @@
 
     unsigned long res = __rw_digit_map [UChar (*nptr)];
 
+    _RWSTD_ASSERT (res < unsigned (base));
+
     if (shift) {
 
         // process subject sequence by shifting
@@ -441,6 +460,8 @@
                         const unsigned digit =
                             __rw_digit_map [UChar (*nptr)];
 
+                        _RWSTD_ASSERT (digit < unsigned (base));
+
                         // check for overflow
                         const unsigned long save = res;
 
@@ -550,6 +571,8 @@
 
                 const unsigned digit = __rw_digit_map [UChar (*nptr)];
 
+                _RWSTD_ASSERT (digit < unsigned (base));
+
                 // check for overflow
                 if (maxres < res)
                     goto overflow;
@@ -592,11 +615,17 @@
 
 #ifdef _RWSTD_LONG_LONG
 
+
+// for convenience
+typedef _RWSTD_LONG_LONG          LLong;
+typedef unsigned _RWSTD_LONG_LONG ULLong;
+
+
    // using LLONG_SIZE instead of ULLONG_MAX in the preprocessor
    // conditional below to work around a gcc 3.2 bug (PR #28595)
 #  if (_RWSTD_LONG_SIZE < _RWSTD_LLONG_SIZE)
 
-unsigned _RWSTD_LONG_LONG
+ULLong
 __rw_strtoull (const char *nptr, int *errptr, int base)
 {
     _RWSTD_ASSERT (0 != nptr);
@@ -612,7 +641,9 @@
         
     const int shift = __rw_base_bits [base];
 
-    unsigned _RWSTD_LONG_LONG res = __rw_digit_map [UChar (*nptr)];
+    ULLong res = __rw_digit_map [UChar (*nptr)];
+
+    _RWSTD_ASSERT (res < unsigned (base));
 
     if (shift) {
 
@@ -657,8 +688,10 @@
                         const unsigned digit =
                             __rw_digit_map [UChar (*nptr)];
 
+                        _RWSTD_ASSERT (digit < unsigned (base));
+
                         // check for overflow
-                        const unsigned _RWSTD_LONG_LONG save = res;
+                        const ULLong save = res;
 
                         res <<= shift;
 
@@ -687,9 +720,9 @@
         // process subject sequence by multiplication
 
         // unroll loop w/o overflow checking
-        if (*++nptr) {
+        if (nptr [1]) {
             // multiply by base and add second digit
-            res = MULADD (res, *nptr);
+            res = MULADD (res, *++nptr);
 
             // digits 3 through 6, inclusive
             MULADD_4_DIGITS_BEGIN (res, nptr);
@@ -703,9 +736,9 @@
             // digits 7 through 10, inclusive
             MULADD_4_DIGITS_BEGIN (res, nptr);
 
-            if (*++nptr) {
+            if (nptr [1]) {
                 // digit 11
-                res = MULADD (res, *nptr);
+                res = MULADD (res, *++nptr);
 
                 if (base < 12) {
 
@@ -749,11 +782,12 @@
             // close brackets
             MULADD_4_DIGITS_END ();
 
-            for (unsigned _RWSTD_LONG_LONG maxres = _RWSTD_ULLONG_MAX / base;
-                 *++nptr; ) {
+            for (ULLong maxres = _RWSTD_ULLONG_MAX / base; *++nptr; ) {
 
                 const unsigned digit = __rw_digit_map [UChar (*nptr)];
 
+                _RWSTD_ASSERT (digit < unsigned (base));
+
                 // check for overflow
                 if (maxres < res)
                     goto overflow;
@@ -778,7 +812,7 @@
 }
 
 
-_RWSTD_LONG_LONG
+LLong
 __rw_strtoll (const char *nptr, int *errptr, int base)
 {
     _RWSTD_ASSERT (0 != nptr);
@@ -794,7 +828,9 @@
 
     const int shift = __rw_base_bits [base];
 
-    unsigned _RWSTD_LONG_LONG res = __rw_digit_map [UChar (*nptr)];
+    ULLong res = __rw_digit_map [UChar (*nptr)];
+
+    _RWSTD_ASSERT (res < unsigned (base));
 
     if (shift) {
 
@@ -839,8 +875,10 @@
                         const unsigned digit =
                             __rw_digit_map [UChar (*nptr)];
 
+                        _RWSTD_ASSERT (digit < unsigned (base));
+
                         // check for overflow
-                        const unsigned _RWSTD_LONG_LONG save = res;
+                        const ULLong save = res;
 
                         res <<= shift;
 
@@ -886,9 +924,9 @@
             // digits 7 through 10, inclusive
             MULADD_4_DIGITS_BEGIN (res, nptr);
 
-            if (*++nptr) {
+            if (nptr [1]) {
                 // digit 11
-                res = MULADD (res, *nptr);
+                res = MULADD (res, *++nptr);
 
                 if (base < 12) {
 
@@ -932,11 +970,12 @@
             // close brackets
             MULADD_4_DIGITS_END ();
 
-            for (unsigned _RWSTD_LONG_LONG maxres =
-                     _RWSTD_ULLONG_MAX / base; *++nptr; ) {
+            for (ULLong maxres = _RWSTD_ULLONG_MAX / base; *++nptr; ) {
 
                 const unsigned digit = __rw_digit_map [UChar (*nptr)];
 
+                _RWSTD_ASSERT (digit < unsigned (base));
+
                 // check for overflow
                 if (maxres < res)
                     goto overflow;
@@ -951,15 +990,13 @@
         }
     }
 
-    typedef unsigned _RWSTD_LONG_LONG ULLong;
-
     if (neg) {
         if (res > ULLong (_RWSTD_LLONG_MIN)) {
             *errptr = ERANGE;
             return _RWSTD_LLONG_MIN;
         }
 
-        return -_RWSTD_STATIC_CAST (_RWSTD_LONG_LONG, res);
+        return -LLong (res);
     }
 
     if (res > ULLong (_RWSTD_LLONG_MAX)) {
diff --git a/src/strtol.h b/src/strtol.h
index 8b4a63c..b553e96 100644
--- a/src/strtol.h
+++ b/src/strtol.h
@@ -2,20 +2,27 @@
  *
  * strtol.h - declarations of __rw_strtol, __rw_strtoul, and other helpers
  *
- * $Id: //stdlib/dev/source/stdlib/strtol.h#2 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_collate.cpp b/src/ti_collate.cpp
index ac5b7c1..70af0ec 100644
--- a/src/ti_collate.cpp
+++ b/src/ti_collate.cpp
@@ -2,20 +2,27 @@
  *
  * ti_collate.cpp - explicit instantiation directives for collate<char>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_collate.cpp#6 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_insert_dbl.cpp b/src/ti_insert_dbl.cpp
index 5f7d704..5cc584d 100644
--- a/src/ti_insert_dbl.cpp
+++ b/src/ti_insert_dbl.cpp
@@ -3,20 +3,27 @@
  * ti_insert_dbl.cpp - explicit instantiation directives for helper
  *                     inserter templates for floating types and char
  *
- * $Id: //stdlib/dev/source/stdlib/ti_insert_dbl.cpp#5 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_insert_int.cpp b/src/ti_insert_int.cpp
index 18fc838..56b8726 100644
--- a/src/ti_insert_int.cpp
+++ b/src/ti_insert_int.cpp
@@ -3,20 +3,27 @@
  * ti_insert_int.cpp - explicit instantiation directives for helper
  *                     inserter templates for integral types and char
  *
- * $Id: //stdlib/dev/source/stdlib/ti_insert_int.cpp#5 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_insert_ptr.cpp b/src/ti_insert_ptr.cpp
index b69ffc3..6b9fe0f 100644
--- a/src/ti_insert_ptr.cpp
+++ b/src/ti_insert_ptr.cpp
@@ -3,20 +3,27 @@
  * ti_insert_pchar.cpp - explicit instantiation directives for helper
  *                       inserter templates for character arrays and char
  *
- * $Id: //stdlib/dev/source/stdlib/ti_insert_ptr.cpp#5 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_ios.cpp b/src/ti_ios.cpp
index 90c20b5..3763b38 100644
--- a/src/ti_ios.cpp
+++ b/src/ti_ios.cpp
@@ -2,20 +2,27 @@
  *
  * ti_ios.cpp - explicit instantiation directives for basic_ios<char>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_ios.cpp#6 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_istream.cpp b/src/ti_istream.cpp
index 1a8c5c6..595a5f6 100644
--- a/src/ti_istream.cpp
+++ b/src/ti_istream.cpp
@@ -3,20 +3,27 @@
  * ti_istream.cpp - explicit instantiation directives
  *                  for basic_istream<char>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_istream.cpp#5 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_messages.cpp b/src/ti_messages.cpp
index 5e84ca6..8f09b36 100644
--- a/src/ti_messages.cpp
+++ b/src/ti_messages.cpp
@@ -2,20 +2,27 @@
  *
  * ti_messages.cpp - explicit instantiation directives for messages<char>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_messages.cpp#7 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_money_get.cpp b/src/ti_money_get.cpp
index 1a69982..24c6208 100644
--- a/src/ti_money_get.cpp
+++ b/src/ti_money_get.cpp
@@ -2,20 +2,27 @@
  *
  * ti_money_get.cpp - explicit instantiation directives for money_get<char>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_money_get.cpp#7 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_money_put.cpp b/src/ti_money_put.cpp
index a7e8fc3..a46ec12 100644
--- a/src/ti_money_put.cpp
+++ b/src/ti_money_put.cpp
@@ -2,20 +2,27 @@
  *
  * ti_money_put.cpp - explicit instantiation directives for money_put<char>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_money_put.cpp#7 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_moneypunct.cpp b/src/ti_moneypunct.cpp
index 9d2b33a..1f02897 100644
--- a/src/ti_moneypunct.cpp
+++ b/src/ti_moneypunct.cpp
@@ -3,20 +3,27 @@
  * ti_moneypunct.cpp - explicit instantiation directives
  *                     for moneypunct<char, ...>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_moneypunct.cpp#7 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_num_get.cpp b/src/ti_num_get.cpp
index 8a06c5a..2105dae 100644
--- a/src/ti_num_get.cpp
+++ b/src/ti_num_get.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_num_put.cpp b/src/ti_num_put.cpp
index 7c9c144..53bf9fe 100644
--- a/src/ti_num_put.cpp
+++ b/src/ti_num_put.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_numpunct.cpp b/src/ti_numpunct.cpp
index bd8ecc1..85ce67c 100644
--- a/src/ti_numpunct.cpp
+++ b/src/ti_numpunct.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_ostream.cpp b/src/ti_ostream.cpp
index 9f97146..2471762 100644
--- a/src/ti_ostream.cpp
+++ b/src/ti_ostream.cpp
@@ -3,20 +3,27 @@
  * ti_ostream.cpp - explicit instantiation directives
  *                  for basic_ostream<char>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_ostream.cpp#5 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_streambuf.cpp b/src/ti_streambuf.cpp
index b688e1a..aecc4ee 100644
--- a/src/ti_streambuf.cpp
+++ b/src/ti_streambuf.cpp
@@ -3,20 +3,27 @@
  * ti_streambuf.cpp - explicit instantiation directives
  *                    for basic_streambuf<char>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_streambuf.cpp#5 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_string.cpp b/src/ti_string.cpp
index 94341d5..d1ce17f 100644
--- a/src/ti_string.cpp
+++ b/src/ti_string.cpp
@@ -2,20 +2,27 @@
  *
  * ti_string.cpp - explicit instantiation directives for basic_string<char>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_string.cpp#6 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_stringbuf.cpp b/src/ti_stringbuf.cpp
index 689fc10..5f89d24 100644
--- a/src/ti_stringbuf.cpp
+++ b/src/ti_stringbuf.cpp
@@ -3,20 +3,27 @@
  * ti_stringbuf.cpp - explicit instantiation directives
  *                    for basic_stringbuf<char>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_stringbuf.cpp#6 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_time_get.cpp b/src/ti_time_get.cpp
index adf3142..4f1193c 100644
--- a/src/ti_time_get.cpp
+++ b/src/ti_time_get.cpp
@@ -2,20 +2,27 @@
  *
  * ti_time_get.cpp - explicit instantiation directives for time_get<char>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_time_get.cpp#7 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_time_put.cpp b/src/ti_time_put.cpp
index e865988..42151d3 100644
--- a/src/ti_time_put.cpp
+++ b/src/ti_time_put.cpp
@@ -2,20 +2,27 @@
  *
  * ti_time_put.cpp - explicit instantiation directives for time_put<char>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_time_put.cpp#7 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_wcollate.cpp b/src/ti_wcollate.cpp
index 3b8b8ce..1fcf803 100644
--- a/src/ti_wcollate.cpp
+++ b/src/ti_wcollate.cpp
@@ -2,20 +2,27 @@
  *
  * ti_wcollate.cpp - explicit instantiation directives for collate<wchar_t>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_wcollate.cpp#4 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_winsert_dbl.cpp b/src/ti_winsert_dbl.cpp
index 96be5d4..2e6aa21 100644
--- a/src/ti_winsert_dbl.cpp
+++ b/src/ti_winsert_dbl.cpp
@@ -3,20 +3,27 @@
  * ti_winsert_dbl.cpp - explicit instantiation directives for helper
  *                      inserter templates for floating types and char
  *
- * $Id: //stdlib/dev/source/stdlib/ti_winsert_dbl.cpp#4 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_winsert_int.cpp b/src/ti_winsert_int.cpp
index 2f9ed0a..64b076b 100644
--- a/src/ti_winsert_int.cpp
+++ b/src/ti_winsert_int.cpp
@@ -3,20 +3,27 @@
  * ti_winsert_int.cpp - explicit instantiation directives for helper
  *                      inserter templates for integral types and wchar_t
  *
- * $Id: //stdlib/dev/source/stdlib/ti_winsert_int.cpp#4 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_winsert_ptr.cpp b/src/ti_winsert_ptr.cpp
index c706be5..39012ff 100644
--- a/src/ti_winsert_ptr.cpp
+++ b/src/ti_winsert_ptr.cpp
@@ -3,20 +3,27 @@
  * ti_winsert_pchar.cpp - explicit instantiation directives for helper
  *                        inserter templates for character arrays and wchar_t
  *
- * $Id: //stdlib/dev/source/stdlib/ti_winsert_ptr.cpp#4 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_wios.cpp b/src/ti_wios.cpp
index 170aa29..aa5cf7e 100644
--- a/src/ti_wios.cpp
+++ b/src/ti_wios.cpp
@@ -2,20 +2,27 @@
  *
  * ti_wios.cpp - explicit instantiation directives for basic_ios<char>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_wios.cpp#5 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_wistream.cpp b/src/ti_wistream.cpp
index 80fa71a..dcf3a74 100644
--- a/src/ti_wistream.cpp
+++ b/src/ti_wistream.cpp
@@ -3,20 +3,27 @@
  * ti_wistream.cpp - explicit instantiation directives
  *                   for basic_istream<wchar_t>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_wistream.cpp#4 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_wmessages.cpp b/src/ti_wmessages.cpp
index db715fe..913b53f 100644
--- a/src/ti_wmessages.cpp
+++ b/src/ti_wmessages.cpp
@@ -3,20 +3,27 @@
  * ti_wmessages.cpp - explicit instantiation directives
  *                    for messages<wchar_t>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_wmessages.cpp#6 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_wmoney_get.cpp b/src/ti_wmoney_get.cpp
index 72c5224..6b4c2bc 100644
--- a/src/ti_wmoney_get.cpp
+++ b/src/ti_wmoney_get.cpp
@@ -3,20 +3,27 @@
  * ti_wmoney_get.cpp - explicit instantiation directives
  *                     for money_get<wchar_t>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_wmoney_get.cpp#6 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_wmoney_put.cpp b/src/ti_wmoney_put.cpp
index 5fa4780..437a460 100644
--- a/src/ti_wmoney_put.cpp
+++ b/src/ti_wmoney_put.cpp
@@ -3,20 +3,27 @@
  * ti_wmoney_put.cpp - explicit instantiation directives
  *                     for money_put<wchar_t>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_wmoney_put.cpp#6 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_wmoneypunct.cpp b/src/ti_wmoneypunct.cpp
index fa23cac..a8c4a84 100644
--- a/src/ti_wmoneypunct.cpp
+++ b/src/ti_wmoneypunct.cpp
@@ -3,20 +3,27 @@
  * ti_wmoneypunct.cpp - explicit instantiation directives
  *                      for moneypunct<wchar_t, ...>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_wmoneypunct.cpp#5 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_wnum_get.cpp b/src/ti_wnum_get.cpp
index 18b2e11..3ecc4ba 100644
--- a/src/ti_wnum_get.cpp
+++ b/src/ti_wnum_get.cpp
@@ -2,20 +2,27 @@
  *
  * ti_wnum_get.cpp - explicit instantiation directives for num_get<wchar_t>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_wnum_get.cpp#8 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_wnum_put.cpp b/src/ti_wnum_put.cpp
index a18b2cf..2c373c1 100644
--- a/src/ti_wnum_put.cpp
+++ b/src/ti_wnum_put.cpp
@@ -2,20 +2,27 @@
  *
  * ti_wnum_put.cpp - explicit instantiation directives for num_put<wchar_t>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_wnum_put.cpp#6 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_wnumpunct.cpp b/src/ti_wnumpunct.cpp
index c6650f2..6a15659 100644
--- a/src/ti_wnumpunct.cpp
+++ b/src/ti_wnumpunct.cpp
@@ -2,20 +2,27 @@
  *
  * ti_wnumpunct.cpp - explicit instantiation directives for numpunct<wchar_t>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_wnumpunct.cpp#8 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_wostream.cpp b/src/ti_wostream.cpp
index a581032..1bd6a63 100644
--- a/src/ti_wostream.cpp
+++ b/src/ti_wostream.cpp
@@ -3,20 +3,27 @@
  * ti_wostream.cpp - explicit instantiation directives
  *                   for basic_ostream<wchar_t>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_wostream.cpp#4 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_wstreambuf.cpp b/src/ti_wstreambuf.cpp
index 14ab142..af8d94f 100644
--- a/src/ti_wstreambuf.cpp
+++ b/src/ti_wstreambuf.cpp
@@ -3,20 +3,27 @@
  * ti_wstreambuf.cpp - explicit instantiation directives
  *                     for basic_streambuf<wchar_t>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_wstreambuf.cpp#4 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_wstring.cpp b/src/ti_wstring.cpp
index eb04ea8..5a11000 100644
--- a/src/ti_wstring.cpp
+++ b/src/ti_wstring.cpp
@@ -3,20 +3,27 @@
  * ti_wstring.cpp - explicit instantiation directives
  *                  for basic_string<wchar_t>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_wstring.cpp#4 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_wstringbuf.cpp b/src/ti_wstringbuf.cpp
index 9c4af5e..54c6f26 100644
--- a/src/ti_wstringbuf.cpp
+++ b/src/ti_wstringbuf.cpp
@@ -3,20 +3,27 @@
  * ti_wstringbuf.cpp - explicit instantiation directives
  *                     for basic_stringbuf<wchar_t>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_wstringbuf.cpp#5 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_wtime_get.cpp b/src/ti_wtime_get.cpp
index 811b55f..0eab186 100644
--- a/src/ti_wtime_get.cpp
+++ b/src/ti_wtime_get.cpp
@@ -2,20 +2,27 @@
  *
  * ti_wtime_get.cpp - explicit instantiation directives for time_get<wchar_t>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_wtime_get.cpp#6 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/ti_wtime_put.cpp b/src/ti_wtime_put.cpp
index 391e04d..b7cb301 100644
--- a/src/ti_wtime_put.cpp
+++ b/src/ti_wtime_put.cpp
@@ -2,20 +2,27 @@
  *
  * ti_wtime_put.cpp - explicit instantiation directives for time_put<wchar_t>
  *
- * $Id: //stdlib/dev/source/stdlib/ti_wtime_put.cpp#6 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/time_get.cpp b/src/time_get.cpp
index 05ca145..e1b5a02 100644
--- a/src/time_get.cpp
+++ b/src/time_get.cpp
@@ -2,20 +2,27 @@
  *
  * time_get.cpp
  *
- * $Id: //stdlib/dev/source/stdlib/time_get.cpp#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/typeinfo.cpp b/src/typeinfo.cpp
index 6c7c4f6..a3310b7 100644
--- a/src/typeinfo.cpp
+++ b/src/typeinfo.cpp
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -92,6 +99,13 @@
 
 const char* type_info::name () const
 {
+    // silence warning: _C_name declared but never used
+#ifdef _RWSTD_NO_STD_TYPE_INFO
+    _RWSTD_UNUSED (::_C_name);
+#else
+    _RWSTD_UNUSED (std::_C_name);
+#endif   // _RWSTD_NO_STD_TYPE_INFO
+
     return _C_name;
 }
 
diff --git a/src/use_facet.h b/src/use_facet.h
index a508087..2d70e29 100644
--- a/src/use_facet.h
+++ b/src/use_facet.h
@@ -5,20 +5,27 @@
  * This is an internal header file used to implement the C++ Standard
  * Library. It should never be #included directly by a program.
  *
- * $Id: //stdlib/dev/source/stdlib/use_facet.h#11 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
  
diff --git a/src/vecbool.cpp b/src/vecbool.cpp
index 6287be3..9b36a02 100644
--- a/src/vecbool.cpp
+++ b/src/vecbool.cpp
@@ -3,7 +3,7 @@
  * vecbool.cpp - source for the C++ Standard Library vector<bool>
  *               specialization
  *
- * $Id: //stdlib/dev/source/stdlib/vecbool.cpp#17 $
+ * $Id$
  *
  ***************************************************************************
  *
@@ -20,16 +20,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/version.cpp b/src/version.cpp
index 063caa9..4ac0749 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -2,20 +2,27 @@
  *
  * version.cpp - library versioning information
  *
- * $Id: //stdlib/dev/source/stdlib/version.cpp#4 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -37,9 +44,9 @@
 
 
 #ifdef __HP_aCC
-#  pragma COPYRIGHT      "Quovadx, Inc"
-#  pragma COPYRIGHT_DATE "1994-2004"
+#  pragma COPYRIGHT      "Rogue Wave Software"
+#  pragma COPYRIGHT_DATE "1994-2007"
 #  pragma VERSIONID      _RWSTD_VER_STR
 #elif defined (__IBMCPP__)
-#  pragma comment (copyright, "(C) 1994-2004, Quovadx, Inc")
+#  pragma comment (copyright, "(C) 1994-2007, Rogue Wave Software")
 #endif   // __HP_aCC
diff --git a/src/wctype.cpp b/src/wctype.cpp
index 39fdb24..aab2f5c 100644
--- a/src/wctype.cpp
+++ b/src/wctype.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2001-2005 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -421,6 +428,17 @@
 }
 
 
+ctype<wchar_t>::char_type
+ctype<wchar_t>::
+do_widen (char c) const
+{
+    // explicitly specifying template argument list to work around
+    // HP aCC 3 and 5 bug (STDCXX-445)
+    return _RWSTD_CONST_CAST (ctype<wchar_t>*, this)->
+        _C_wide_tab [_UChar (c)] = char_type (_UChar (c));
+}
+
+
 const char*
 ctype<wchar_t>::
 do_widen (const char *lo, const char *hi, char_type *dest) const
@@ -435,6 +453,24 @@
 }
 
 
+ctype<wchar_t>::char_type
+ctype<wchar_t>::
+do_toupper (char_type c) const
+{
+    return _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, c) < _C_tab_size ?
+        _C_upper_tab [_UChar (c)] : c;
+}
+
+
+ctype<wchar_t>::char_type
+ctype<wchar_t>::
+do_tolower (char_type c) const
+{
+    return _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, c) < _C_tab_size ?
+        _C_lower_tab [_UChar (c)] : c;
+}
+
+
 const ctype<wchar_t>::char_type*
 ctype<wchar_t>::
 do_toupper (char_type *lo, const char_type *hi) const
@@ -494,6 +530,15 @@
 }
 
 
+char
+ctype<wchar_t>::
+do_narrow (char_type c, char dfault) const
+{
+    return _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, c) <= _RWSTD_SCHAR_MAX ?
+        _RWSTD_STATIC_CAST (char, c) : dfault;
+}
+
+
 const ctype<wchar_t>::char_type*
 ctype<wchar_t>::
 do_narrow (const char_type *lo, const char_type *hi,
diff --git a/tests/algorithms/25.random.shuffle.cpp b/tests/algorithms/25.random.shuffle.cpp
index 73db63a..fc10b77 100644
--- a/tests/algorithms/25.random.shuffle.cpp
+++ b/tests/algorithms/25.random.shuffle.cpp
@@ -70,22 +70,8 @@
 private:
     const DifferenceType val_;
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     template <class T>
     Convertible (T);
-
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
-    Convertible (unsigned short);
-    Convertible (unsigned);
-    Convertible (unsigned long);
-
-#  ifdef _RWSTD_LONG_LONG
-    Convertible (unsigned _RWSTD_LONG_LONG);
-#  endif   // _RWSTD_LONG_LONG
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
 };
 
 // detect assumptions made by the algorithm about the return value
@@ -126,22 +112,9 @@
 
 private:
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     template <class T>
     void operator() (T) /* non-const */;
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
-    void operator() (unsigned short);
-    void operator() (unsigned);
-    void operator() (unsigned long);
-
-#  ifdef _RWSTD_LONG_LONG
-    void operator() (unsigned _RWSTD_LONG_LONG);
-#  endif   // _RWSTD_LONG_LONG
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     static DifferenceType gen_;
 };
 
diff --git a/tests/containers/23.deque.iterators.cpp b/tests/containers/23.deque.iterators.cpp
index 2f219b6..3f88b61 100644
--- a/tests/containers/23.deque.iterators.cpp
+++ b/tests/containers/23.deque.iterators.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/tests/containers/23.deque.modifiers.cpp b/tests/containers/23.deque.modifiers.cpp
index 7460c74..155917a 100644
--- a/tests/containers/23.deque.modifiers.cpp
+++ b/tests/containers/23.deque.modifiers.cpp
@@ -1249,9 +1249,8 @@
 
 /**************************************************************************/
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-#  ifndef _RWSTD_NO_EXPLICIT
-#    if !defined (_MSC_VER) || _MSC_VER > 1200
+#ifndef _RWSTD_NO_EXPLICIT
+#  if !defined (_MSC_VER) || _MSC_VER > 1200
 
 struct DR_438
 {
@@ -1266,16 +1265,13 @@
 
 bool DR_438::cast_used;
 
-#    else   // if MSVC <= 6.0
+#  else   // if MSVC <= 6.0
        // avoid an MSVC 6.0 ICE on this code
-#      define NO_DR_438_TEST "this version of MSVC is too broken"
-#    endif   // !MSVC || MSVC > 6.0
-#  else
-#    define NO_DR_438_TEST "_RWSTD_NO_EXPLICIT #defined"
-#  endif   // _RWSTD_NO_EXPLICIT
-#  else
-#    define NO_DR_438_TEST   "_RWSTD_NO_INLINE_MEMBER_TEMPLATES #defined"
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#    define NO_DR_438_TEST "this version of MSVC is too broken"
+#  endif   // !MSVC || MSVC > 6.0
+#else
+#  define NO_DR_438_TEST "_RWSTD_NO_EXPLICIT #defined"
+#endif   // _RWSTD_NO_EXPLICIT
 
 
 void test_dr_438 ()
diff --git a/tests/containers/23.vector.cons.cpp b/tests/containers/23.vector.cons.cpp
index 72a7834..addb305 100644
--- a/tests/containers/23.vector.cons.cpp
+++ b/tests/containers/23.vector.cons.cpp
@@ -241,11 +241,10 @@
 
     MEMFUN (void, insert, (Iterator, SizeType, const T&));
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
     // member function template insert
     MEMFUN (void, insert, (Iterator, InputIter<T>, InputIter<T>));
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // !defined (_MSC_VER) || _MSC_VER >= 1300
 
     MEMFUN (Iterator, erase, (Iterator));
     MEMFUN (Iterator, erase, (Iterator, Iterator));
@@ -603,8 +602,7 @@
         }
     }
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     if (1) {
 
@@ -669,7 +667,7 @@
         alloc.deallocate (vals, rw_opt_nloops);
     }
 
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // !defined (_MSC_VER) || _MSC_VER >= 1300
 
 }
 
diff --git a/tests/containers/23.vector.modifiers.cpp b/tests/containers/23.vector.modifiers.cpp
index e8a9b65..2b231e1 100644
--- a/tests/containers/23.vector.modifiers.cpp
+++ b/tests/containers/23.vector.modifiers.cpp
@@ -1002,8 +1002,7 @@
     
     }
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     v0.clear ();
     for (i = 0; i < rw_opt_nloops; i++) { 
@@ -1092,7 +1091,7 @@
                    X_count - UserClass::count_ , num_destroy);
             
     }
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES          
+#endif   // !defined (_MSC_VER) || _MSC_VER >= 1300          
     
     rw_assert (success, 0, __LINE__, "vector<UserClass>::insert()");
     rw_assert (success, 0, __LINE__, "vector<UserClass>::erase()");
diff --git a/tests/diagnostics/19.cerrno.cpp b/tests/diagnostics/19.cerrno.cpp
index 6c00ca9..785be97 100644
--- a/tests/diagnostics/19.cerrno.cpp
+++ b/tests/diagnostics/19.cerrno.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/tests/include/alg_test.h b/tests/include/alg_test.h
index 29a162b..478a021 100644
--- a/tests/include/alg_test.h
+++ b/tests/include/alg_test.h
@@ -409,56 +409,17 @@
     };
 
     // InputIterators are not default constructible
-    InputIter (const value_type *cur,
-               const value_type *beg,
-               const value_type *end)
-        : ptr_ (new Shared (cur, beg, end)), cur_ (cur) { }
+    InputIter (const value_type* /* current */,
+               const value_type* /* begin */,
+               const value_type* /* end */);
 
-    InputIter (const InputIter &rhs)
-        : ptr_ (rhs.ptr_), cur_ (rhs.cur_) {
-        RW_ASSERT (0 != ptr_);
-        ++ptr_->ref_;
-    }
+    InputIter (const InputIter&);
 
-    ~InputIter () {
-        RW_ASSERT (0 != ptr_);
+    ~InputIter ();
 
-        if (0 == --ptr_->ref_)   // decrement the reference count
-            delete ptr_;
-        ptr_ = 0;
-        cur_ = 0;
-    }
+    InputIter& operator= (const InputIter&);
 
-    InputIter& operator= (const InputIter &rhs) {
-        RW_ASSERT (rhs == rhs);   // assert `rhs' is valid
-
-        RW_ASSERT (0 != ptr_);
-        if (0 == --ptr_->ref_)
-            delete ptr_;
-
-        ptr_ = rhs.ptr_;
-
-        RW_ASSERT (0 != ptr_);
-        ++ptr_->ref_;
-
-        cur_ = rhs.cur_;
-
-        return *this;
-    }
-
-    bool operator== (const InputIter &rhs) const {
-        // assert that both arguments are in the domain of operator==()
-        // i.e., that no copy of *this or `rhs' has been incremented
-        // and that no copy passed through this value of the iterator
-
-        RW_ASSERT (0 != ptr_);
-        RW_ASSERT (cur_ == ptr_->cur_);
-
-        RW_ASSERT (0 != rhs.ptr_);
-        RW_ASSERT (rhs.cur_ == rhs.ptr_->cur_);
-
-        return cur_ == rhs.cur_;
-    }
+    bool operator== (const InputIter&) const;
 
     bool operator!= (const InputIter &rhs) const {
         return !(*this == rhs);
@@ -493,6 +454,84 @@
     const value_type *cur_;   // past-the-end
 };
 
+
+// "large" member functions outlined to prevent gcc -Winline warnings
+
+template <class T>
+InputIter<T>::
+InputIter (const value_type *cur,
+           const value_type *beg,
+           const value_type *end)
+    : ptr_ (new Shared (cur, beg, end)), cur_ (cur)
+{
+    // empty
+}
+
+
+template <class T>
+InputIter<T>::
+InputIter (const InputIter &rhs)
+    : ptr_ (rhs.ptr_), cur_ (rhs.cur_)
+{
+    RW_ASSERT (0 != ptr_);
+    ++ptr_->ref_;
+}
+
+
+template <class T>
+InputIter<T>::
+~InputIter ()
+{
+    RW_ASSERT (0 != ptr_);
+
+    if (0 == --ptr_->ref_)   // decrement the reference count
+        delete ptr_;
+
+    ptr_ = 0;
+    cur_ = 0;
+}
+
+
+template <class T>
+InputIter<T>&
+InputIter<T>::
+operator= (const InputIter &rhs)
+{
+    RW_ASSERT (rhs == rhs);   // assert `rhs' is valid
+
+    RW_ASSERT (0 != ptr_);
+    if (0 == --ptr_->ref_)
+        delete ptr_;
+
+    ptr_ = rhs.ptr_;
+
+    RW_ASSERT (0 != ptr_);
+    ++ptr_->ref_;
+
+    cur_ = rhs.cur_;
+
+    return *this;
+}
+
+
+template <class T>
+bool
+InputIter<T>::
+operator== (const InputIter &rhs) const
+{
+    // assert that both arguments are in the domain of operator==()
+    // i.e., that no copy of *this or `rhs' has been incremented
+    // and that no copy passed through this value of the iterator
+
+    RW_ASSERT (0 != ptr_);
+    RW_ASSERT (cur_ == ptr_->cur_);
+
+    RW_ASSERT (0 != rhs.ptr_);
+    RW_ASSERT (rhs.cur_ == rhs.ptr_->cur_);
+
+    return cur_ == rhs.cur_;
+}
+
 /**************************************************************************/
 
 // satisfies the requirements in 24.1.2 [lib.output.iterators]
@@ -567,24 +606,9 @@
         ++ptr_->ref_;   // increment the reference count
     }
 
-    ~OutputIter () {
-        if (0 == --ptr_->ref_)   // decrement the reference count
-            delete ptr_;
-        ptr_ = 0;
-        cur_ = 0;
-    }
+    ~OutputIter ();
 
-    OutputIter& operator= (const OutputIter &rhs) {
-        if (0 == --ptr_->ref_)
-            delete ptr_;
-
-        ptr_ = rhs.ptr_;
-        ++ptr_->ref_;
-
-        cur_ = rhs.cur_;
-
-        return *this;
-    }
+    OutputIter& operator= (const OutputIter&);
 
     void operator= (const value_type &rhs) const {
         **this = rhs;
@@ -620,6 +644,41 @@
     pointer  cur_;
 };
 
+
+// "large" member functions outlined to prevent gcc -Winline warnings
+
+template <class T>
+OutputIter<T>::
+~OutputIter ()
+{
+    RW_ASSERT (0 != ptr_);
+
+    if (0 == --ptr_->ref_)   // decrement the reference count
+        delete ptr_;
+
+    ptr_ = 0;
+    cur_ = 0;
+}
+
+
+template <class T>
+OutputIter<T>&
+OutputIter<T>::
+operator= (const OutputIter &rhs)
+{
+    RW_ASSERT (0 != ptr_);
+
+    if (0 == --ptr_->ref_)
+        delete ptr_;
+
+    ptr_ = rhs.ptr_;
+    ++ptr_->ref_;
+
+    cur_ = rhs.cur_;
+
+    return *this;
+}
+
 /**************************************************************************/
 
 // satisfies the requirements in 24.1.3 [lib.forward.iterators]
diff --git a/tests/include/cmdopt.h b/tests/include/cmdopt.h
index 15ea9d7..f2aaa21 100644
--- a/tests/include/cmdopt.h
+++ b/tests/include/cmdopt.h
@@ -7,16 +7,23 @@
  *
  ************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/tests/include/environ.h b/tests/include/environ.h
index bf09e8c..b1caac6 100644
--- a/tests/include/environ.h
+++ b/tests/include/environ.h
@@ -2,21 +2,28 @@
  *
  * environ.h - declarations of testsuite helpers
  *
- * $Id:$
+ * $Id$
  *
  ************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ * 
  **************************************************************************/
 
 #ifndef RW_ENVIRON_H_INCLUDED
diff --git a/tests/include/rw_alarm.h b/tests/include/rw_alarm.h
index 60a6811..98a1669 100644
--- a/tests/include/rw_alarm.h
+++ b/tests/include/rw_alarm.h
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/tests/include/rw_allocator.h b/tests/include/rw_allocator.h
index b5e5388..bbe2783 100644
--- a/tests/include/rw_allocator.h
+++ b/tests/include/rw_allocator.h
@@ -6,22 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright 2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
- * Copyright 2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -170,8 +171,6 @@
         pal_->funcall (pal_->m_cpy_ctor);
     }
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     template <class U>
     UserAlloc (const UserAlloc<U> &rhs) _THROWS (())
         : pal_ (rhs.pal_) {
@@ -188,8 +187,6 @@
     template <class U>
     struct rebind { typedef UserAlloc<U> other; };
 
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     void operator= (const UserAlloc &rhs) {
         pal_->funcall (pal_->m_cpy_assign, rhs.pal_);
         pal_ = rhs.pal_;
diff --git a/tests/include/rw_locale.h b/tests/include/rw_locale.h
index 8e77286..581c7d4 100644
--- a/tests/include/rw_locale.h
+++ b/tests/include/rw_locale.h
@@ -2,7 +2,7 @@
  *
  * localedef.h - declarations of locale testsuite helpers
  *
- * $Id:$
+ * $Id$
  *
  ************************************************************************
  *
@@ -64,4 +64,32 @@
 rw_localedef (const char*, const char*, const char*, const char*);
 
 
+// an array of multibyte characters 1 to MB_LEN_MAX bytes in length
+typedef char
+rw_mbchar_array_t [_RWSTD_MB_LEN_MAX][_RWSTD_MB_LEN_MAX];
+
+// fills consecutive elements of the `mb_chars' array with multibyte
+// characters between 1 and MB_CUR_MAX bytes long for the currently
+// set locale
+// returns the number of elements populated (normally, MB_CUR_MAX)
+_TEST_EXPORT _RWSTD_SIZE_T
+rw_get_mb_chars (rw_mbchar_array_t /* mb_chars */);
+
+
+// finds the multibyte locale with the largest MB_CUR_MAX value and
+// fills consecutive elements of the `mb_chars' array with multibyte
+// characters between 1 and MB_CUR_MAX bytes long for such a locale
+_TEST_EXPORT const char*
+rw_find_mb_locale (_RWSTD_SIZE_T* /* mb_cur_max */,
+                   rw_mbchar_array_t /* mb_chars */);
+
+// invokes localedef with charmap and locale def to create a locale database 
+// in a directory specified by the RWSTD_LOCALE_ROOT environment
+// variable, if it is defined, otherwise in the current working
+// directory
+// returns the name of the locale
+_TEST_EXPORT const char*
+rw_create_locale (const char *charmap, const char *locale);
+
+
 #endif   // RW_LOCALE_H_INCLUDED
diff --git a/tests/include/rw_printf.h b/tests/include/rw_printf.h
index 6ea1f43..9e65387 100644
--- a/tests/include/rw_printf.h
+++ b/tests/include/rw_printf.h
@@ -6,16 +6,23 @@
  *
  ************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/tests/include/rw_thread.h b/tests/include/rw_thread.h
index b7c01a2..19599e2 100644
--- a/tests/include/rw_thread.h
+++ b/tests/include/rw_thread.h
@@ -6,16 +6,23 @@
  *
  ************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2005-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -31,12 +38,13 @@
 
 struct rw_thread_t
 {
-    long  threadno;
-    long  id;
-    void* handle;
+    long  threadno;   // 0-based unique thread number
+    long  id;         // thread id
+    void* handle;     // thread handle
 };
 
 
+// same as POSIX pthread_create()
 _TEST_EXPORT int
 rw_thread_create (rw_thread_t*,
                   rw_thread_attr_t*,
@@ -44,15 +52,24 @@
                   void*);
 
 
+// same as POSIX pthread_join()
 _TEST_EXPORT int
 rw_thread_join (rw_thread_t, void**);
 
 
+// create a pool of nthreads, passing each a successive element
+// of argarray as argument (if non-null) and filling the tidarray
+// array with their id's; if tidarray is null, waits for all
+// threads to join and fills the aragarray with the result
+// returned from each thread
+// returns 0 on success, or a non-zero value indicating the thread
+// number that failed to create on error
 _TEST_EXPORT int
-rw_thread_pool (rw_thread_t*, _RWSTD_SIZE_T,
-                rw_thread_attr_t*,
-                void* (*)(void*),
-                void**);
+rw_thread_pool (rw_thread_t*      /* tidarray */,
+                _RWSTD_SIZE_T     /* nthreads */,
+                rw_thread_attr_t* /* attr */,
+                void* (*)(void*)  /* thr_proc */,
+                void**            /* argarray */);
 
 }   // extern "C"
 
diff --git a/tests/include/valcmp.h b/tests/include/valcmp.h
index d4684ec..4c022f0 100644
--- a/tests/include/valcmp.h
+++ b/tests/include/valcmp.h
@@ -6,16 +6,23 @@
  *
  ************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/tests/iostream/27.objects.cpp b/tests/iostream/27.objects.cpp
index 186808e..277ec82 100644
--- a/tests/iostream/27.objects.cpp
+++ b/tests/iostream/27.objects.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/tests/localization/22.locale.codecvt.length.cpp b/tests/localization/22.locale.codecvt.length.cpp
index bfb198d..2ab7aba 100644
--- a/tests/localization/22.locale.codecvt.length.cpp
+++ b/tests/localization/22.locale.codecvt.length.cpp
@@ -43,7 +43,7 @@
 #include <cmdopt.h>      // for rw_enabled()
 #include <driver.h>      // for rw_test()
 #include <file.h>        // for rw_fwrite()
-#include <rw_locale.h>   // for rw_localedef()
+#include <rw_locale.h>   // for rw_localedef(), rw_find_mb_locale()
 #include <rw_printf.h>   // for rw_printf()
 
 /****************************************************************************/
@@ -116,185 +116,6 @@
     return locname;
 }
 
-
-// finds a multibyte character that is `bytes' long if `bytes' is less
-// than or equal to MB_CUR_MAX, or the longest multibyte sequence in
-// the current locale
-const char* get_mb_char (char *buf, std::size_t bytes)
-{
-    _RWSTD_ASSERT (0 != buf);
-
-    *buf = '\0';
-
-    if (0 == bytes)
-        return buf;
-
-    const bool exact = bytes <= std::size_t (MB_CUR_MAX);
-
-    if (!exact)
-        bytes = MB_CUR_MAX;
-
-    wchar_t wc;
-
-    // search the first 64K characters sequentially
-    for (wc = wchar_t (1); wc != wchar_t (0xffff); ++wc) {
-
-        if (   int (bytes) == std::wctomb (buf, wc)
-            && int (bytes) == std::mblen (buf, bytes)) {
-            // NUL-terminate the multibyte character of the requested length
-            buf [bytes] = '\0';
-            break;
-        }
-
-        *buf = '\0';
-    }
-
-#if 2 < _RWSTD_WCHAR_T_SIZE
-
-    // if a multibyte character of the requested size is not found
-    // in the low 64K range, try to find one using a random search
-    if (wchar_t (0xffff) == wc) {
-
-        // iterate only so many times to prevent an infinite loop
-        // in case when MB_CUR_MAX is greater than the longest
-        // multibyte character
-        for (int i = 0; i != 0x100000; ++i) {
-
-            wc = wchar_t (std::rand ());
-
-            if (RAND_MAX < 0x10000) {
-                wc <<= 16;
-                wc |=  wchar_t (std::rand ());
-            }
-
-            if (   int (bytes) == std::wctomb (buf, wc)
-                && int (bytes) == std::mblen (buf, bytes)) {
-                // NUL-terminate the multibyte character
-                buf [bytes] = '\0';
-                break;
-            }
-
-            *buf = '\0';
-        }
-    }
-
-#endif   // 2 < _RWSTD_WCHAR_SIZE
-
-    // return 0 on failure to find a sequence exactly `bytes' long
-    return !exact || bytes == std::strlen (buf) ? buf : 0;
-}
-
-
-typedef char mb_char_array_t [MB_LEN_MAX][MB_LEN_MAX];
-
-// fills consecutive elemenets of the `mb_chars' array with multibyte
-// characters between 1 and MB_CUR_MAX bytes long for the given locale
-// returns the number of elements populated (normally, MB_CUR_MAX)
-std::size_t get_mb_chars (mb_char_array_t mb_chars)
-{
-    _RWSTD_ASSERT (0 != mb_chars);
-
-    const char* mbc = get_mb_char (mb_chars [0], std::size_t (-1));
-
-    if (!mbc) {
-        rw_fprintf (rw_stderr, "*** failed to find any multibyte characters "
-                    "in locale \"%s\" with MB_CUR_MAX = %u\n",
-                    std::setlocale (LC_CTYPE, 0), MB_CUR_MAX);
-        return 0;
-    }
-
-    std::size_t mb_cur_max = std::strlen (mbc);
-
-    if (MB_LEN_MAX < mb_cur_max)
-        mb_cur_max = MB_LEN_MAX;
-
-    // fill each element of `mb_chars' with a multibyte character
-    // of the corresponding length
-    for (std::size_t i = mb_cur_max; i; --i) {
-
-        // try to generate a multibyte character `i' bytes long
-        mbc = get_mb_char (mb_chars [i - 1], i);
-
-        if (0 == mbc) {
-            if (i < mb_cur_max) {
-                rw_fprintf (rw_stderr, "*** failed to find %u-byte characters "
-                            "in locale \"%s\" with MB_CUR_MAX = %u\n",
-                            i + 1, std::setlocale (LC_CTYPE, 0), MB_CUR_MAX);
-                mb_cur_max = 0;
-                break;
-            }
-            --mb_cur_max;
-        }
-    }
-
-    return mb_cur_max;
-}
-
-
-// finds the multibyte locale with the largest MB_CUR_MAX value and
-// fills consecutive elemenets of the `mb_chars' array with multibyte
-// characters between 1 and MB_CUR_MAX bytes long for such a locale
-const char* find_mb_locale (std::size_t *mb_cur_max, mb_char_array_t mb_chars)
-{
-    _RWSTD_ASSERT (0 != mb_cur_max);
-    _RWSTD_ASSERT (0 != mb_chars);
-
-    if (2 > MB_LEN_MAX) {
-        rw_fprintf (rw_stderr, "MB_LEN_MAX = %d, giving up\n", MB_LEN_MAX);
-        return 0;
-    }
-
-    static const char *mb_locale_name;
-
-    char saved_locale_name [1024];
-    std::strcpy (saved_locale_name, std::setlocale (LC_CTYPE, 0));
-
-    _RWSTD_ASSERT (std::strlen (saved_locale_name) < sizeof saved_locale_name);
-
-    *mb_cur_max = 0;
-
-    // iterate over all installed locales
-    for (const char *name = rw_locales (_RWSTD_LC_CTYPE, 0); *name;
-         name += std::strlen (name) + 1) {
-
-        if (std::setlocale (LC_CTYPE, name)) {
-
-            // try to generate a set of multibyte characters
-            // with lengths from 1 and MB_CUR_MAX (or less)
-            const std::size_t cur_max = get_mb_chars (mb_chars);
-
-            if (*mb_cur_max < cur_max) {
-                *mb_cur_max    = cur_max;
-                mb_locale_name = name;
-
-                // break when we've found a multibyte locale
-                // with the longest possible encoding
-                if (MB_LEN_MAX == *mb_cur_max)
-                    break;
-            }
-        }
-    }
-
-    if (*mb_cur_max < 2) {
-        rw_fprintf (rw_stderr, "*** failed to find a full set of multibyte "
-                    "characters in locale \"%s\" with MB_CUR_MAX = %u "
-                    "(computed)", mb_locale_name, *mb_cur_max);
-        mb_locale_name = 0;
-    }
-    else {
-        // (re)generate the multibyte characters for the saved locale
-        // as they may have been overwritten in subsequent iterations
-        // of the loop above (while searching for a locale with greater
-        // value of MB_CUR_MAX)
-        std::setlocale (LC_CTYPE, mb_locale_name);
-        get_mb_chars (mb_chars);
-    }
-
-    std::setlocale (LC_CTYPE, saved_locale_name);
-
-    return mb_locale_name;
-}
-
 /****************************************************************************/
 
 template <class internT>
@@ -654,9 +475,9 @@
     
     std::size_t mb_cur_max = 0;
 
-    mb_char_array_t mb_chars;
+    rw_mbchar_array_t mb_chars;
 
-    const char* const locname = find_mb_locale (&mb_cur_max, mb_chars);
+    const char* const locname = rw_find_mb_locale (&mb_cur_max, mb_chars);
 
     if (!rw_warn (0 != locname, 0, __LINE__,
                   "failed to find a multibyte locale")) {
diff --git a/tests/localization/22.locale.codecvt.out.cpp b/tests/localization/22.locale.codecvt.out.cpp
index 976c588..224f3bb 100644
--- a/tests/localization/22.locale.codecvt.out.cpp
+++ b/tests/localization/22.locale.codecvt.out.cpp
@@ -273,7 +273,7 @@
     *mb_cur_max = 0;
 
     // iterate over all installed locales
-    for (const char *name = rw_locales (); *name;
+    for (const char *name = rw_locales (); name && *name;
          name += std::strlen (name) + 1) {
 
         if (std::setlocale (LC_CTYPE, name)) {
diff --git a/tests/localization/22.locale.ctype.cpp b/tests/localization/22.locale.ctype.cpp
index c07993c..316792d 100644
--- a/tests/localization/22.locale.ctype.cpp
+++ b/tests/localization/22.locale.ctype.cpp
@@ -80,7 +80,7 @@
 
 #define BEGIN_LOCALE_LOOP(num, locname, loop_cntrl)                        \
    for (const char* locname = rw_locales (LC_CTYPE, 0);                    \
-        *locname; locname += std::strlen (locname) + 1) {                  \
+        locname && *locname; locname += std::strlen (locname) + 1) {       \
        _TRY {                                                              \
            const std::locale loc (locname);                                \
            const std::ctype<char> &ctc =                                   \
diff --git a/tests/localization/22.locale.ctype.is.cpp b/tests/localization/22.locale.ctype.is.cpp
new file mode 100644
index 0000000..3e46a91
--- /dev/null
+++ b/tests/localization/22.locale.ctype.is.cpp
@@ -0,0 +1,1062 @@
+/***************************************************************************
+ *
+ * 22.locale.ctype.is.cpp -  Tests exercising the is() of ctype facet
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2001-2006 Rogue Wave Software.
+ *
+ **************************************************************************/
+
+// DESCRIPTION: test iterates over the locales installed on a machine,
+//              calling the C character classification functions and
+//              their C++ counterpart(s), comparing the results of
+//              the calls against one another.
+
+
+#include <rw/_defs.h>
+
+#if defined __linux__
+   // on Linux define _XOPEN_SOURCE to get CODESET defined in <langinfo.h>
+#  define _XOPEN_SOURCE   500   /* Single Unix conformance */
+   // bring __int32_t into scope (otherwise <wctype.h> fails to compile)
+#  include <sys/types.h>
+#endif   // __linux__
+
+// see Onyx PR #28150
+#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x540
+#  include <wchar.h>
+#endif // defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x540
+
+#include <locale>
+
+#include <climits>
+#include <clocale>
+#include <cstring>
+#include <cctype>
+#include <cstdio>
+#include <cstdlib>
+#include <cwchar>     // for WEOF, btowc(), wctob()
+#include <cwctype>    // for iswxxx()
+
+
+#if !defined (_MSC_VER)
+#  if !defined (LC_MESSAGES)
+#    define LC_MESSAGES _RWSTD_LC_MESSAGES
+#  endif   // LC_MESSAGES
+#  include <langinfo.h>
+#endif  // _MSC_VER
+
+#include <driver.h>
+#include <file.h>        // for SLASH
+#include <rw_locale.h>   // for rw_locales()
+
+/**************************************************************************/
+
+// the root of the locale directory (RWSTD_LOCALE_ROOT)
+// not set here to avoid Solaris 7 putenv() bug (PR #30017)
+const char* locale_root;
+
+#define NLOOPS         25
+#define MAX_STR_SIZE   16
+
+#define BEGIN_LOCALE_LOOP(num, locname, loop_cntrl)                        \
+   for (const char* locname = rw_locales (LC_CTYPE, 0);                    \
+        locname && *locname; locname += std::strlen (locname) + 1) {       \
+       _TRY {                                                              \
+           const std::locale loc (locname);                                \
+           const std::ctype<char> &ctc =                                   \
+               _STD_USE_FACET (std::ctype<char>, loc);                     \
+           _RWSTD_UNUSED (ctc);                                            \
+           const std::ctype<charT> &ctp =                                  \
+               _STD_USE_FACET (std::ctype<charT>, loc);                    \
+           for (int loop_cntrl = 0; loop_cntrl < int (num); loop_cntrl++)
+
+#define END_LOCALE_LOOP(locname)                                        \
+       }                                                                \
+       _CATCH (...) {                                                   \
+           rw_assert (0, 0, __LINE__,                                   \
+                      "locale (\"%s\") threw an exception", locname);   \
+       }                                                                \
+  }
+
+
+// for notational convenience
+typedef unsigned char UChar;
+
+#define ALPHA   std::ctype_base::alpha
+#define UPPER   std::ctype_base::upper
+#define LOWER   std::ctype_base::lower
+#define DIGIT   std::ctype_base::digit
+#define SPACE   std::ctype_base::space
+#define CNTRL   std::ctype_base::cntrl
+#define PUNCT   std::ctype_base::punct
+#define XDIGIT  std::ctype_base::xdigit
+#define GRAPH   std::ctype_base::graph
+#define PRINT   std::ctype_base::print
+
+
+// wrapper functions for the c library char and wchar_t functions
+int libc_isalpha (char ch)
+{
+    return (std::isalpha)(UChar (ch));
+}
+
+int libc_isspace (char ch)
+{
+    return (std::isspace)(UChar (ch));
+}
+
+int libc_isprint (char ch)
+{
+    return (std::isprint)(UChar (ch));
+}
+
+int libc_iscntrl (char ch)
+{
+    return (std::iscntrl)(UChar (ch));
+}
+
+int libc_isupper (char ch)
+{
+    return (std::isupper)(UChar (ch));
+}
+
+int libc_islower (char ch)
+{
+    return (std::islower)(UChar (ch));
+}
+
+int libc_isdigit (char ch)
+{
+    return (std::isdigit)(UChar (ch));
+}
+
+int libc_ispunct (char ch)
+{
+    return (std::ispunct)(UChar (ch));
+}
+
+int libc_isxdigit (char ch)
+{
+    return (std::isxdigit)(UChar (ch));
+}
+
+int libc_isalnum (char ch)
+{
+    return (std::isalnum)(UChar (ch));
+}
+
+int libc_isgraph (char ch)
+{
+    return (std::isgraph)(UChar (ch));
+}
+
+char libc_tolower (char ch)
+{
+    return std::tolower (UChar (ch));
+}
+
+char libc_toupper (char ch)
+{
+    return (std::toupper)(UChar (ch));
+}
+
+std::ctype_base::mask libc_mask (int mask, char ch, const char *locname)
+{
+    char curlocname [256];
+
+    if (locname) {
+        std::strcpy (curlocname, std::setlocale (LC_CTYPE, 0));
+
+        if (0 == std::setlocale (LC_CTYPE, locname))
+            return std::ctype_base::mask ();
+    }
+
+    const int c = UChar (ch);
+
+    int result = 0;
+
+    if (mask & ALPHA && (std::isalpha)(c))
+        result |= ALPHA;
+    if (mask & CNTRL && (std::iscntrl)(c))
+        result |= CNTRL;
+    if (mask & DIGIT && (std::isdigit)(c))
+        result |= DIGIT;
+    if (mask & GRAPH && (std::isgraph)(c))
+        result |= GRAPH;
+    if (mask & LOWER && (std::islower)(c))
+        result |= LOWER;
+    if (mask & PRINT && (std::isprint)(c))
+        result |= PRINT;
+    if (mask & PUNCT && (std::ispunct)(c))
+        result |= PUNCT;
+    if (mask & SPACE && (std::isspace)(c))
+        result |= SPACE;
+    if (mask & UPPER && (std::isupper)(c))
+        result |= UPPER;
+    if (mask & XDIGIT && (std::isxdigit)(c))
+        result |= XDIGIT;
+
+    if (locname)
+        std::setlocale (LC_CTYPE, curlocname);
+
+    return std::ctype_base::mask (result);
+}
+
+inline bool libc_is (std::ctype_base::mask mask, char ch, const char *locname)
+{
+    const std::ctype_base::mask m = libc_mask (mask, ch, locname);
+
+    return 0 != (m & mask);
+}
+
+std::size_t c_strlen (const char *s1)
+{
+    return std::strlen (s1);
+}
+
+int c_strcmp (const char *s1, const char *s2)
+{
+    int ret = std::strcoll (s1, s2);
+    return ret ? ret > 0 ? 1 : -1 : 0;
+}
+
+const char* widen (char *dst, const char *src)
+{
+    if (src == dst || !src || !dst)
+        return src;
+
+    std::memcpy (dst, src, std::strlen (src) + 1);
+    return dst;
+}
+
+
+char widen (char, char ch, const char*)
+{
+    return ch;
+}
+
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+int libc_isalpha (wchar_t ch)
+{
+    return (std::iswalpha)(ch);
+}
+
+int libc_isspace (wchar_t ch)
+{
+    return (std::iswspace)(ch);
+}
+
+int libc_isprint (wchar_t ch)
+{
+    return (std::iswprint)(ch);
+}
+
+int libc_iscntrl (wchar_t ch)
+{
+    return (std::iswcntrl)(ch);
+}
+
+int libc_isupper (wchar_t ch)
+{
+    return (std::iswupper)(ch);
+}
+
+int libc_islower (wchar_t ch)
+{
+    return (std::iswlower)(ch);
+}
+
+int libc_isdigit (wchar_t ch)
+{
+    return (std::iswdigit)(ch);
+}
+
+int libc_ispunct (wchar_t ch)
+{
+    return (std::iswpunct)(ch);
+}
+
+int libc_isxdigit (wchar_t ch)
+{
+    return (std::iswxdigit)(ch);
+}
+
+int libc_isalnum (wchar_t ch)
+{
+    return (std::iswalnum)(ch);
+}
+
+int libc_isgraph (wchar_t ch)
+{
+    return (std::iswgraph)(ch);
+}
+
+wchar_t libc_tolower (wchar_t ch)
+{
+    return (std::towlower)(ch);
+}
+
+wchar_t libc_toupper (wchar_t ch)
+{
+    return (std::towupper)(ch);
+}
+
+std::size_t c_strlen (const wchar_t *s1)
+{
+    return std::wcslen (s1);
+}
+
+int c_strcmp (const wchar_t *s1, const wchar_t *s2)
+{
+    int ret = std::wcscmp (s1, s2);
+    return ret ? ret > 0 ? 1 : -1 : 0;
+}
+
+
+const wchar_t* widen (wchar_t *dst, const char *src)
+{
+    static wchar_t buf [4096];
+
+    if (!src)
+        return 0;
+
+    if (!dst)
+        dst = buf;
+
+    std::size_t len = std::strlen (src);
+
+    _RWSTD_ASSERT (len < sizeof buf /sizeof *buf);
+
+    len = std::mbstowcs (dst, src, sizeof buf / sizeof *buf);
+
+    if (std::size_t (-1) == len)
+        *dst = 0;
+
+    return dst;
+}
+
+std::ctype_base::mask libc_mask (int mask, wchar_t ch, const char *locname)
+{
+    char curlocname [256];
+
+    if (locname) {
+        std::strcpy (curlocname, std::setlocale (LC_CTYPE, 0));
+
+        if (0 == std::setlocale (LC_CTYPE, locname))
+            return std::ctype_base::mask ();
+    }
+
+    int result = 0;
+
+    if (mask & ALPHA && (std::iswalpha)(ch))
+        result |= ALPHA;
+    if (mask & CNTRL && (std::iswcntrl)(ch))
+        result |= CNTRL;
+    if (mask & DIGIT && (std::iswdigit)(ch))
+        result |= DIGIT;
+    if (mask & GRAPH && (std::iswgraph)(ch))
+        result |= GRAPH;
+    if (mask & LOWER && (std::iswlower)(ch))
+        result |= LOWER;
+    if (mask & PRINT && (std::iswprint)(ch))
+        result |= PRINT;
+    if (mask & PUNCT && (std::iswpunct)(ch))
+        result |= PUNCT;
+    if (mask & SPACE && (std::iswspace)(ch))
+        result |= SPACE;
+    if (mask & UPPER && (std::iswupper)(ch))
+        result |= UPPER;
+    if (mask & XDIGIT && (std::iswxdigit)(ch))
+        result |= XDIGIT;
+
+    if (locname)
+        std::setlocale (LC_CTYPE, curlocname);
+
+    return std::ctype_base::mask (result);
+}
+
+bool libc_is (std::ctype_base::mask mask, wchar_t ch, const char *locname)
+{
+    const std::ctype_base::mask m = libc_mask (mask, ch, locname);
+
+    return 0 != (m & mask);
+}
+
+wchar_t widen (wchar_t, char ch, const char *locname)
+{
+    char curlocname [256];
+    std::strcpy (curlocname, std::setlocale (LC_CTYPE, 0));
+
+    if (0 == std::setlocale (LC_CTYPE, locname))
+        return UChar (ch);
+
+    wchar_t result;
+
+#ifndef _RWSTD_NO_BTOWC
+
+    result = std::btowc (UChar (ch));
+
+#elif !defined (_RWSTD_NO_MBTOWC)
+
+    if (1 != std::mbtowc (&result, &ch, 1))
+        result = wchar_t (WEOF);
+
+#else
+
+    result = UChar (ch);
+
+#endif   // _RWSTD_NO_BTOWC, _RWSTD_NO_MBTOWC
+
+    if (locname)
+        std::setlocale (LC_CTYPE, curlocname);
+
+    return result;
+}
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+
+template <class charT>
+void gen_str (charT *str, std::size_t size)
+{
+    // generate a random string with the given size
+    // we do not attempt to check that the size is within the
+    // valid range for the string.
+
+    for (std::size_t i = 0; i < size; i++){
+        str [i] = UChar (std::rand () % UCHAR_MAX);
+        // only increment if we are not going to roll over
+        if (str [i] != charT (UCHAR_MAX - 1U))
+            ++str [i];
+    }
+
+    str [size] = charT ();
+
+    _RWSTD_ASSERT (c_strlen (str) == size);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void test_is (charT, const char *cname)
+{
+    charT str [MAX_STR_SIZE + 1];
+
+    BEGIN_LOCALE_LOOP (NLOOPS, locname, j) {
+
+        std::size_t size = std::size_t (j % MAX_STR_SIZE);
+
+        gen_str (str, size);
+
+        // create a mask for each character in the string using the c library
+        // to make sure that it is the same as the mask returned by is
+        std::ctype_base::mask vec [MAX_STR_SIZE + 1];
+
+        // set the global C locale to default to make sure
+        // the C++ library does not asume a set value
+        std::setlocale (LC_CTYPE, "");
+
+        ctp.is (str, str + size, vec);
+
+        // set the global C locale to the current locale for calls to the
+        // C library
+        std::setlocale (LC_CTYPE, locname);
+
+        for (std::size_t i = 0; i < size ; i++) {
+
+            int libc_result = 0;
+
+            if (libc_isalpha (str [i]))
+                libc_result |= ALPHA;
+            if (libc_isprint (str [i]))
+                libc_result |= PRINT;
+            if (libc_isspace (str [i]))
+                libc_result |= SPACE;
+            if (libc_iscntrl (str [i]))
+                libc_result |= CNTRL;
+            if (libc_isupper (str [i]))
+                libc_result |= UPPER;
+            if (libc_islower (str [i]))
+                libc_result |= LOWER;
+            if (libc_isdigit (str [i]))
+                libc_result |= DIGIT;
+            if (libc_ispunct (str [i]))
+                libc_result |= PUNCT;
+            if (libc_isxdigit (str [i]))
+                libc_result |= XDIGIT;
+            if (libc_isgraph (str [i]))
+                libc_result |= GRAPH;
+
+            rw_assert (vec [i] == libc_result, 0, __LINE__,
+                       "ctype<%s>::is(%{*Ac}, ..., v) in locale(%#s) "
+                       "at offset %zu; got %{LC} expected %{LC}\n",
+                       cname, int (sizeof *str), str,
+                       locname, i, vec [i], libc_result);
+        }
+    } END_LOCALE_LOOP (locname);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void test_is_ch (charT, const char *cname)
+{
+    // buffers to hold the character classification
+    // e.g., for `a' in the "C" locale the string will be
+    //       "print lower alpha xdigit alnum graph "
+
+    static char is_C    [80];  // C character classification
+    static char is_CXX  [80];  // C++ classification using ctype<char> facet
+    static char is_CXX2 [80];  // C++ classification using convenience funcs
+
+    rw_info (0, 0, __LINE__, "std::ctype<%s>::is(mask, %1$s)", cname);
+
+    BEGIN_LOCALE_LOOP (UCHAR_MAX, locname, i) {
+
+        const charT ch = charT (i);
+        const UChar uch = ch;
+
+        *is_C    =
+        *is_CXX  =
+        *is_CXX2 = '\0';
+
+        // set the global C locale to locname for the C library calls
+        std::setlocale (LC_CTYPE, locname);
+
+#define IS(what)                                                        \
+        libc_is##what (ch)                                              \
+             ? (void)std::strcat (is_C,    #what" ") : (void)0;
+
+        // test all classes of characters
+        IS (space); IS (print); IS (cntrl); IS (upper); IS (lower);
+        IS (alpha); IS (digit); IS (punct); IS (xdigit); IS (alnum);
+        IS (graph);
+
+        // set the global C locale to default to make sure
+        // the C++ library does not asume a set value
+        std::setlocale (LC_CTYPE, "");
+
+#undef IS
+// convenience macro
+#define IS(what)                                                   \
+    ctp.is (std::ctype_base::what, ch)                             \
+          ? (void)std::strcat (is_CXX,  #what" ") : (void)0;       \
+    (std::is##what)(ch, loc)                                       \
+          ? (void)std::strcat (is_CXX2, #what" ") : (void)0;
+
+        // test all classes of characters
+        // (must be in the same order as the IS() calls above)
+        IS (space); IS (print); IS (cntrl); IS (upper); IS (lower);
+        IS (alpha); IS (digit); IS (punct); IS (xdigit); IS (alnum);
+        IS (graph);
+
+        // compare the two strings (should match)
+
+        rw_assert (0 == std::strcmp (is_C, is_CXX), 0, __LINE__,
+                   "ctype<%s>::is(..., %{#lc}) in locale(%#s) "
+                   "expected to hold for { %s}, got { %s}",
+                   cname, uch, locname, is_C, is_CXX);
+
+        // convenience functions must produce the same results
+        rw_assert (0 == std::strcmp (is_C, is_CXX2), 0, __LINE__,
+                   "is* (%{#lc}, locale (%#s)) expected to hold for "
+                   "{ %s}, got { %s}",
+                   uch, locname, is_C, is_CXX2);
+
+#if !defined (_WIN32) && !defined (_WIN64)
+
+        // exercise POSIX requirements only on POSIX platforms
+
+        static const std::ctype_base::mask masks[] = {
+            ALPHA, std::ctype_base::mask (), CNTRL, DIGIT,
+            GRAPH, LOWER, PRINT, PUNCT,
+            SPACE, UPPER, XDIGIT
+        };
+
+        // see the POSIX description of LC_CTYPE in Locale for a table
+        // of required and allowed combinations of character classes
+
+        // a character in a given /* class */ below is also required
+        // to be included in the following set of classes
+        static const int required [sizeof masks / sizeof *masks] = {
+            /* alpha  */ ALPHA | GRAPH | PRINT,
+            /* blank  */ SPACE,
+            /* cntrl  */ CNTRL,
+            /* digit  */ DIGIT | GRAPH | PRINT | XDIGIT,
+            /* graph  */ GRAPH | PRINT,
+            /* lower  */ ALPHA | GRAPH | LOWER | PRINT,
+            /* print  */ PRINT,
+            /* punct  */ GRAPH | PRINT | PUNCT,
+            /* space  */ SPACE,
+            /* upper  */ ALPHA | GRAPH | PRINT | UPPER,
+            /* xdigit */ GRAPH | PRINT | XDIGIT
+        };
+
+        // a character in a given /* class */ below may also
+        // be included in the following set of classes
+        static const int allowed [sizeof masks / sizeof *masks] = {
+            /* alpha  */ UPPER | LOWER | XDIGIT,
+            /* blank  */ CNTRL,
+            /* cntrl  */ SPACE,
+            /* digit  */ 0,
+            /* graph  */ UPPER | LOWER | ALPHA | DIGIT | SPACE | PUNCT |XDIGIT,
+            /* lower  */ UPPER | XDIGIT,
+            /* print  */ UPPER | LOWER | ALPHA | DIGIT | SPACE | PUNCT |XDIGIT,
+            /* punct  */ SPACE,
+            /* space  */ CNTRL,
+            /* upper  */ LOWER | XDIGIT,
+            /* xdigit */ UPPER | LOWER | ALPHA | DIGIT
+        };
+
+        // a character in a given /* class */ below is explicitly
+        // disallowed to be included in the following set of classes
+        static const int disallowed [sizeof masks / sizeof *masks] = {
+            /* alpha  */ DIGIT | SPACE | CNTRL | PUNCT,
+            /* blank  */ UPPER | LOWER | ALPHA | DIGIT,
+            /* cntrl  */ UPPER | LOWER | ALPHA | DIGIT | PUNCT | GRAPH | PRINT,
+            /* digit  */ UPPER | LOWER | ALPHA | SPACE | SPACE | CNTRL,
+            /* graph  */ CNTRL,
+            /* lower  */ DIGIT | SPACE | CNTRL | PUNCT,
+            /* print  */ CNTRL,
+            /* punct  */ UPPER | LOWER | ALPHA | DIGIT | CNTRL | XDIGIT,
+            /* space  */ UPPER | LOWER | ALPHA | DIGIT | XDIGIT,
+            /* upper  */ DIGIT | SPACE | CNTRL | PUNCT,
+            /* xdigit */ SPACE | CNTRL | PUNCT
+        };
+
+        // obtain the mask of a single character
+        std::ctype_base::mask m;
+        ctp.is (&ch, &ch + 1, &m);
+
+        int missing        = 0;   // required bits missing in ch's mask
+        int all_allowed    = 0;   // all bits allowed to be set in ch's mask
+        int all_disallowed = 0;   // all bits disallowed to be set in the mask
+
+        for (std::size_t k = 0; k != sizeof masks / sizeof *masks; ++k) {
+
+            // assumes masks [k] has a single bit set
+            const int bit = m & masks [k];
+            if (!bit)
+                continue;
+
+            if ((bit & required [k]) && (m & required [k]) != required [k]) {
+                // character in a class given by masks[k] is required
+                // to also belong to all classes in required[k]
+
+                missing |= ~(m & required [k]) & required [k];
+            }
+
+            // character in a class given by masks[k] is only allowed
+            // to belong to classes in (allowed[k] | required[k]) and
+            // is not allowed to belong to those in disallowed[k]
+            all_allowed    |= required [k] | allowed [k];
+            all_disallowed |= disallowed [k];
+        }
+
+        // the space character automatically belongs to the print class
+        // but cannot belong to the punct or graph classes; other characters
+        // that belong to the space class can belong to the punct and graph
+        // classes
+        if (' ' == ch) {
+            all_disallowed |= PUNCT | GRAPH;
+            if (!(m & PRINT))
+                missing |= PRINT;
+        }
+
+        int cmask = -1;
+
+        if (missing) {
+
+            if (-1 == cmask)
+                cmask = libc_mask (-1, ch, locname);
+
+            rw_assert (m == cmask, 0, __LINE__,
+                       "mask of %{#lc} in locale(%#s) "
+                       "is missing bits %{LC}: %{LC}",
+                       ch, locname, missing, m);
+        }
+
+        if (m & ~all_allowed) {
+
+            if (-1 == cmask)
+                cmask = libc_mask (-1, ch, locname);
+
+            rw_assert (m == cmask, 0, __LINE__,
+                       "mask of %{#lc} in locale (%#s) "
+                       "contains extra bits %{LC}: %{LC}",
+                       ch, locname, m & ~all_allowed, m);
+        }
+
+        if (m & all_disallowed) {
+
+            if (-1 == cmask)
+                cmask = libc_mask (-1, ch, locname);
+
+            rw_assert (m == cmask, 0, __LINE__,
+                       "mask of %{#lc} in locale (%s#) "
+                       "contains disallowed bits { %s }: { %s }",
+                       ch, locname, m & all_disallowed, m);
+        }
+
+#endif   // !WIN32 && !WIN64
+
+    } END_LOCALE_LOOP (locname);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void test_libc (charT, const char *cname)
+{
+    test_is_ch (charT (), cname);
+    test_is (charT (), cname);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void test_libstd_mask (charT, const char *cname,
+                       const std::ctype<charT> &ct, const char *locname)
+{
+
+    rw_info (0, 0, __LINE__, "std::ctype<%s>::is(mask, %1$s) in locale(%#s)",
+             cname, locname);
+
+#undef TEST
+#define TEST(ch, m)                                             \
+    rw_assert (ct.is (m, ch), 0, __LINE__,                      \
+               "ctype<%s>::is(%d, %d) failed", cname, m, ch)
+
+    // make sure the characters have the correct masks
+    TEST (charT ('a'), ALPHA);
+    TEST (charT ('a'), LOWER);
+    TEST (charT ('a'), XDIGIT);
+    TEST (charT ('a'), GRAPH);
+    TEST (charT ('a'), PRINT);
+    TEST (charT ('a'), ALPHA | LOWER | XDIGIT | PRINT);
+
+    TEST (charT ('b'), ALPHA);
+    TEST (charT ('b'), LOWER);
+    TEST (charT ('b'), XDIGIT);
+    TEST (charT ('b'), GRAPH);
+    TEST (charT ('b'), PRINT);
+    TEST (charT ('b'), ALPHA | LOWER | XDIGIT | PRINT);
+
+    TEST (charT ('c'), ALPHA);
+    TEST (charT ('c'), LOWER);
+    TEST (charT ('c'), XDIGIT);
+    TEST (charT ('c'), GRAPH);
+    TEST (charT ('c'), PRINT);
+    TEST (charT ('c'), ALPHA | LOWER | XDIGIT | PRINT);
+
+    TEST (charT ('A'), ALPHA);
+    TEST (charT ('A'), UPPER);
+    TEST (charT ('A'), XDIGIT);
+    TEST (charT ('A'), GRAPH);
+    TEST (charT ('A'), PRINT);
+    TEST (charT ('A'), ALPHA | UPPER | XDIGIT | PRINT);
+
+    TEST (charT ('B'), ALPHA);
+    TEST (charT ('B'), UPPER);
+    TEST (charT ('B'), XDIGIT);
+    TEST (charT ('B'), GRAPH);
+    TEST (charT ('B'), PRINT);
+    TEST (charT ('B'), ALPHA | UPPER | XDIGIT | PRINT);
+
+    TEST (charT ('C'), ALPHA);
+    TEST (charT ('C'), UPPER);
+    TEST (charT ('C'), XDIGIT);
+    TEST (charT ('C'), GRAPH);
+    TEST (charT ('C'), PRINT);
+    TEST (charT ('C'), ALPHA | UPPER | XDIGIT | PRINT);
+
+    TEST (charT ('1'), DIGIT);
+    TEST (charT ('1'), XDIGIT);
+    TEST (charT ('1'), GRAPH);
+    TEST (charT ('1'), PRINT);
+    TEST (charT ('1'), DIGIT | XDIGIT | GRAPH | PRINT);
+
+    TEST (charT ('2'), DIGIT);
+    TEST (charT ('2'), XDIGIT);
+    TEST (charT ('2'), GRAPH);
+    TEST (charT ('2'), PRINT);
+    TEST (charT ('2'), DIGIT | XDIGIT | GRAPH | PRINT);
+
+    TEST (charT ('3'), DIGIT);
+    TEST (charT ('3'), XDIGIT);
+    TEST (charT ('3'), GRAPH);
+    TEST (charT ('3'), PRINT);
+    TEST (charT ('3'), DIGIT | XDIGIT | GRAPH | PRINT);
+
+    TEST (charT (' '), SPACE);
+    TEST (charT (' '), GRAPH);
+    TEST (charT (' '), PRINT);
+    TEST (charT (' '), SPACE | GRAPH | PRINT);
+
+    if (sizeof (charT) > 1) {
+        TEST (ct.widen ('\xa0'), ALPHA);
+        TEST (ct.widen ('\xa0'), LOWER);
+        TEST (ct.widen ('\xa0'), GRAPH);
+        TEST (ct.widen ('\xa0'), PRINT);
+        TEST (ct.widen ('\xa0'), ALPHA | LOWER | GRAPH | PRINT);
+
+        TEST (ct.widen ('\xa1'), ALPHA);
+        TEST (ct.widen ('\xa1'), UPPER);
+        TEST (ct.widen ('\xa1'), GRAPH);
+        TEST (ct.widen ('\xa1'), PRINT);
+        TEST (ct.widen ('\xa1'), ALPHA | UPPER | GRAPH | PRINT);
+
+        TEST (ct.widen ('\xa2'), DIGIT);
+        TEST (ct.widen ('\xa2'), GRAPH);
+        TEST (ct.widen ('\xa2'), PRINT);
+        TEST (ct.widen ('\xa0'), DIGIT | GRAPH | PRINT);
+    }
+}
+
+/**************************************************************************/
+
+template <class charT>
+void test_libstd (charT, const char *cname)
+{
+    const char cmap_1[] = {
+        "<code_set_name> \"ANSI_X3.4-1968\"\n"
+        "<mb_cur_max> 1\n"
+        "<mb_cur_min> 1\n"
+        "CHARMAP\n"
+        "<U0000> \\x00\n"
+        "<U0001> \\x01\n"
+        "<U0002> \\x02\n"
+        "<U0003> \\x03\n"
+        "<U0004> \\x04\n"
+        "<U0005> \\x05\n"
+        "<U0006> \\x06\n"
+        "<U0007> \\x07\n"
+        "<U0008> \\x08\n"
+        "<U0009> \\x09\n"
+        "<U000a> \\x0a\n"
+        "<U000b> \\x0b\n"
+        "<U000c> \\x0c\n"
+        "<U000d> \\x0d\n"
+        "<U000e> \\x0e\n"
+        "<U000f> \\x0f\n"
+        "<U0010> \\x10\n"
+        "<U0011> \\x11\n"
+        "<U0012> \\x12\n"
+        "<U0013> \\x13\n"
+        "<U0014> \\x14\n"
+        "<U0015> \\x15\n"
+        "<U0016> \\x16\n"
+        "<U0017> \\x17\n"
+        "<U0018> \\x18\n"
+        "<U0019> \\x19\n"
+        "<U001a> \\x1a\n"
+        "<U001b> \\x1b\n"
+        "<U001c> \\x1c\n"
+        "<U001d> \\x1d\n"
+        "<U001e> \\x1e\n"
+        "<U001f> \\x1f\n"
+        "<U0020> \\x20\n"
+        "<U0021> \\x21\n"
+        "<U0022> \\x22\n"
+        "<U0023> \\x23\n"
+        "<U0024> \\x24\n"
+        "<U0025> \\x25\n"
+        "<U0026> \\x26\n"
+        "<U0027> \\x27\n"
+        "<U0028> \\x28\n"
+        "<U0029> \\x29\n"
+        "<U002a> \\x2a\n"
+        "<U002b> \\x2b\n"
+        "<U002c> \\x2c\n"
+        "<U002d> \\x2d\n"
+        "<U002e> \\x2e\n"
+        "<U002f> \\x2f\n"
+        "<U0030> \\x30\n"
+        "<U0031> \\x31\n"
+        "<U0032> \\x32\n"
+        "<U0033> \\x33\n"
+        "<U0034> \\x34\n"
+        "<U0035> \\x35\n"
+        "<U0036> \\x36\n"
+        "<U0037> \\x37\n"
+        "<U0038> \\x38\n"
+        "<U0039> \\x39\n"
+        "<U003a> \\x3a\n"
+        "<U003b> \\x3b\n"
+        "<U003c> \\x3c\n"
+        "<U003d> \\x3d\n"
+        "<U003e> \\x3e\n"
+        "<U003f> \\x3f\n"
+        "<U0040> \\x40\n"
+        "<U0041> \\x41\n"
+        "<U0042> \\x42\n"
+        "<U0043> \\x43\n"
+        "<U0044> \\x44\n"
+        "<U0045> \\x45\n"
+        "<U0046> \\x46\n"
+        "<U0047> \\x47\n"
+        "<U0048> \\x48\n"
+        "<U0049> \\x49\n"
+        "<U004a> \\x4a\n"
+        "<U004b> \\x4b\n"
+        "<U004c> \\x4c\n"
+        "<U004d> \\x4d\n"
+        "<U004e> \\x4e\n"
+        "<U004f> \\x4f\n"
+        "<U0050> \\x50\n"
+        "<U0051> \\x51\n"
+        "<U0052> \\x52\n"
+        "<U0053> \\x53\n"
+        "<U0054> \\x54\n"
+        "<U0055> \\x55\n"
+        "<U0056> \\x56\n"
+        "<U0057> \\x57\n"
+        "<U0058> \\x58\n"
+        "<U0059> \\x59\n"
+        "<U005a> \\x5a\n"
+        "<U005b> \\x5b\n"
+        "<U005c> \\x5c\n"
+        "<U005d> \\x5d\n"
+        "<U005e> \\x5e\n"
+        "<U005f> \\x5f\n"
+        "<U0060> \\x60\n"
+        "<U0061> \\x61\n"
+        "<U0062> \\x62\n"
+        "<U0063> \\x63\n"
+        "<U0064> \\x64\n"
+        "<U0065> \\x65\n"
+        "<U0066> \\x66\n"
+        "<U0067> \\x67\n"
+        "<U0068> \\x68\n"
+        "<U0069> \\x69\n"
+        "<U006a> \\x6a\n"
+        "<U006b> \\x6b\n"
+        "<U006c> \\x6c\n"
+        "<U006d> \\x6d\n"
+        "<U006e> \\x6e\n"
+        "<U006f> \\x6f\n"
+        "<U0070> \\x70\n"
+        "<U0071> \\x71\n"
+        "<U0072> \\x72\n"
+        "<U0073> \\x73\n"
+        "<U0074> \\x74\n"
+        "<U0075> \\x75\n"
+        "<U0076> \\x76\n"
+        "<U0077> \\x77\n"
+        "<U0078> \\x78\n"
+        "<U0079> \\x79\n"
+        "<U007a> \\x7a\n"
+        "<U007b> \\x7b\n"
+        "<U007c> \\x7c\n"
+        "<U007d> \\x7d\n"
+        "<U007e> \\x7e\n"
+        "<U007f> \\x7f\n"
+        "<U1000> \\xa0\n"
+        "<U1001> \\xa1\n"
+        "<U1002> \\xa2\n"
+        "END CHARMAP\n"
+    };
+
+    const char loc_1[] = {
+        "escape_char /\n"
+        "LC_CTYPE\n"
+        "#     <A>     <B>     <C>     MYANMAR LETTER KHA\n"
+        "upper <U0041>;<U0042>;<U0043>;<U1001>\n"
+        "      <a>     <b>     <c>     MYANMAR LETTER KA\n"
+        "lower <U0061>;<U0062>;<U0063>;<U1000>\n"
+        "alpha <U0061>;<U0062>;<U0063>;<U0041>;"
+              "<U0042>;<U0043>;<U1000>;<U1001>\n"
+        "digit <U0031>;<U0032>;<U0033>;<U1002>\n"
+        "space <U0020>\n"
+        "cntrl <U0000>\n"
+        "      <!>      <\">\n"
+        "punct <U0021>; <U0022>\n"
+        "graph <U0041>;<U0042>;<U0043>;<U0061>;<U0062>;<U0063>;"
+              "<U1000>;<U1001>;<U1002>;<U1003>;<U1004>;<U1005>;"
+              "<U0031>;<U0032>;<U0033>;<U0020>;<U0021>;<U0022>\n"
+        "print <U0041>;<U0042>;<U0043>;"
+              "<U0061>;<U0062>;<U0063>;"
+              "<U1000>;<U1001>;<U1002>;<U1003>;<U1004>;<U1005>;"
+              "<U0031>;<U0032>;<U0033>;<U0020>;<U0021>;<U0022>\n"
+        "xdigit <U0041>;<U0042>;<U0043>;<U0061>;<U0062>;"
+               "<U0063>;<U0031>;<U0032>;<U0033>\n"
+        "END LC_CTYPE\n"
+    };
+
+    //invoke rw_create_locale to build a locale to test with
+    const char* const locname = rw_create_locale (cmap_1, loc_1);
+
+    if (!rw_error (0 != locname, 0, __LINE__,
+                   "failed to create a locale in %s", locale_root))
+        return;
+
+    const std::locale loc (locname);
+
+    const std::ctype<charT> &ct =
+        _STD_USE_FACET (std::ctype<charT>, loc);
+
+    ct._C_opts |=  ct._C_use_libstd;
+    ct._C_opts &= ~ct._C_use_libc;
+
+    test_libstd_mask (charT (), cname, ct, locname);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void run_test (charT, const char *cname)
+{
+    if (0) {
+        // do a compile time only test on use_facet and has_facet
+        _STD_HAS_FACET (std::ctype_byname<charT>, std::locale ());
+        _STD_USE_FACET (std::ctype_byname<charT>, std::locale ());
+    }
+
+    test_libstd (charT (), cname);
+    test_libc (charT (), cname);
+}
+
+/**************************************************************************/
+
+static int
+run_test (int, char**)
+{
+    run_test (char (), "char");
+    run_test (wchar_t (), "wchar_t");
+
+    return 0;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv[])
+{
+    return rw_test (argc, argv, __FILE__,
+                    "lib.category.ctype",
+                    0 /* no comment */,
+                    run_test,
+                    "",
+                    (void*)0   /* sentinel */);
+}
diff --git a/tests/localization/22.locale.ctype.narrow.cpp b/tests/localization/22.locale.ctype.narrow.cpp
new file mode 100644
index 0000000..9c8faa0
--- /dev/null
+++ b/tests/localization/22.locale.ctype.narrow.cpp
@@ -0,0 +1,689 @@
+/***************************************************************************
+ *
+ * 22.locale.ctype.cpp -  Tests exercising the narrow() and widen() ctype facet
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2001-2006 Rogue Wave Software.
+ *
+ **************************************************************************/
+
+// DESCRIPTION: test iterates over the locales installed on a machine,
+//              calling the C character classification functions and
+//              their C++ counterpart(s), comparing the results of
+//              the calls against one another.
+
+
+#include <rw/_defs.h>
+
+#if defined __linux__
+   // on Linux define _XOPEN_SOURCE to get CODESET defined in <langinfo.h>
+#  define _XOPEN_SOURCE   500   /* Single Unix conformance */
+   // bring __int32_t into scope (otherwise <wctype.h> fails to compile)
+#  include <sys/types.h>
+#endif   // __linux__
+
+// see Onyx PR #28150
+#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x540
+#  include <wchar.h>
+#endif // defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x540
+
+#include <locale>
+
+#include <climits>
+#include <clocale>
+#include <cstring>
+#include <cctype>
+#include <cstdio>
+#include <cstdlib>
+#include <cwchar>     // for WEOF, btowc(), wctob()
+#include <cwctype>    // for iswxxx()
+
+
+#if !defined (_MSC_VER)
+#  if !defined (LC_MESSAGES)
+#    define LC_MESSAGES _RWSTD_LC_MESSAGES
+#  endif   // LC_MESSAGES
+#  include <langinfo.h>
+#endif  // _MSC_VER
+
+#include <driver.h>
+#include <file.h>        // for SLASH
+#include <rw_locale.h>   // for rw_locales()
+
+/**************************************************************************/
+
+// the root of the locale directory (RWSTD_LOCALE_ROOT)
+// not set here to avoid Solaris 7 putenv() bug (PR #30017)
+const char* locale_root;
+
+#define NLOOPS         25
+#define MAX_STR_SIZE   16
+
+#define BEGIN_LOCALE_LOOP(num, locname, loop_cntrl)                        \
+   for (const char* locname = rw_locales (LC_CTYPE, 0);                    \
+        locname && *locname; locname += std::strlen (locname) + 1) {       \
+       _TRY {                                                              \
+           const std::locale loc (locname);                                \
+           const std::ctype<char> &ctc =                                   \
+               _STD_USE_FACET (std::ctype<char>, loc);                     \
+           _RWSTD_UNUSED (ctc);                                            \
+           const std::ctype<charT> &ctp =                                  \
+               _STD_USE_FACET (std::ctype<charT>, loc);                    \
+           for (int loop_cntrl = 0; loop_cntrl < int (num); loop_cntrl++)
+
+#define END_LOCALE_LOOP(locname)                                        \
+       }                                                                \
+       _CATCH (...) {                                                   \
+           rw_assert (0, 0, __LINE__,                                   \
+                      "locale (\"%s\") threw an exception", locname);   \
+       }                                                                \
+  }
+
+
+// for notational convenience
+typedef unsigned char UChar;
+
+#define ALPHA   std::ctype_base::alpha
+#define UPPER   std::ctype_base::upper
+#define LOWER   std::ctype_base::lower
+#define DIGIT   std::ctype_base::digit
+#define SPACE   std::ctype_base::space
+#define CNTRL   std::ctype_base::cntrl
+#define PUNCT   std::ctype_base::punct
+#define XDIGIT  std::ctype_base::xdigit
+#define GRAPH   std::ctype_base::graph
+#define PRINT   std::ctype_base::print
+
+
+// wrapper functions for the c library char and wchar_t functions
+
+std::ctype_base::mask libc_mask (int mask, char ch, const char *locname)
+{
+    char curlocname [256];
+
+    if (locname) {
+        std::strcpy (curlocname, std::setlocale (LC_CTYPE, 0));
+
+        if (0 == std::setlocale (LC_CTYPE, locname))
+            return std::ctype_base::mask ();
+    }
+
+    const int c = UChar (ch);
+
+    int result = 0;
+
+    if (mask & ALPHA && (std::isalpha)(c))
+        result |= ALPHA;
+    if (mask & CNTRL && (std::iscntrl)(c))
+        result |= CNTRL;
+    if (mask & DIGIT && (std::isdigit)(c))
+        result |= DIGIT;
+    if (mask & GRAPH && (std::isgraph)(c))
+        result |= GRAPH;
+    if (mask & LOWER && (std::islower)(c))
+        result |= LOWER;
+    if (mask & PRINT && (std::isprint)(c))
+        result |= PRINT;
+    if (mask & PUNCT && (std::ispunct)(c))
+        result |= PUNCT;
+    if (mask & SPACE && (std::isspace)(c))
+        result |= SPACE;
+    if (mask & UPPER && (std::isupper)(c))
+        result |= UPPER;
+    if (mask & XDIGIT && (std::isxdigit)(c))
+        result |= XDIGIT;
+
+    if (locname)
+        std::setlocale (LC_CTYPE, curlocname);
+
+    return std::ctype_base::mask (result);
+}
+
+inline bool libc_is (std::ctype_base::mask mask, char ch, const char *locname)
+{
+    const std::ctype_base::mask m = libc_mask (mask, ch, locname);
+
+    return 0 != (m & mask);
+}
+
+const char* narrow (char *dst, const char *src)
+{
+    if (src == dst || !src || !dst)
+        return src;
+
+    std::memcpy (dst, src, std::strlen (src) + 1);
+    return dst;
+}
+
+
+const char* widen (char *dst, const char *src)
+{
+    if (src == dst || !src || !dst)
+        return src;
+
+    std::memcpy (dst, src, std::strlen (src) + 1);
+    return dst;
+}
+
+
+char widen (char, char ch, const char*)
+{
+    return ch;
+}
+
+char narrow (char ch, const char*)
+{
+    return ch;
+}
+
+// cond1() verifies condition [1] in Test::test_narrow_widen()
+// below using libc functions
+bool cond1 (std::ctype_base::mask mask, char ch, const char *locname)
+{
+    char curlocname [256];
+    std::strcpy (curlocname, std::setlocale (LC_CTYPE, 0));
+
+    if (0 == std::setlocale (LC_CTYPE, locname))
+        return false;
+
+#ifdef __SUNPRO_CC
+
+    // working around a SunPro bug (PR #28150)
+    using std::wint_t;
+
+#endif   // __SUNPRO_CC
+
+#ifndef _RWSTD_NO_BTOWC
+
+    const std::wint_t wc = std::btowc (UChar (ch));
+
+#elif !defined (_RWSTD_NO_MBSTOWCS)
+
+    wchar_t tmp;
+    const std::wint_t wc = 1 == std::mbstowcs (&tmp, &ch, 1) ? tmp : WEOF;
+
+#else
+
+    const std::wint_t wc = WEOF;
+
+#endif   // _RWSTD_NO_BTOWC, _RWSTD_NO_MBSTOWCS
+
+    const bool result =
+        WEOF == wc || libc_is (mask, ch, 0) || !libc_is (mask, wchar_t (wc), 0);
+
+    std::setlocale (LC_CTYPE, curlocname);
+
+    return result;
+}
+
+
+// cond3() overloads verify condition [3] in Test::test_narrow_widen()
+// below using libc functions
+bool cond3 (std::ctype_base::mask, char, const char*)
+{
+    return true;
+}
+
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+const char* narrow (char *dst, const wchar_t *src)
+{
+    static char buf [4096];
+
+    if (!src)
+        return 0;
+
+    if (!dst)
+        dst = buf;
+
+    std::size_t len = std::wcslen (src);
+
+    _RWSTD_ASSERT (len < sizeof buf);
+
+    len = std::wcstombs (dst, src, sizeof buf / sizeof *buf);
+
+    if (std::size_t (-1) == len)
+        *dst = 0;
+
+    return dst;
+}
+
+
+const wchar_t* widen (wchar_t *dst, const char *src)
+{
+    static wchar_t buf [4096];
+
+    if (!src)
+        return 0;
+
+    if (!dst)
+        dst = buf;
+
+    std::size_t len = std::strlen (src);
+
+    _RWSTD_ASSERT (len < sizeof buf /sizeof *buf);
+
+    len = std::mbstowcs (dst, src, sizeof buf / sizeof *buf);
+
+    if (std::size_t (-1) == len)
+        *dst = 0;
+
+    return dst;
+}
+
+std::ctype_base::mask libc_mask (int mask, wchar_t ch, const char *locname)
+{
+    char curlocname [256];
+
+    if (locname) {
+        std::strcpy (curlocname, std::setlocale (LC_CTYPE, 0));
+
+        if (0 == std::setlocale (LC_CTYPE, locname))
+            return std::ctype_base::mask ();
+    }
+
+    int result = 0;
+
+    if (mask & ALPHA && (std::iswalpha)(ch))
+        result |= ALPHA;
+    if (mask & CNTRL && (std::iswcntrl)(ch))
+        result |= CNTRL;
+    if (mask & DIGIT && (std::iswdigit)(ch))
+        result |= DIGIT;
+    if (mask & GRAPH && (std::iswgraph)(ch))
+        result |= GRAPH;
+    if (mask & LOWER && (std::iswlower)(ch))
+        result |= LOWER;
+    if (mask & PRINT && (std::iswprint)(ch))
+        result |= PRINT;
+    if (mask & PUNCT && (std::iswpunct)(ch))
+        result |= PUNCT;
+    if (mask & SPACE && (std::iswspace)(ch))
+        result |= SPACE;
+    if (mask & UPPER && (std::iswupper)(ch))
+        result |= UPPER;
+    if (mask & XDIGIT && (std::iswxdigit)(ch))
+        result |= XDIGIT;
+
+    if (locname)
+        std::setlocale (LC_CTYPE, curlocname);
+
+    return std::ctype_base::mask (result);
+}
+
+bool libc_is (std::ctype_base::mask mask, wchar_t ch, const char *locname)
+{
+    const std::ctype_base::mask m = libc_mask (mask, ch, locname);
+
+    return 0 != (m & mask);
+}
+
+wchar_t widen (wchar_t, char ch, const char *locname)
+{
+    char curlocname [256];
+    std::strcpy (curlocname, std::setlocale (LC_CTYPE, 0));
+
+    if (0 == std::setlocale (LC_CTYPE, locname))
+        return UChar (ch);
+
+    wchar_t result;
+
+#ifndef _RWSTD_NO_BTOWC
+
+    result = std::btowc (UChar (ch));
+
+#elif !defined (_RWSTD_NO_MBTOWC)
+
+    if (1 != std::mbtowc (&result, &ch, 1))
+        result = wchar_t (WEOF);
+
+#else
+
+    result = UChar (ch);
+
+#endif   // _RWSTD_NO_BTOWC, _RWSTD_NO_MBTOWC
+
+    if (locname)
+        std::setlocale (LC_CTYPE, curlocname);
+
+    return result;
+}
+
+char narrow (wchar_t ch, const char *locname)
+{
+    char curlocname [256];
+    std::strcpy (curlocname, std::setlocale (LC_CTYPE, 0));
+
+    if (0 == std::setlocale (LC_CTYPE, locname))
+        return UChar (ch);
+
+    char result [MB_LEN_MAX];
+
+#ifndef _RWSTD_NO_WCTOB
+
+    result [0] = std::wctob (ch);
+
+#elif !defined (_RWSTD_NO_WCTOMB)
+
+    if (1 != std::wctomb (result, ch))
+        result [0] = '\377';
+
+#else
+
+    result [0] = char (ch);
+
+#endif   // _RWSTD_NO_WCTOB, _RWSTD_NO_WCTOMB
+
+    if (locname)
+        std::setlocale (LC_CTYPE, curlocname);
+
+    return result [0];
+}
+
+bool cond3 (std::ctype_base::mask mask, wchar_t ch, const char *locname)
+{
+    char curlocname [256];
+    std::strcpy (curlocname, std::setlocale (LC_CTYPE, 0));
+
+    if (0 == std::setlocale (LC_CTYPE, locname))
+        return false;
+
+#ifndef _RWSTD_NO_WCTOB
+
+    const int byte = std::wctob (ch);
+
+#elif !defined (_RWSTD_NO_WCTOMB)
+
+    char buf [MB_LEN_MAX];
+    const int byte = 1 == std::wctomb (buf, ch) ? buf [0] : EOF;
+
+#else
+
+    const int byte = EOF;
+
+#endif   // _RWSTD_NO_WCTOB, _RWSTD_NO_WCTOMB
+
+    const bool result =
+        EOF == byte || !libc_is (mask, char (byte), 0) || libc_is (mask, ch, 0);
+
+    std::setlocale (LC_CTYPE, curlocname);
+
+    return result;
+}
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+/**************************************************************************/
+
+template <class charT>
+void test_narrow_widen (charT, const char *cname)
+{
+    // 22.2.1.1.2, p11 requires that the conditions below hold for all
+    // facets ctc and ct whose types are ctype<char> and ctype<charT>,
+    // respectively:
+
+    // [1] (ctc.is (M, c) || !ct.is (M, ctc.do_widen (c))) holds for
+    //     all narrow characters c
+    //     i.e., narrow characters that are NOT members of a certain
+    //     category may not belong to the same category when widened
+    //     Note: this implies that some sort of code conversion may
+    //     be necessary in order to implement a conforming do_widen()
+
+    // 22.2.1.1.2, p13 requires that:
+    // [2] (ct.do_widen (ct.do_narrow (c, dfault)) == c) holds unless
+    //     (ct.do_narrow (c, dfault) == dfault) holds
+    // [3] (ct.is (M, c) || !ctc.is (M, ct.do_narrow (c, dfault))) holds
+    //     unless (ct.do_narrow(c, dfault) == dfault) holds
+    //
+    //     C99: each of the iswxxx() functions returns true for each
+    //     wide character that corresponds (as if by a call to the
+    //     wctob() function) to a single-byte character for which the
+    //     corresponding character classification function from 7.4.1
+    //     returns true, except that the iswgraph() and iswpunct()
+    //     functions may differ with respect to wide characters other
+    //     than L' ' that are both printing and white-space wide
+    //     characters.
+    //
+    // [4] (ct.do_narrow (c, default) - '0') evaluates to the digit
+    //     value of the character for all c for which ct.is(digit, c)
+    //     returns true
+
+    rw_info (0, 0, __LINE__,
+             "std::ctype<%s>::narrow(%1$s), widen(char)",
+             cname);
+
+    rw_info (0, 0, __LINE__,
+             "std::ctype<%s>::narrow(const %1$s*, const %1$s*, char*), "
+             "widen(const char*, const char*, %1$s*)", cname);
+
+#define STR(x) #x
+
+    // verify condition [1] above; if it fails, verify that
+    // the same condition also fails to hold when using the
+    // corresponding libc functions
+#define COND1(what)                                             \
+  if (!(ctc.is (what, c) || !ctp.is (what, ctp.widen (c)))) {   \
+      rw_assert (!cond1 (what, c, locname), 0, __LINE__,        \
+                 "ctype<char>::is (" STR (what) ", %{#lc})"     \
+                 " || !ctype<%1$s>::is (" STR (what) ", "       \
+                 "ctype<%s>::widen (%{#lc}) = %{#lc})"          \
+                 " returned false in locale(%#s)",              \
+                 c, cname, c, ctp.widen (c), locname);          \
+  } else (void)0
+
+    // verify condition [3] above; if it fails, verify that
+    // the same condition also fails to hold when using the
+    // corresponding libc functions
+#define COND3(what)                                                         \
+  if (   ctp.narrow (ch, dfault) != dfault                                  \
+      && !(ctp.is (what, ch) || !ctc.is (what, ctp.narrow (ch, dfault)))) { \
+      rw_assert (!cond3 (what, ch, locname), 0, __LINE__,                   \
+                 "ctype<%s>::is (" STR (what) ", %{#lc})"                   \
+                 " || !ctype<char>::is (" STR (what) ", "                   \
+                 "ctype<%1$s>::narrow (%{#lc}, %{#c}) = %{#lc})"            \
+                 " returned false in locale(%#s)", cname, ch,               \
+                 ch, dfault, ctp.narrow (ch, '\0'),                         \
+                 locname);                                                  \
+  } else (void)0
+
+
+    char c_locname [256];
+    std::strcpy (c_locname, std::setlocale (LC_ALL, 0));
+
+    BEGIN_LOCALE_LOOP (UCHAR_MAX, locname, i) {
+
+#if defined (_RWSTD_OS_SUNOS) && _RWSTD_OS_MAJOR == 5 && _RWSTD_OS_MINOR <= 10
+
+        // avoid a libc SIGSEGV in mbtowc() in zh_HK and zh_TW
+        // locales encoded using the BIG5 codeset (see bug #603)
+        if (   0 == std::strncmp ("zh_HK.BIG5", locname, 10)
+            || 0 == std::strncmp ("zh_TW.BIG5", locname, 10))
+            continue;
+
+#endif   // SunOS < 5.10
+
+        {
+            // verify that the global C locale stays unchanged
+            const char* const curlocname = std::setlocale (LC_ALL, 0);
+
+            rw_assert (!std::strcmp (c_locname, curlocname), 0, __LINE__,
+                       "setlocale(LC_ALL, 0) == \"%s\", got \"%s\"",
+                       c_locname, curlocname);
+        }
+
+        const char  c  = char (i);
+        const charT ch = charT (i);
+
+        // verify that condition [1] holds
+        COND1 (ALPHA);
+        COND1 (CNTRL);
+        COND1 (DIGIT);
+        COND1 (GRAPH);
+        COND1 (LOWER);
+        COND1 (PRINT);
+        COND1 (PUNCT);
+        COND1 (SPACE);
+        COND1 (UPPER);
+        COND1 (XDIGIT);
+
+        // verify that condition [2] holds
+        char dfault = c ? '\0' : '\1';
+        const charT ret = ctp.widen (ctp.narrow (ch, dfault));
+
+        if (ret != charT (dfault) && ret != ch) {
+            rw_assert (ch != widen (ch, narrow (ch, locname), locname),
+                       0, __LINE__,
+                       "ctype<%s>::widen (ctype<%1$s>::narrow "
+                       "(%{#lc}, %{#c})) == %{#c}; got %{#c} "
+                       "in locale (%#s)",
+                       cname, ch, dfault, ch, ret, locname);
+        }
+
+        // finally verify that condition [3] holds
+        COND3 (ALPHA);
+        COND3 (CNTRL);
+        COND3 (DIGIT);
+        COND3 (GRAPH);
+        COND3 (LOWER);
+        COND3 (PRINT);
+        COND3 (PUNCT);
+        COND3 (SPACE);
+        COND3 (UPPER);
+        COND3 (XDIGIT);
+
+        // now perform a relitively simple sanity check on the 3-argument
+        // overloads of narrow() and widen(). Make sure that the 3-argument
+        // overloads return the same value that the other overload produces
+        // Only do this the first time through the locale list.
+
+        if (i == 0) {
+            // arrays of all tested narrow and wide characters
+            charT wide_chars   [UCHAR_MAX + 1];
+            char  narrow_chars [UCHAR_MAX + 1];
+            charT narrow_in    [UCHAR_MAX + 1];
+            char  widen_in     [UCHAR_MAX + 1];
+
+            // zero out the last element to allow printing
+            wide_chars   [UCHAR_MAX] = charT ();
+            narrow_chars [UCHAR_MAX] = char ();
+            narrow_in    [UCHAR_MAX] = charT ();
+            widen_in     [UCHAR_MAX] = char ();
+
+            // set the `dfault' character to something unlikely
+            // but other than '\0'
+            dfault = '\377';
+
+            for (unsigned j = 0; j <= UCHAR_MAX; j++) {
+                wide_chars [j]   = ctp.widen (char (j));
+                narrow_chars [j] = ctp.narrow (wide_chars [j], dfault);
+                narrow_in [j]    = ctp.widen (char (j));
+                widen_in [j]     = char (j);
+            }
+
+            charT widen_out [UCHAR_MAX + 1];
+            char narrow_out [UCHAR_MAX + 1];
+
+            widen_out  [UCHAR_MAX] = charT ();
+            narrow_out [UCHAR_MAX] = char ();
+
+            // narrow source buffer into the destination
+            // and compare with expected values
+            ctp.narrow (narrow_in,
+                        narrow_in + UCHAR_MAX + 1,
+                        dfault,
+                        narrow_out);
+
+            bool success =
+                !std::memcmp (narrow_chars, narrow_out, sizeof narrow_chars);
+
+            rw_assert (success, 0, __LINE__,
+                       "ctype<%s>::narrow (%{*.*Ac}\", ... , %{#c}) "
+                       "== %{.*Ac}, got %{.*Ac} in locale (%#s)", cname,
+                       int (sizeof *narrow_in), UCHAR_MAX, narrow_in, dfault,
+                       UCHAR_MAX, narrow_chars, UCHAR_MAX, narrow_out,
+                       locname);
+
+            // widen source buffer into the destination
+            // and compare with expected values
+            ctp.widen (widen_in,
+                       widen_in + UCHAR_MAX + 1,
+                       widen_out);
+
+            success = !std::memcmp (wide_chars, widen_out, sizeof wide_chars);
+
+            rw_assert (success, 0, __LINE__,
+                       "ctype<%s>::widen (%{.*Ac}, ...) == "
+                       "%{*.*Ac}, got %{*.*Ac} in locale (%#s)",
+                       cname, UCHAR_MAX, widen_in,
+                       int (sizeof *wide_chars), UCHAR_MAX, wide_chars,
+                       int (sizeof *wide_chars), UCHAR_MAX, widen_out,
+                       locname);
+        }
+
+    } END_LOCALE_LOOP (locname);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void test_libc (charT, const char *cname)
+{
+    test_narrow_widen (charT (), cname);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void run_test (charT, const char *cname)
+{
+    if (0) {
+        // do a compile time only test on use_facet and has_facet
+        _STD_HAS_FACET (std::ctype_byname<charT>, std::locale ());
+        _STD_USE_FACET (std::ctype_byname<charT>, std::locale ());
+    }
+
+    test_libc (charT (), cname);
+}
+
+/**************************************************************************/
+
+static int
+run_test (int, char**)
+{
+    run_test (char (), "char");
+    run_test (wchar_t (), "wchar_t");
+
+    return 0;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv[])
+{
+    return rw_test (argc, argv, __FILE__,
+                    "lib.category.ctype",
+                    0 /* no comment */,
+                    run_test,
+                    "",
+                    (void*)0   /* sentinel */);
+}
diff --git a/tests/localization/22.locale.ctype.scan.cpp b/tests/localization/22.locale.ctype.scan.cpp
new file mode 100644
index 0000000..413ad00
--- /dev/null
+++ b/tests/localization/22.locale.ctype.scan.cpp
@@ -0,0 +1,855 @@
+/***************************************************************************
+ *
+ * 22.locale.ctype.scan.cpp -  Tests exercising the scan() of ctype facet
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2001-2006 Rogue Wave Software.
+ *
+ **************************************************************************/
+
+// DESCRIPTION: test iterates over the locales installed on a machine,
+//              calling the C character classification functions and
+//              their C++ counterpart(s), comparing the results of
+//              the calls against one another.
+
+
+#include <rw/_defs.h>
+
+#if defined __linux__
+   // on Linux define _XOPEN_SOURCE to get CODESET defined in <langinfo.h>
+#  define _XOPEN_SOURCE   500   /* Single Unix conformance */
+   // bring __int32_t into scope (otherwise <wctype.h> fails to compile)
+#  include <sys/types.h>
+#endif   // __linux__
+
+// see Onyx PR #28150
+#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x540
+#  include <wchar.h>
+#endif // defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x540
+
+#include <locale>
+
+#include <climits>
+#include <clocale>
+#include <cstring>
+#include <cctype>
+#include <cstdio>
+#include <cstdlib>
+#include <cwchar>     // for WEOF, btowc(), wctob()
+#include <cwctype>    // for iswxxx()
+
+
+#if !defined (_MSC_VER)
+#  if !defined (LC_MESSAGES)
+#    define LC_MESSAGES _RWSTD_LC_MESSAGES
+#  endif   // LC_MESSAGES
+#  include <langinfo.h>
+#endif  // _MSC_VER
+
+#include <driver.h>
+#include <file.h>        // for SLASH
+#include <rw_locale.h>   // for rw_locales()
+
+/**************************************************************************/
+
+// the root of the locale directory (RWSTD_LOCALE_ROOT)
+// not set here to avoid Solaris 7 putenv() bug (PR #30017)
+const char* locale_root;
+
+#define NLOOPS         25
+#define MAX_STR_SIZE   16
+
+#define BEGIN_LOCALE_LOOP(num, locname, loop_cntrl)                        \
+   for (const char* locname = rw_locales (LC_CTYPE, 0);                    \
+        locname && *locname; locname += std::strlen (locname) + 1) {       \
+       _TRY {                                                              \
+           const std::locale loc (locname);                                \
+           const std::ctype<char> &ctc =                                   \
+               _STD_USE_FACET (std::ctype<char>, loc);                     \
+           _RWSTD_UNUSED (ctc);                                            \
+           const std::ctype<charT> &ctp =                                  \
+               _STD_USE_FACET (std::ctype<charT>, loc);                    \
+           for (int loop_cntrl = 0; loop_cntrl < int (num); loop_cntrl++)
+
+#define END_LOCALE_LOOP(locname)                                        \
+       }                                                                \
+       _CATCH (...) {                                                   \
+           rw_assert (0, 0, __LINE__,                                   \
+                      "locale (\"%s\") threw an exception", locname);   \
+       }                                                                \
+  }
+
+
+// for notational convenience
+typedef unsigned char UChar;
+
+#define ALPHA   std::ctype_base::alpha
+#define UPPER   std::ctype_base::upper
+#define LOWER   std::ctype_base::lower
+#define DIGIT   std::ctype_base::digit
+#define SPACE   std::ctype_base::space
+#define CNTRL   std::ctype_base::cntrl
+#define PUNCT   std::ctype_base::punct
+#define XDIGIT  std::ctype_base::xdigit
+#define GRAPH   std::ctype_base::graph
+#define PRINT   std::ctype_base::print
+
+
+// wrapper functions for the c library char and wchar_t functions
+int libc_isalpha (char ch)
+{
+    return (std::isalpha)(UChar (ch));
+}
+
+int libc_isspace (char ch)
+{
+    return (std::isspace)(UChar (ch));
+}
+
+int libc_isprint (char ch)
+{
+    return (std::isprint)(UChar (ch));
+}
+
+int libc_iscntrl (char ch)
+{
+    return (std::iscntrl)(UChar (ch));
+}
+
+int libc_isupper (char ch)
+{
+    return (std::isupper)(UChar (ch));
+}
+
+int libc_islower (char ch)
+{
+    return (std::islower)(UChar (ch));
+}
+
+int libc_isdigit (char ch)
+{
+    return (std::isdigit)(UChar (ch));
+}
+
+int libc_ispunct (char ch)
+{
+    return (std::ispunct)(UChar (ch));
+}
+
+int libc_isxdigit (char ch)
+{
+    return (std::isxdigit)(UChar (ch));
+}
+
+int libc_isalnum (char ch)
+{
+    return (std::isalnum)(UChar (ch));
+}
+
+int libc_isgraph (char ch)
+{
+    return (std::isgraph)(UChar (ch));
+}
+
+std::ctype_base::mask libc_mask (int mask, char ch, const char *locname)
+{
+    char curlocname [256];
+
+    if (locname) {
+        std::strcpy (curlocname, std::setlocale (LC_CTYPE, 0));
+
+        if (0 == std::setlocale (LC_CTYPE, locname))
+            return std::ctype_base::mask ();
+    }
+
+    const int c = UChar (ch);
+
+    int result = 0;
+
+    if (mask & ALPHA && (std::isalpha)(c))
+        result |= ALPHA;
+    if (mask & CNTRL && (std::iscntrl)(c))
+        result |= CNTRL;
+    if (mask & DIGIT && (std::isdigit)(c))
+        result |= DIGIT;
+    if (mask & GRAPH && (std::isgraph)(c))
+        result |= GRAPH;
+    if (mask & LOWER && (std::islower)(c))
+        result |= LOWER;
+    if (mask & PRINT && (std::isprint)(c))
+        result |= PRINT;
+    if (mask & PUNCT && (std::ispunct)(c))
+        result |= PUNCT;
+    if (mask & SPACE && (std::isspace)(c))
+        result |= SPACE;
+    if (mask & UPPER && (std::isupper)(c))
+        result |= UPPER;
+    if (mask & XDIGIT && (std::isxdigit)(c))
+        result |= XDIGIT;
+
+    if (locname)
+        std::setlocale (LC_CTYPE, curlocname);
+
+    return std::ctype_base::mask (result);
+}
+
+inline bool libc_is (std::ctype_base::mask mask, char ch, const char *locname)
+{
+    const std::ctype_base::mask m = libc_mask (mask, ch, locname);
+
+    return 0 != (m & mask);
+}
+
+std::size_t c_strlen (const char *s1)
+{
+    return std::strlen (s1);
+}
+
+const char* widen (char *dst, const char *src)
+{
+    if (src == dst || !src || !dst)
+        return src;
+
+    std::memcpy (dst, src, std::strlen (src) + 1);
+    return dst;
+}
+
+
+char widen (char, char ch, const char*)
+{
+    return ch;
+}
+
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+int libc_isalpha (wchar_t ch)
+{
+    return (std::iswalpha)(ch);
+}
+
+int libc_isspace (wchar_t ch)
+{
+    return (std::iswspace)(ch);
+}
+
+int libc_isprint (wchar_t ch)
+{
+    return (std::iswprint)(ch);
+}
+
+int libc_iscntrl (wchar_t ch)
+{
+    return (std::iswcntrl)(ch);
+}
+
+int libc_isupper (wchar_t ch)
+{
+    return (std::iswupper)(ch);
+}
+
+int libc_islower (wchar_t ch)
+{
+    return (std::iswlower)(ch);
+}
+
+int libc_isdigit (wchar_t ch)
+{
+    return (std::iswdigit)(ch);
+}
+
+int libc_ispunct (wchar_t ch)
+{
+    return (std::iswpunct)(ch);
+}
+
+int libc_isxdigit (wchar_t ch)
+{
+    return (std::iswxdigit)(ch);
+}
+
+int libc_isalnum (wchar_t ch)
+{
+    return (std::iswalnum)(ch);
+}
+
+int libc_isgraph (wchar_t ch)
+{
+    return (std::iswgraph)(ch);
+}
+
+wchar_t libc_tolower (wchar_t ch)
+{
+    return (std::towlower)(ch);
+}
+
+wchar_t libc_toupper (wchar_t ch)
+{
+    return (std::towupper)(ch);
+}
+
+std::size_t c_strlen (const wchar_t *s1)
+{
+    return std::wcslen (s1);
+}
+
+
+const wchar_t* widen (wchar_t *dst, const char *src)
+{
+    static wchar_t buf [4096];
+
+    if (!src)
+        return 0;
+
+    if (!dst)
+        dst = buf;
+
+    std::size_t len = std::strlen (src);
+
+    _RWSTD_ASSERT (len < sizeof buf /sizeof *buf);
+
+    len = std::mbstowcs (dst, src, sizeof buf / sizeof *buf);
+
+    if (std::size_t (-1) == len)
+        *dst = 0;
+
+    return dst;
+}
+
+std::ctype_base::mask libc_mask (int mask, wchar_t ch, const char *locname)
+{
+    char curlocname [256];
+
+    if (locname) {
+        std::strcpy (curlocname, std::setlocale (LC_CTYPE, 0));
+
+        if (0 == std::setlocale (LC_CTYPE, locname))
+            return std::ctype_base::mask ();
+    }
+
+    int result = 0;
+
+    if (mask & ALPHA && (std::iswalpha)(ch))
+        result |= ALPHA;
+    if (mask & CNTRL && (std::iswcntrl)(ch))
+        result |= CNTRL;
+    if (mask & DIGIT && (std::iswdigit)(ch))
+        result |= DIGIT;
+    if (mask & GRAPH && (std::iswgraph)(ch))
+        result |= GRAPH;
+    if (mask & LOWER && (std::iswlower)(ch))
+        result |= LOWER;
+    if (mask & PRINT && (std::iswprint)(ch))
+        result |= PRINT;
+    if (mask & PUNCT && (std::iswpunct)(ch))
+        result |= PUNCT;
+    if (mask & SPACE && (std::iswspace)(ch))
+        result |= SPACE;
+    if (mask & UPPER && (std::iswupper)(ch))
+        result |= UPPER;
+    if (mask & XDIGIT && (std::iswxdigit)(ch))
+        result |= XDIGIT;
+
+    if (locname)
+        std::setlocale (LC_CTYPE, curlocname);
+
+    return std::ctype_base::mask (result);
+}
+
+bool libc_is (std::ctype_base::mask mask, wchar_t ch, const char *locname)
+{
+    const std::ctype_base::mask m = libc_mask (mask, ch, locname);
+
+    return 0 != (m & mask);
+}
+
+wchar_t widen (wchar_t, char ch, const char *locname)
+{
+    char curlocname [256];
+    std::strcpy (curlocname, std::setlocale (LC_CTYPE, 0));
+
+    if (0 == std::setlocale (LC_CTYPE, locname))
+        return UChar (ch);
+
+    wchar_t result;
+
+#ifndef _RWSTD_NO_BTOWC
+
+    result = std::btowc (UChar (ch));
+
+#elif !defined (_RWSTD_NO_MBTOWC)
+
+    if (1 != std::mbtowc (&result, &ch, 1))
+        result = wchar_t (WEOF);
+
+#else
+
+    result = UChar (ch);
+
+#endif   // _RWSTD_NO_BTOWC, _RWSTD_NO_MBTOWC
+
+    if (locname)
+        std::setlocale (LC_CTYPE, curlocname);
+
+    return result;
+}
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+
+template <class charT>
+void gen_str (charT *str, std::size_t size)
+{
+    // generate a random string with the given size
+    // we do not attempt to check that the size is within the
+    // valid range for the string.
+
+    for (std::size_t i = 0; i < size; i++){
+        str [i] = UChar (std::rand () % UCHAR_MAX);
+        // only increment if we are not going to roll over
+        if (str [i] != charT (UCHAR_MAX - 1U))
+            ++str [i];
+    }
+
+    str [size] = charT ();
+
+    _RWSTD_ASSERT (c_strlen (str) == size);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void test_scan (charT, const char *cname)
+{
+    rw_info (0, 0, __LINE__, "std::ctype<%s>::scan_is(), scan_not()", cname);
+
+    charT str [MAX_STR_SIZE + 1];
+
+    BEGIN_LOCALE_LOOP (NLOOPS, locname, j) {
+
+        const std::size_t size = std::size_t (j % MAX_STR_SIZE);
+
+        // generate a random string
+        gen_str (str, size);
+
+        // set the global C locale to default to make sure
+        // the C++ library does not asume a set value
+        std::setlocale (LC_CTYPE, "");
+
+        // call scan_is and scan_not using each mask and compare it to
+        // the results found when using the c library
+
+        const charT* alpha_is   = ctp.scan_is  (ALPHA,  str, str + size);
+        const charT* alpha_not  = ctp.scan_not (ALPHA,  str, str + size);
+        const charT* space_is   = ctp.scan_is  (SPACE,  str, str + size);
+        const charT* space_not  = ctp.scan_not (SPACE,  str, str + size);
+        const charT* print_is   = ctp.scan_is  (PRINT,  str, str + size);
+        const charT* print_not  = ctp.scan_not (PRINT,  str, str + size);
+        const charT* cntrl_is   = ctp.scan_is  (CNTRL,  str, str + size);
+        const charT* cntrl_not  = ctp.scan_not (CNTRL,  str, str + size);
+        const charT* upper_is   = ctp.scan_is  (UPPER,  str, str + size);
+        const charT* upper_not  = ctp.scan_not (UPPER,  str, str + size);
+        const charT* lower_is   = ctp.scan_is  (LOWER,  str, str + size);
+        const charT* lower_not  = ctp.scan_not (LOWER,  str, str + size);
+        const charT* digit_is   = ctp.scan_is  (DIGIT,  str, str + size);
+        const charT* digit_not  = ctp.scan_not (DIGIT,  str, str + size);
+        const charT* punct_is   = ctp.scan_is  (PUNCT,  str, str + size);
+        const charT* punct_not  = ctp.scan_not (PUNCT,  str, str + size);
+        const charT* xdigit_is  = ctp.scan_is  (XDIGIT, str, str + size);
+        const charT* xdigit_not = ctp.scan_not (XDIGIT, str, str + size);
+
+        // set the global C locale to locname for the C library call
+        std::setlocale (LC_CTYPE, locname);
+
+        // find the first character in the string that is of the specified
+        // type
+        charT first = 0;
+        charT first_not = 0;
+        _RWSTD_SIZE_T i;
+        int success;
+
+#define SCAN(what)                                                      \
+        for (i = 0; i < size; i++) {                                    \
+            if (libc_is##what (str [i])) {                              \
+                first = (str [i]);                                      \
+                break;                                                  \
+            }                                                           \
+        }                                                               \
+        success =    what##_is != (str + size) || 0 == first            \
+                  || *what##_is != first;                               \
+        rw_assert (success, 0, __LINE__,                                \
+                   "ctype<%s>::scan_is(" #what ", %{#lc}) "             \
+                   "== %{*Ac}, got %{*Ac} in locale (%#s)",             \
+                   cname, int (sizeof *str), first,                     \
+                   int (sizeof *what##_is), what##_is,                  \
+                   locname);                                            \
+                                                                        \
+        first = 0;                                                      \
+        for (i = 0; i < size; i++) {                                    \
+            if (!libc_is##what (str[i])) {                              \
+                first_not = (str[i]);                                   \
+                break;                                                  \
+            }                                                           \
+        }                                                               \
+        success =    what##_not != (str + size) || 0 == first_not       \
+                  || *what##_not == first_not;                          \
+        rw_assert (success, 0, __LINE__,                                \
+                   "ctype<%s>::scan_not(" #what ", %{#lc}) "            \
+                   "== %{*Ac}, got %{*Ac} in locale (%#s)",             \
+                   cname, int (sizeof *str), first,                     \
+                   int (sizeof *what##_not), what##_not,                \
+                   locname);                                            \
+                                                                        \
+        first_not = 0
+
+        // test all classes of characters
+        SCAN (alpha);
+        SCAN (space);
+        SCAN (print);
+        SCAN (cntrl);
+        SCAN (upper);
+        SCAN (lower);
+        SCAN (digit);
+        SCAN (punct);
+        SCAN (xdigit);
+
+    } END_LOCALE_LOOP (locname);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void test_libc (charT, const char *cname)
+{
+    test_scan (charT (), cname);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void test_libstd_scan_is (charT, const char *cname,
+                          const std::ctype<charT> &ct,
+                          const char* str, std::ctype_base::mask mask,
+                          int expected_idx, int fwiden = 0)
+{
+    // convert narrow string to a (possibly) wide representation
+    charT  wstrbuf [256];
+    charT* wstr = wstrbuf;
+
+    // If instructed to use the facet widen method, do so, otherwise
+    // use widen helper function that in turn uses C lib mbstowcs
+    if (fwiden == 0)
+        widen (wstrbuf, str);
+    else
+        ct.widen (str, str + std::strlen (str), wstrbuf);
+
+    const int success =
+        &wstr [expected_idx] == ct.scan_is (mask, wstr, wstr + c_strlen (wstr));
+
+    rw_assert (success, 0, __LINE__,
+               "ctype<%s>::scan_is() returned an unexpected value",
+               cname);
+
+}
+
+/**************************************************************************/
+
+template <class charT>
+void test_libstd_scan_not (charT, const char *cname,
+                           const std::ctype<charT> &ct,
+                           const char* str, std::ctype_base::mask mask,
+                           int expected_idx, int fwiden = 0)
+{
+    // convert narrow string to a (possibly) wide representation
+    charT  wstrbuf [256];
+    charT* wstr = wstrbuf;
+
+    // If instructed to use the facet widen method, do so, otherwise
+    // use widen helper function that in turn uses C lib mbstowcs
+    if (fwiden == 0)
+        widen (wstrbuf, str);
+    else
+        ct.widen (str, str + std::strlen (str), wstrbuf);
+
+    const int success =
+        &wstr[expected_idx] == ct.scan_not (mask, wstr, wstr + c_strlen (wstr));
+
+    rw_assert (success, 0, __LINE__,
+               "ctype<%s>::scan_not() returned an unexpected value",
+               cname);
+
+}
+
+/**************************************************************************/
+
+template <class charT>
+void test_libstd (charT, const char *cname)
+{
+    const char cmap_1[] = {
+        "<code_set_name> \"ANSI_X3.4-1968\"\n"
+        "<mb_cur_max> 1\n"
+        "<mb_cur_min> 1\n"
+        "CHARMAP\n"
+        "<U0000> \\x00\n"
+        "<U0001> \\x01\n"
+        "<U0002> \\x02\n"
+        "<U0003> \\x03\n"
+        "<U0004> \\x04\n"
+        "<U0005> \\x05\n"
+        "<U0006> \\x06\n"
+        "<U0007> \\x07\n"
+        "<U0008> \\x08\n"
+        "<U0009> \\x09\n"
+        "<U000a> \\x0a\n"
+        "<U000b> \\x0b\n"
+        "<U000c> \\x0c\n"
+        "<U000d> \\x0d\n"
+        "<U000e> \\x0e\n"
+        "<U000f> \\x0f\n"
+        "<U0010> \\x10\n"
+        "<U0011> \\x11\n"
+        "<U0012> \\x12\n"
+        "<U0013> \\x13\n"
+        "<U0014> \\x14\n"
+        "<U0015> \\x15\n"
+        "<U0016> \\x16\n"
+        "<U0017> \\x17\n"
+        "<U0018> \\x18\n"
+        "<U0019> \\x19\n"
+        "<U001a> \\x1a\n"
+        "<U001b> \\x1b\n"
+        "<U001c> \\x1c\n"
+        "<U001d> \\x1d\n"
+        "<U001e> \\x1e\n"
+        "<U001f> \\x1f\n"
+        "<U0020> \\x20\n"
+        "<U0021> \\x21\n"
+        "<U0022> \\x22\n"
+        "<U0023> \\x23\n"
+        "<U0024> \\x24\n"
+        "<U0025> \\x25\n"
+        "<U0026> \\x26\n"
+        "<U0027> \\x27\n"
+        "<U0028> \\x28\n"
+        "<U0029> \\x29\n"
+        "<U002a> \\x2a\n"
+        "<U002b> \\x2b\n"
+        "<U002c> \\x2c\n"
+        "<U002d> \\x2d\n"
+        "<U002e> \\x2e\n"
+        "<U002f> \\x2f\n"
+        "<U0030> \\x30\n"
+        "<U0031> \\x31\n"
+        "<U0032> \\x32\n"
+        "<U0033> \\x33\n"
+        "<U0034> \\x34\n"
+        "<U0035> \\x35\n"
+        "<U0036> \\x36\n"
+        "<U0037> \\x37\n"
+        "<U0038> \\x38\n"
+        "<U0039> \\x39\n"
+        "<U003a> \\x3a\n"
+        "<U003b> \\x3b\n"
+        "<U003c> \\x3c\n"
+        "<U003d> \\x3d\n"
+        "<U003e> \\x3e\n"
+        "<U003f> \\x3f\n"
+        "<U0040> \\x40\n"
+        "<U0041> \\x41\n"
+        "<U0042> \\x42\n"
+        "<U0043> \\x43\n"
+        "<U0044> \\x44\n"
+        "<U0045> \\x45\n"
+        "<U0046> \\x46\n"
+        "<U0047> \\x47\n"
+        "<U0048> \\x48\n"
+        "<U0049> \\x49\n"
+        "<U004a> \\x4a\n"
+        "<U004b> \\x4b\n"
+        "<U004c> \\x4c\n"
+        "<U004d> \\x4d\n"
+        "<U004e> \\x4e\n"
+        "<U004f> \\x4f\n"
+        "<U0050> \\x50\n"
+        "<U0051> \\x51\n"
+        "<U0052> \\x52\n"
+        "<U0053> \\x53\n"
+        "<U0054> \\x54\n"
+        "<U0055> \\x55\n"
+        "<U0056> \\x56\n"
+        "<U0057> \\x57\n"
+        "<U0058> \\x58\n"
+        "<U0059> \\x59\n"
+        "<U005a> \\x5a\n"
+        "<U005b> \\x5b\n"
+        "<U005c> \\x5c\n"
+        "<U005d> \\x5d\n"
+        "<U005e> \\x5e\n"
+        "<U005f> \\x5f\n"
+        "<U0060> \\x60\n"
+        "<U0061> \\x61\n"
+        "<U0062> \\x62\n"
+        "<U0063> \\x63\n"
+        "<U0064> \\x64\n"
+        "<U0065> \\x65\n"
+        "<U0066> \\x66\n"
+        "<U0067> \\x67\n"
+        "<U0068> \\x68\n"
+        "<U0069> \\x69\n"
+        "<U006a> \\x6a\n"
+        "<U006b> \\x6b\n"
+        "<U006c> \\x6c\n"
+        "<U006d> \\x6d\n"
+        "<U006e> \\x6e\n"
+        "<U006f> \\x6f\n"
+        "<U0070> \\x70\n"
+        "<U0071> \\x71\n"
+        "<U0072> \\x72\n"
+        "<U0073> \\x73\n"
+        "<U0074> \\x74\n"
+        "<U0075> \\x75\n"
+        "<U0076> \\x76\n"
+        "<U0077> \\x77\n"
+        "<U0078> \\x78\n"
+        "<U0079> \\x79\n"
+        "<U007a> \\x7a\n"
+        "<U007b> \\x7b\n"
+        "<U007c> \\x7c\n"
+        "<U007d> \\x7d\n"
+        "<U007e> \\x7e\n"
+        "<U007f> \\x7f\n"
+        "<U1000> \\xa0\n"
+        "<U1001> \\xa1\n"
+        "<U1002> \\xa2\n"
+        "END CHARMAP\n"
+    };
+
+    const char loc_1[] = {
+        "escape_char /\n"
+        "LC_CTYPE\n"
+        "#     <A>     <B>     <C>     MYANMAR LETTER KHA\n"
+        "upper <U0041>;<U0042>;<U0043>;<U1001>\n"
+        "      <a>     <b>     <c>     MYANMAR LETTER KA\n"
+        "lower <U0061>;<U0062>;<U0063>;<U1000>\n"
+        "alpha <U0061>;<U0062>;<U0063>;<U0041>;"
+              "<U0042>;<U0043>;<U1000>;<U1001>\n"
+        "digit <U0031>;<U0032>;<U0033>;<U1002>\n"
+        "space <U0020>\n"
+        "cntrl <U0000>\n"
+        "      <!>      <\">\n"
+        "punct <U0021>; <U0022>\n"
+        "graph <U0041>;<U0042>;<U0043>;<U0061>;<U0062>;<U0063>;"
+              "<U1000>;<U1001>;<U1002>;<U1003>;<U1004>;<U1005>;"
+              "<U0031>;<U0032>;<U0033>;<U0020>;<U0021>;<U0022>\n"
+        "print <U0041>;<U0042>;<U0043>;"
+              "<U0061>;<U0062>;<U0063>;"
+              "<U1000>;<U1001>;<U1002>;<U1003>;<U1004>;<U1005>;"
+              "<U0031>;<U0032>;<U0033>;<U0020>;<U0021>;<U0022>\n"
+        "xdigit <U0041>;<U0042>;<U0043>;<U0061>;<U0062>;"
+               "<U0063>;<U0031>;<U0032>;<U0033>\n"
+        "END LC_CTYPE\n"
+    };
+
+    //invoke rw_create_locale to build a locale to test with
+    const char* const locname = rw_create_locale (cmap_1, loc_1);
+
+    if (!rw_error (0 != locname, 0, __LINE__,
+                   "failed to create a locale in %s", locale_root))
+        return;
+
+    const std::locale loc (locname);
+
+    const std::ctype<charT> &ct =
+        _STD_USE_FACET (std::ctype<charT>, loc);
+
+    ct._C_opts |=  ct._C_use_libstd;
+    ct._C_opts &= ~ct._C_use_libc;
+
+    // now check the scan functions
+    rw_info (0, 0, __LINE__,
+             "std::ctype<%s>::scan_is(const %1$s*, const %1$s, mask*) "
+             "in locale(%#s)", cname, locname);
+
+    test_libstd_scan_is (charT (), cname, ct, "abc1BC",   DIGIT, 3);
+    test_libstd_scan_is (charT (), cname, ct, "abc123B ", SPACE, 7);
+    test_libstd_scan_is (charT (), cname, ct, "abc123",   LOWER, 0);
+    test_libstd_scan_is (charT (), cname, ct, "abc123",   UPPER, 6);
+    test_libstd_scan_is (charT (), cname, ct, "abc1ABC",  DIGIT | UPPER, 3);
+    test_libstd_scan_is (charT (), cname, ct, "abcA2BC",  DIGIT | UPPER, 3);
+
+    if (sizeof(charT) > 1) {
+        test_libstd_scan_is (charT (), cname, ct, "ABC\xa0xyz", LOWER, 3, 1);
+        test_libstd_scan_is (charT (), cname, ct, "abcx\xa1yz", UPPER, 4, 1);
+    }
+
+    rw_info (0, 0, __LINE__,
+             "std::ctype<%s>::scan_not(const %1$s*, const %1$s, mask*) "
+             "in locale(%#s)", cname, locname);
+
+    test_libstd_scan_not (charT (), cname, ct, "abc1BC", ALPHA, 3);
+    test_libstd_scan_not (charT (), cname, ct, "aaBBcc", LOWER, 2);
+    test_libstd_scan_not (charT (), cname, ct, "abc1BC", DIGIT, 0);
+    test_libstd_scan_not (charT (), cname, ct, "abc1BC", PRINT, 6);
+
+    if (sizeof(charT) > 1) {
+        test_libstd_scan_not (charT (), cname, ct, "abc\xa2xyz", ALPHA, 3, 1);
+        test_libstd_scan_not (charT (), cname, ct, "123\xa1yz ", DIGIT, 3, 1);
+    }
+}
+
+/**************************************************************************/
+
+template <class charT>
+void run_test (charT, const char *cname)
+{
+    if (0) {
+        // do a compile time only test on use_facet and has_facet
+        _STD_HAS_FACET (std::ctype_byname<charT>, std::locale ());
+        _STD_USE_FACET (std::ctype_byname<charT>, std::locale ());
+    }
+
+    test_libstd (charT (), cname);
+    test_libc (charT (), cname);
+}
+
+/**************************************************************************/
+
+static int
+run_test (int, char**)
+{
+    run_test (char (), "char");
+    run_test (wchar_t (), "wchar_t");
+
+    return 0;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv[])
+{
+    return rw_test (argc, argv, __FILE__,
+                    "lib.category.ctype",
+                    0 /* no comment */,
+                    run_test,
+                    "",
+                    (void*)0   /* sentinel */);
+}
diff --git a/tests/localization/22.locale.ctype.tolower.cpp b/tests/localization/22.locale.ctype.tolower.cpp
new file mode 100644
index 0000000..147b054
--- /dev/null
+++ b/tests/localization/22.locale.ctype.tolower.cpp
@@ -0,0 +1,488 @@
+/***************************************************************************
+ *
+ * 22.locale.ctype.tolower.cpp - Tests exercising the tolower() of ctype facet
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2001-2006 Rogue Wave Software.
+ *
+ **************************************************************************/
+
+// DESCRIPTION: test iterates over the locales installed on a machine,
+//              calling the C character classification functions and
+//              their C++ counterpart(s), comparing the results of
+//              the calls against one another.
+
+
+#include <rw/_defs.h>
+
+#if defined __linux__
+   // on Linux define _XOPEN_SOURCE to get CODESET defined in <langinfo.h>
+#  define _XOPEN_SOURCE   500   /* Single Unix conformance */
+   // bring __int32_t into scope (otherwise <wctype.h> fails to compile)
+#  include <sys/types.h>
+#endif   // __linux__
+
+// see Onyx PR #28150
+#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x540
+#  include <wchar.h>
+#endif // defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x540
+
+#include <locale>
+
+#include <climits>
+#include <clocale>
+#include <cstring>
+#include <cctype>
+#include <cstdio>
+#include <cstdlib>
+#include <cwchar>     // for WEOF, btowc(), wctob()
+#include <cwctype>    // for iswxxx()
+
+
+#if !defined (_MSC_VER)
+#  if !defined (LC_MESSAGES)
+#    define LC_MESSAGES _RWSTD_LC_MESSAGES
+#  endif   // LC_MESSAGES
+#  include <langinfo.h>
+#endif  // _MSC_VER
+
+#include <driver.h>
+#include <file.h>        // for SLASH
+#include <rw_locale.h>   // for rw_locales()
+
+/**************************************************************************/
+
+// the root of the locale directory (RWSTD_LOCALE_ROOT)
+// not set here to avoid Solaris 7 putenv() bug (PR #30017)
+const char* locale_root;
+
+#define NLOOPS         25
+#define MAX_STR_SIZE   16
+
+#define BEGIN_LOCALE_LOOP(num, locname, loop_cntrl)                        \
+   for (const char* locname = rw_locales (LC_CTYPE, 0);                    \
+        locname && *locname; locname += std::strlen (locname) + 1) {       \
+       _TRY {                                                              \
+           const std::locale loc (locname);                                \
+           const std::ctype<char> &ctc =                                   \
+               _STD_USE_FACET (std::ctype<char>, loc);                     \
+           _RWSTD_UNUSED (ctc);                                            \
+           const std::ctype<charT> &ctp =                                  \
+               _STD_USE_FACET (std::ctype<charT>, loc);                    \
+           for (int loop_cntrl = 0; loop_cntrl < int (num); loop_cntrl++)
+
+#define END_LOCALE_LOOP(locname)                                        \
+       }                                                                \
+       _CATCH (...) {                                                   \
+           rw_assert (0, 0, __LINE__,                                   \
+                      "locale (\"%s\") threw an exception", locname);   \
+       }                                                                \
+  }
+
+
+// for notational convenience
+typedef unsigned char UChar;
+
+#define ALPHA   std::ctype_base::alpha
+#define UPPER   std::ctype_base::upper
+#define LOWER   std::ctype_base::lower
+#define DIGIT   std::ctype_base::digit
+#define SPACE   std::ctype_base::space
+#define CNTRL   std::ctype_base::cntrl
+#define PUNCT   std::ctype_base::punct
+#define XDIGIT  std::ctype_base::xdigit
+#define GRAPH   std::ctype_base::graph
+#define PRINT   std::ctype_base::print
+
+
+// wrapper functions for the c library char and wchar_t functions
+char libc_tolower (char ch)
+{
+    return std::tolower (UChar (ch));
+}
+
+char libc_toupper (char ch)
+{
+    return (std::toupper)(UChar (ch));
+}
+
+const char* widen (char *dst, const char *src)
+{
+    if (src == dst || !src || !dst)
+        return src;
+
+    std::memcpy (dst, src, std::strlen (src) + 1);
+    return dst;
+}
+
+char widen (char, char ch, const char*)
+{
+    return ch;
+}
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+wchar_t libc_tolower (wchar_t ch)
+{
+    return (std::towlower)(ch);
+}
+
+wchar_t libc_toupper (wchar_t ch)
+{
+    return (std::towupper)(ch);
+}
+
+const wchar_t* widen (wchar_t *dst, const char *src)
+{
+    static wchar_t buf [4096];
+
+    if (!src)
+        return 0;
+
+    if (!dst)
+        dst = buf;
+
+    std::size_t len = std::strlen (src);
+
+    _RWSTD_ASSERT (len < sizeof buf /sizeof *buf);
+
+    len = std::mbstowcs (dst, src, sizeof buf / sizeof *buf);
+
+    if (std::size_t (-1) == len)
+        *dst = 0;
+
+    return dst;
+}
+
+wchar_t widen (wchar_t, char ch, const char *locname)
+{
+    char curlocname [256];
+    std::strcpy (curlocname, std::setlocale (LC_CTYPE, 0));
+
+    if (0 == std::setlocale (LC_CTYPE, locname))
+        return UChar (ch);
+
+    wchar_t result;
+
+#ifndef _RWSTD_NO_BTOWC
+
+    result = std::btowc (UChar (ch));
+
+#elif !defined (_RWSTD_NO_MBTOWC)
+
+    if (1 != std::mbtowc (&result, &ch, 1))
+        result = wchar_t (WEOF);
+
+#else
+
+    result = UChar (ch);
+
+#endif   // _RWSTD_NO_BTOWC, _RWSTD_NO_MBTOWC
+
+    if (locname)
+        std::setlocale (LC_CTYPE, curlocname);
+
+    return result;
+}
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+/**************************************************************************/
+
+template <class charT>
+void test_tolower (charT, const char *cname)
+{
+    rw_info (0, 0, __LINE__, "std::ctype<%s>::tolower(%1$s)", cname);
+
+    BEGIN_LOCALE_LOOP (UCHAR_MAX, locname, i) {
+
+        const charT ch = charT (i);
+
+        // set the global C locale to locname for the C library call
+        std::setlocale (LC_CTYPE, locname);
+
+        const charT lch = libc_tolower (ch);
+
+        // set the global C locale to default to make sure
+        // the C++ library does not asume a set value
+        std::setlocale (LC_CTYPE, "");
+
+        // exercise tolower using ctype<>::tolower ()
+        rw_assert (lch == (ctp.tolower)(ch), 0, __LINE__,
+                   "ctype<%s>::tolower(%{#lc}) == %{#lc}, got %{#lc} "
+                   "in locale(%#s)",
+                   cname, ch, lch, (ctp.tolower)(ch), locname);
+
+        // exercise tolower using tolower (char, locale)
+        rw_assert (lch == (charT)(std::tolower)(ch, loc), 0, __LINE__,
+                   "tolower<%s>(%{#lc}, locale(%#s)) == %{#lc}, got %{#lc}",
+                   cname, ch, locname, lch, (std::tolower)(ch, loc));
+    } END_LOCALE_LOOP (locname);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void test_libc (charT, const char *cname)
+{
+    test_tolower (charT (), cname);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void test_libstd_tolower (charT, const char *cname,
+                                  const std::ctype<charT> &ct,
+                                  const char *locname)
+{
+    rw_info (0, 0, __LINE__,
+             "std::ctype<%s>::tolower(%1$s) in locale(%#s)",
+             cname, locname);
+
+    int success;
+
+#undef TEST
+#define TEST(lower, upper)                                              \
+    success = ct.widen (lower) == ct.tolower (ct.widen (upper));        \
+    rw_assert (success, 0, __LINE__,                                    \
+               "ctype<%s>::tolower(%d) == %d, got %d",                  \
+               cname, upper, lower, ct.tolower((charT)upper))
+
+    TEST ('a', 'A');
+    TEST ('b', 'B');
+    TEST ('c', 'C');
+
+    if (sizeof(charT) > 1)
+        TEST ('\xa0', '\xa1');
+
+#undef TEST
+}
+
+/**************************************************************************/
+
+template <class charT>
+void test_libstd (charT, const char *cname)
+{
+    const char cmap_1[] = {
+        "<code_set_name> \"ANSI_X3.4-1968\"\n"
+        "<mb_cur_max> 1\n"
+        "<mb_cur_min> 1\n"
+        "CHARMAP\n"
+        "<U0000> \\x00\n"
+        "<U0001> \\x01\n"
+        "<U0002> \\x02\n"
+        "<U0003> \\x03\n"
+        "<U0004> \\x04\n"
+        "<U0005> \\x05\n"
+        "<U0006> \\x06\n"
+        "<U0007> \\x07\n"
+        "<U0008> \\x08\n"
+        "<U0009> \\x09\n"
+        "<U000a> \\x0a\n"
+        "<U000b> \\x0b\n"
+        "<U000c> \\x0c\n"
+        "<U000d> \\x0d\n"
+        "<U000e> \\x0e\n"
+        "<U000f> \\x0f\n"
+        "<U0010> \\x10\n"
+        "<U0011> \\x11\n"
+        "<U0012> \\x12\n"
+        "<U0013> \\x13\n"
+        "<U0014> \\x14\n"
+        "<U0015> \\x15\n"
+        "<U0016> \\x16\n"
+        "<U0017> \\x17\n"
+        "<U0018> \\x18\n"
+        "<U0019> \\x19\n"
+        "<U001a> \\x1a\n"
+        "<U001b> \\x1b\n"
+        "<U001c> \\x1c\n"
+        "<U001d> \\x1d\n"
+        "<U001e> \\x1e\n"
+        "<U001f> \\x1f\n"
+        "<U0020> \\x20\n"
+        "<U0021> \\x21\n"
+        "<U0022> \\x22\n"
+        "<U0023> \\x23\n"
+        "<U0024> \\x24\n"
+        "<U0025> \\x25\n"
+        "<U0026> \\x26\n"
+        "<U0027> \\x27\n"
+        "<U0028> \\x28\n"
+        "<U0029> \\x29\n"
+        "<U002a> \\x2a\n"
+        "<U002b> \\x2b\n"
+        "<U002c> \\x2c\n"
+        "<U002d> \\x2d\n"
+        "<U002e> \\x2e\n"
+        "<U002f> \\x2f\n"
+        "<U0030> \\x30\n"
+        "<U0031> \\x31\n"
+        "<U0032> \\x32\n"
+        "<U0033> \\x33\n"
+        "<U0034> \\x34\n"
+        "<U0035> \\x35\n"
+        "<U0036> \\x36\n"
+        "<U0037> \\x37\n"
+        "<U0038> \\x38\n"
+        "<U0039> \\x39\n"
+        "<U003a> \\x3a\n"
+        "<U003b> \\x3b\n"
+        "<U003c> \\x3c\n"
+        "<U003d> \\x3d\n"
+        "<U003e> \\x3e\n"
+        "<U003f> \\x3f\n"
+        "<U0040> \\x40\n"
+        "<U0041> \\x41\n"
+        "<U0042> \\x42\n"
+        "<U0043> \\x43\n"
+        "<U0044> \\x44\n"
+        "<U0045> \\x45\n"
+        "<U0046> \\x46\n"
+        "<U0047> \\x47\n"
+        "<U0048> \\x48\n"
+        "<U0049> \\x49\n"
+        "<U004a> \\x4a\n"
+        "<U004b> \\x4b\n"
+        "<U004c> \\x4c\n"
+        "<U004d> \\x4d\n"
+        "<U004e> \\x4e\n"
+        "<U004f> \\x4f\n"
+        "<U0050> \\x50\n"
+        "<U0051> \\x51\n"
+        "<U0052> \\x52\n"
+        "<U0053> \\x53\n"
+        "<U0054> \\x54\n"
+        "<U0055> \\x55\n"
+        "<U0056> \\x56\n"
+        "<U0057> \\x57\n"
+        "<U0058> \\x58\n"
+        "<U0059> \\x59\n"
+        "<U005a> \\x5a\n"
+        "<U005b> \\x5b\n"
+        "<U005c> \\x5c\n"
+        "<U005d> \\x5d\n"
+        "<U005e> \\x5e\n"
+        "<U005f> \\x5f\n"
+        "<U0060> \\x60\n"
+        "<U0061> \\x61\n"
+        "<U0062> \\x62\n"
+        "<U0063> \\x63\n"
+        "<U0064> \\x64\n"
+        "<U0065> \\x65\n"
+        "<U0066> \\x66\n"
+        "<U0067> \\x67\n"
+        "<U0068> \\x68\n"
+        "<U0069> \\x69\n"
+        "<U006a> \\x6a\n"
+        "<U006b> \\x6b\n"
+        "<U006c> \\x6c\n"
+        "<U006d> \\x6d\n"
+        "<U006e> \\x6e\n"
+        "<U006f> \\x6f\n"
+        "<U0070> \\x70\n"
+        "<U0071> \\x71\n"
+        "<U0072> \\x72\n"
+        "<U0073> \\x73\n"
+        "<U0074> \\x74\n"
+        "<U0075> \\x75\n"
+        "<U0076> \\x76\n"
+        "<U0077> \\x77\n"
+        "<U0078> \\x78\n"
+        "<U0079> \\x79\n"
+        "<U007a> \\x7a\n"
+        "<U007b> \\x7b\n"
+        "<U007c> \\x7c\n"
+        "<U007d> \\x7d\n"
+        "<U007e> \\x7e\n"
+        "<U007f> \\x7f\n"
+        "<U1000> \\xa0\n"
+        "<U1001> \\xa1\n"
+        "<U1002> \\xa2\n"
+        "END CHARMAP\n"
+    };
+
+    const char loc_1[] = {
+        "escape_char /\n"
+        "LC_CTYPE\n"
+        "toupper (<U0061>,<U0041>);(<U0062>,<U0042>);"
+                "(<U0063>,<U0043>);(<U1000>,<U1001>)\n"
+        "tolower (<U0041>,<U0061>);(<U0042>,<U0062>);"
+                "(<U0043>,<U0063>);(<U1001>,<U1000>)\n"
+       	"END LC_CTYPE\n"
+    };
+
+    //invoke rw_create_locale to build a locale to test with
+    const char* const locname = rw_create_locale (cmap_1, loc_1);
+
+    if (!rw_error (0 != locname, 0, __LINE__,
+                   "failed to create a locale in %s", locale_root))
+        return;
+
+    const std::locale loc (locname);
+
+    const std::ctype<charT> &ct =
+        _STD_USE_FACET (std::ctype<charT>, loc);
+
+    ct._C_opts |=  ct._C_use_libstd;
+    ct._C_opts &= ~ct._C_use_libc;
+
+    test_libstd_tolower (charT (), cname, ct, locname);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void run_test (charT, const char *cname)
+{
+    if (0) {
+        // do a compile time only test on use_facet and has_facet
+        _STD_HAS_FACET (std::ctype_byname<charT>, std::locale ());
+        _STD_USE_FACET (std::ctype_byname<charT>, std::locale ());
+    }
+
+    test_libstd (charT (), cname);
+    test_libc (charT (), cname);
+}
+
+/**************************************************************************/
+
+static int
+run_test (int, char**)
+{
+    run_test (char (), "char");
+    run_test (wchar_t (), "wchar_t");
+
+    return 0;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv[])
+{
+    return rw_test (argc, argv, __FILE__,
+                    "lib.category.ctype",
+                    0 /* no comment */,
+                    run_test,
+                    "",
+                    (void*)0   /* sentinel */);
+}
diff --git a/tests/localization/22.locale.ctype.toupper.cpp b/tests/localization/22.locale.ctype.toupper.cpp
new file mode 100644
index 0000000..cb2b10e
--- /dev/null
+++ b/tests/localization/22.locale.ctype.toupper.cpp
@@ -0,0 +1,489 @@
+/***************************************************************************
+ *
+ * 22.locale.ctype.toupper.cpp - Tests exercising the toupper() of ctype facet
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2001-2006 Rogue Wave Software.
+ *
+ **************************************************************************/
+
+// DESCRIPTION: test iterates over the locales installed on a machine,
+//              calling the C character classification functions and
+//              their C++ counterpart(s), comparing the results of
+//              the calls against one another.
+
+
+#include <rw/_defs.h>
+
+#if defined __linux__
+   // on Linux define _XOPEN_SOURCE to get CODESET defined in <langinfo.h>
+#  define _XOPEN_SOURCE   500   /* Single Unix conformance */
+   // bring __int32_t into scope (otherwise <wctype.h> fails to compile)
+#  include <sys/types.h>
+#endif   // __linux__
+
+// see Onyx PR #28150
+#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x540
+#  include <wchar.h>
+#endif // defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x540
+
+#include <locale>
+
+#include <climits>
+#include <clocale>
+#include <cstring>
+#include <cctype>
+#include <cstdio>
+#include <cstdlib>
+#include <cwchar>     // for WEOF, btowc(), wctob()
+#include <cwctype>    // for iswxxx()
+
+
+#if !defined (_MSC_VER)
+#  if !defined (LC_MESSAGES)
+#    define LC_MESSAGES _RWSTD_LC_MESSAGES
+#  endif   // LC_MESSAGES
+#  include <langinfo.h>
+#endif  // _MSC_VER
+
+#include <driver.h>
+#include <file.h>        // for SLASH
+#include <rw_locale.h>   // for rw_locales()
+
+/**************************************************************************/
+
+// the root of the locale directory (RWSTD_LOCALE_ROOT)
+// not set here to avoid Solaris 7 putenv() bug (PR #30017)
+const char* locale_root;
+
+#define NLOOPS         25
+#define MAX_STR_SIZE   16
+
+#define BEGIN_LOCALE_LOOP(num, locname, loop_cntrl)                        \
+   for (const char* locname = rw_locales (LC_CTYPE, 0);                    \
+        locname && *locname; locname += std::strlen (locname) + 1) {       \
+       _TRY {                                                              \
+           const std::locale loc (locname);                                \
+           const std::ctype<char> &ctc =                                   \
+               _STD_USE_FACET (std::ctype<char>, loc);                     \
+           _RWSTD_UNUSED (ctc);                                            \
+           const std::ctype<charT> &ctp =                                  \
+               _STD_USE_FACET (std::ctype<charT>, loc);                    \
+           for (int loop_cntrl = 0; loop_cntrl < int (num); loop_cntrl++)
+
+#define END_LOCALE_LOOP(locname)                                        \
+       }                                                                \
+       _CATCH (...) {                                                   \
+           rw_assert (0, 0, __LINE__,                                   \
+                      "locale (\"%s\") threw an exception", locname);   \
+       }                                                                \
+  }
+
+
+// for notational convenience
+typedef unsigned char UChar;
+
+#define ALPHA   std::ctype_base::alpha
+#define UPPER   std::ctype_base::upper
+#define LOWER   std::ctype_base::lower
+#define DIGIT   std::ctype_base::digit
+#define SPACE   std::ctype_base::space
+#define CNTRL   std::ctype_base::cntrl
+#define PUNCT   std::ctype_base::punct
+#define XDIGIT  std::ctype_base::xdigit
+#define GRAPH   std::ctype_base::graph
+#define PRINT   std::ctype_base::print
+
+
+// wrapper functions for the c library char and wchar_t functions
+char libc_tolower (char ch)
+{
+    return std::tolower (UChar (ch));
+}
+
+char libc_toupper (char ch)
+{
+    return (std::toupper)(UChar (ch));
+}
+
+const char* widen (char *dst, const char *src)
+{
+    if (src == dst || !src || !dst)
+        return src;
+
+    std::memcpy (dst, src, std::strlen (src) + 1);
+    return dst;
+}
+
+
+char widen (char, char ch, const char*)
+{
+    return ch;
+}
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+wchar_t libc_tolower (wchar_t ch)
+{
+    return (std::towlower)(ch);
+}
+
+wchar_t libc_toupper (wchar_t ch)
+{
+    return (std::towupper)(ch);
+}
+
+const wchar_t* widen (wchar_t *dst, const char *src)
+{
+    static wchar_t buf [4096];
+
+    if (!src)
+        return 0;
+
+    if (!dst)
+        dst = buf;
+
+    std::size_t len = std::strlen (src);
+
+    _RWSTD_ASSERT (len < sizeof buf /sizeof *buf);
+
+    len = std::mbstowcs (dst, src, sizeof buf / sizeof *buf);
+
+    if (std::size_t (-1) == len)
+        *dst = 0;
+
+    return dst;
+}
+
+wchar_t widen (wchar_t, char ch, const char *locname)
+{
+    char curlocname [256];
+    std::strcpy (curlocname, std::setlocale (LC_CTYPE, 0));
+
+    if (0 == std::setlocale (LC_CTYPE, locname))
+        return UChar (ch);
+
+    wchar_t result;
+
+#ifndef _RWSTD_NO_BTOWC
+
+    result = std::btowc (UChar (ch));
+
+#elif !defined (_RWSTD_NO_MBTOWC)
+
+    if (1 != std::mbtowc (&result, &ch, 1))
+        result = wchar_t (WEOF);
+
+#else
+
+    result = UChar (ch);
+
+#endif   // _RWSTD_NO_BTOWC, _RWSTD_NO_MBTOWC
+
+    if (locname)
+        std::setlocale (LC_CTYPE, curlocname);
+
+    return result;
+}
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+/**************************************************************************/
+
+template <class charT>
+void test_toupper (charT, const char *cname)
+{
+    rw_info (0, 0, __LINE__, "std::ctype<%s>::toupper(%1$s)", cname);
+
+    BEGIN_LOCALE_LOOP (UCHAR_MAX, locname2, i) {
+
+        const charT ch = charT (i);
+
+        // set the global C locale to the locale name for the C library call
+        std::setlocale (LC_CTYPE, locname2);
+
+        const charT uch = libc_toupper (ch);
+
+        // set the global C locale to default to make sure
+        // the C++ library does not asume a set value
+        std::setlocale (LC_CTYPE, "");
+
+        // exercise toupper using ctype<>::toupper ()
+        rw_assert (uch == (ctp.toupper)(ch), 0, __LINE__,
+                   "ctype<%s>::toupper(%{#lc}) == %{#lc}, got %{#lc} "
+                   "in locale(%#s)",
+                   cname, ch, uch, (ctp.toupper)(ch), locname2);
+
+        // exercise toupper using toupper (char, locale)
+        rw_assert (uch == (charT)(std::toupper)(ch, loc), 0, __LINE__,
+                   "toupper<%s>(%{#lc}, locale(%#s)) == %{#lc}, got %{#lc}",
+                   cname, ch, locname2, uch, (std::toupper)(ch, loc));
+    } END_LOCALE_LOOP (locname2);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void test_libc (charT, const char *cname)
+{
+    test_toupper (charT (), cname);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void test_libstd_toupper (charT, const char *cname,
+                                  const std::ctype<charT> &ct,
+                                  const char *locname)
+{
+    rw_info (0, 0, __LINE__,
+             "std::ctype<%s>::toupper(%1$s) in locale(%#s)",
+             cname, locname);
+
+    int success;
+
+#undef TEST
+#define TEST(lower, upper)                                              \
+    success = ct.widen (upper) == ct.toupper (ct.widen (lower));        \
+    rw_assert (success, 0, __LINE__,                                    \
+               "ctype<%s>::toupper(%d) == %d, got %d", cname,           \
+               lower, upper, ct.toupper((charT)lower));                 
+
+    TEST ('a', 'A');
+    TEST ('b', 'B');
+    TEST ('c', 'C');
+
+    if (sizeof(charT) > 1)
+        TEST ('\xa0', '\xa1');
+
+#undef TEST
+}
+
+/**************************************************************************/
+
+template <class charT>
+void test_libstd (charT, const char *cname)
+{
+        const char cmap_1[] = {
+        "<code_set_name> \"ANSI_X3.4-1968\"\n"
+        "<mb_cur_max> 1\n"
+        "<mb_cur_min> 1\n"
+        "CHARMAP\n"
+        "<U0000> \\x00\n"
+        "<U0001> \\x01\n"
+        "<U0002> \\x02\n"
+        "<U0003> \\x03\n"
+        "<U0004> \\x04\n"
+        "<U0005> \\x05\n"
+        "<U0006> \\x06\n"
+        "<U0007> \\x07\n"
+        "<U0008> \\x08\n"
+        "<U0009> \\x09\n"
+        "<U000a> \\x0a\n"
+        "<U000b> \\x0b\n"
+        "<U000c> \\x0c\n"
+        "<U000d> \\x0d\n"
+        "<U000e> \\x0e\n"
+        "<U000f> \\x0f\n"
+        "<U0010> \\x10\n"
+        "<U0011> \\x11\n"
+        "<U0012> \\x12\n"
+        "<U0013> \\x13\n"
+        "<U0014> \\x14\n"
+        "<U0015> \\x15\n"
+        "<U0016> \\x16\n"
+        "<U0017> \\x17\n"
+        "<U0018> \\x18\n"
+        "<U0019> \\x19\n"
+        "<U001a> \\x1a\n"
+        "<U001b> \\x1b\n"
+        "<U001c> \\x1c\n"
+        "<U001d> \\x1d\n"
+        "<U001e> \\x1e\n"
+        "<U001f> \\x1f\n"
+        "<U0020> \\x20\n"
+        "<U0021> \\x21\n"
+        "<U0022> \\x22\n"
+        "<U0023> \\x23\n"
+        "<U0024> \\x24\n"
+        "<U0025> \\x25\n"
+        "<U0026> \\x26\n"
+        "<U0027> \\x27\n"
+        "<U0028> \\x28\n"
+        "<U0029> \\x29\n"
+        "<U002a> \\x2a\n"
+        "<U002b> \\x2b\n"
+        "<U002c> \\x2c\n"
+        "<U002d> \\x2d\n"
+        "<U002e> \\x2e\n"
+        "<U002f> \\x2f\n"
+        "<U0030> \\x30\n"
+        "<U0031> \\x31\n"
+        "<U0032> \\x32\n"
+        "<U0033> \\x33\n"
+        "<U0034> \\x34\n"
+        "<U0035> \\x35\n"
+        "<U0036> \\x36\n"
+        "<U0037> \\x37\n"
+        "<U0038> \\x38\n"
+        "<U0039> \\x39\n"
+        "<U003a> \\x3a\n"
+        "<U003b> \\x3b\n"
+        "<U003c> \\x3c\n"
+        "<U003d> \\x3d\n"
+        "<U003e> \\x3e\n"
+        "<U003f> \\x3f\n"
+        "<U0040> \\x40\n"
+        "<U0041> \\x41\n"
+        "<U0042> \\x42\n"
+        "<U0043> \\x43\n"
+        "<U0044> \\x44\n"
+        "<U0045> \\x45\n"
+        "<U0046> \\x46\n"
+        "<U0047> \\x47\n"
+        "<U0048> \\x48\n"
+        "<U0049> \\x49\n"
+        "<U004a> \\x4a\n"
+        "<U004b> \\x4b\n"
+        "<U004c> \\x4c\n"
+        "<U004d> \\x4d\n"
+        "<U004e> \\x4e\n"
+        "<U004f> \\x4f\n"
+        "<U0050> \\x50\n"
+        "<U0051> \\x51\n"
+        "<U0052> \\x52\n"
+        "<U0053> \\x53\n"
+        "<U0054> \\x54\n"
+        "<U0055> \\x55\n"
+        "<U0056> \\x56\n"
+        "<U0057> \\x57\n"
+        "<U0058> \\x58\n"
+        "<U0059> \\x59\n"
+        "<U005a> \\x5a\n"
+        "<U005b> \\x5b\n"
+        "<U005c> \\x5c\n"
+        "<U005d> \\x5d\n"
+        "<U005e> \\x5e\n"
+        "<U005f> \\x5f\n"
+        "<U0060> \\x60\n"
+        "<U0061> \\x61\n"
+        "<U0062> \\x62\n"
+        "<U0063> \\x63\n"
+        "<U0064> \\x64\n"
+        "<U0065> \\x65\n"
+        "<U0066> \\x66\n"
+        "<U0067> \\x67\n"
+        "<U0068> \\x68\n"
+        "<U0069> \\x69\n"
+        "<U006a> \\x6a\n"
+        "<U006b> \\x6b\n"
+        "<U006c> \\x6c\n"
+        "<U006d> \\x6d\n"
+        "<U006e> \\x6e\n"
+        "<U006f> \\x6f\n"
+        "<U0070> \\x70\n"
+        "<U0071> \\x71\n"
+        "<U0072> \\x72\n"
+        "<U0073> \\x73\n"
+        "<U0074> \\x74\n"
+        "<U0075> \\x75\n"
+        "<U0076> \\x76\n"
+        "<U0077> \\x77\n"
+        "<U0078> \\x78\n"
+        "<U0079> \\x79\n"
+        "<U007a> \\x7a\n"
+        "<U007b> \\x7b\n"
+        "<U007c> \\x7c\n"
+        "<U007d> \\x7d\n"
+        "<U007e> \\x7e\n"
+        "<U007f> \\x7f\n"
+        "<U1000> \\xa0\n"
+        "<U1001> \\xa1\n"
+        "<U1002> \\xa2\n"
+        "END CHARMAP\n"
+    };
+
+    const char loc_1[] = {
+        "escape_char /\n"
+        "LC_CTYPE\n"
+        "toupper (<U0061>,<U0041>);(<U0062>,<U0042>);"
+                "(<U0063>,<U0043>);(<U1000>,<U1001>)\n"
+        "tolower (<U0041>,<U0061>);(<U0042>,<U0062>);"
+                "(<U0043>,<U0063>);(<U1001>,<U1000>)\n"
+       	"END LC_CTYPE\n"
+    };
+
+    //invoke rw_create_locale to build a locale to test with
+    const char* const locname = rw_create_locale (cmap_1, loc_1);
+
+    if (!rw_error (0 != locname, 0, __LINE__,
+                   "failed to create a locale in %s", locale_root))
+        return;
+
+    const std::locale loc (locname);
+
+    const std::ctype<charT> &ct =
+        _STD_USE_FACET (std::ctype<charT>, loc);
+
+    ct._C_opts |=  ct._C_use_libstd;
+    ct._C_opts &= ~ct._C_use_libc;
+
+    test_libstd_toupper (charT (), cname, ct, locname);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void run_test (charT, const char *cname)
+{
+    if (0) {
+        // do a compile time only test on use_facet and has_facet
+        _STD_HAS_FACET (std::ctype_byname<charT>, std::locale ());
+        _STD_USE_FACET (std::ctype_byname<charT>, std::locale ());
+    }
+
+    test_libstd (charT (), cname);
+    test_libc (charT (), cname);
+}
+
+/**************************************************************************/
+
+static int
+run_test (int, char**)
+{
+    run_test (char (), "char");
+    run_test (wchar_t (), "wchar_t");
+
+    return 0;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv[])
+{
+    return rw_test (argc, argv, __FILE__,
+                    "lib.category.ctype",
+                    0 /* no comment */,
+                    run_test,
+                    "",
+                    (void*)0   /* sentinel */);
+}
diff --git a/tests/localization/22.locale.messages.cpp b/tests/localization/22.locale.messages.cpp
index 495ec99..d4dafff 100644
--- a/tests/localization/22.locale.messages.cpp
+++ b/tests/localization/22.locale.messages.cpp
@@ -158,6 +158,9 @@
 {
     const char *name = rw_locales (LC_ALL, "");
 
+    if (!name)
+        return 0;
+
     char namebuf [256];
 
     // get the full name of the "C" locale for comparison with aliases
diff --git a/tests/localization/22.locale.money.get.cpp b/tests/localization/22.locale.money.get.cpp
index 5d465a2..23c80c0 100644
--- a/tests/localization/22.locale.money.get.cpp
+++ b/tests/localization/22.locale.money.get.cpp
@@ -30,13 +30,11 @@
 #include <locale>
 
 #include <cstdio>     // for sscanf()
-#include <cstdlib>    // for mbstowcs(), wcstombs()
-#include <cstring>    // for strcat(), strlen()
-#include <cwchar>     // for wcslen()
 
 #include <cmdopt.h>   // for rw_enabled()
 #include <driver.h>   // for rw_assert(), rw_test(), ...
-#include <valcmp.h>   // for rw_fltcmp()
+#include <rw_char.h>  // for rw_expand()
+#include <valcmp.h>   // for rw_ldblcmp()
 
 
 #ifndef _RWSTD_NO_LONG_DOUBLE
@@ -105,105 +103,127 @@
 
 /**************************************************************************/
 
+template <class charT>
+struct PunctData
+{
+    static charT                     decimal_point_ [2];
+    static charT                     thousands_sep_ [2];
+    static const char               *grouping_ [2];
+    static const charT              *curr_symbol_ [2];
+    static const charT              *positive_sign_ [2];
+    static const charT              *negative_sign_ [2];
+    static std::money_base::pattern  format_ [2][2];
+    static int                       frac_digits_ [2];
+};
+
+
+template <class charT>
+const char*
+PunctData<charT>::grouping_ [2] = { "", "" };
+
+template <class charT>
+charT
+PunctData<charT>::decimal_point_ [2] = { '.', '.' };
+
+template <class charT>
+charT
+PunctData<charT>::thousands_sep_ [2] = { ',', ',' };
+
+template <class charT>
+const charT*
+PunctData<charT>::curr_symbol_ [2];
+
+template <class charT>
+const charT*
+PunctData<charT>::positive_sign_ [2];
+
+template <class charT>
+const charT*
+PunctData<charT>::negative_sign_ [2];
+
+template <class charT>
+std::money_base::pattern PunctData<charT>::format_ [2][2] = {
+    {   // local
+        { { // positive
+                std::money_base::symbol, std::money_base::sign,
+                std::money_base::none,   std::money_base::value
+            } },
+        { { // negative
+                std::money_base::symbol, std::money_base::sign,
+                std::money_base::none,   std::money_base::value
+            } }
+    },
+
+    {   // international
+        { { // positive
+                std::money_base::symbol, std::money_base::sign,
+                std::money_base::none,   std::money_base::value
+            } },
+        { { // negative
+                std::money_base::symbol, std::money_base::sign,
+                std::money_base::none,   std::money_base::value
+            } }
+    }
+};
+
+template <class charT>
+int PunctData<charT>::frac_digits_ [2];
+
+
 template <class charT, bool Intl>
-struct Punct: std::moneypunct<charT, Intl>
+struct Punct: std::moneypunct<charT, Intl>, PunctData<charT>
 {
     typedef std::moneypunct<charT, Intl> Base;
     typedef typename Base::char_type     char_type;
     typedef typename Base::string_type   string_type;
 
-    static char_type                 decimal_point_;
-    static char_type                 thousands_sep_;
-    static const char               *grouping_;
-    static const char_type          *curr_symbol_;
-    static const char_type          *positive_sign_;
-    static const char_type          *negative_sign_;
-    static std::money_base::pattern  format_ [2];
-    static int                       frac_digits_;
-
     static int n_thousands_sep_;   // number of calls to do_thousands_sep()
 
     Punct (std::size_t ref): Base (ref) { }
 
     char_type do_decimal_point () const {
-        return decimal_point_;
+        return this->decimal_point_ [Intl];
     }
 
     int do_frac_digits () const {
-        return frac_digits_;
+        return this->frac_digits_ [Intl];
     }
 
     virtual string_type do_curr_symbol () const {
         foo ();
-        return curr_symbol_ ? curr_symbol_ : string_type ();
+        return this->curr_symbol_ [Intl] ?
+            this->curr_symbol_ [Intl] : string_type ();
     }
 
     virtual std::string do_grouping () const {
-        return grouping_ ? std::string (grouping_) : std::string ();
+        return this->grouping_ [Intl] ? this->grouping_ [Intl] : "";
     }
 
     virtual char_type do_thousands_sep () const {
         ++n_thousands_sep_;
-        return thousands_sep_;
+        return this->thousands_sep_ [Intl];
     }
 
     virtual string_type do_positive_sign () const {
-        return positive_sign_ ? positive_sign_ : string_type ();
+        return this->positive_sign_  [Intl] ?
+            this->positive_sign_ [Intl] : string_type ();
     }
 
     virtual string_type do_negative_sign () const {
-        return negative_sign_ ? negative_sign_ : string_type ();
+        return this->negative_sign_ [Intl] ?
+            this->negative_sign_ [Intl] : string_type ();
     }
 
     virtual std::money_base::pattern do_pos_format () const {
-        return format_ [0];
+        return this->format_ [Intl][0];
     }
 
     virtual std::money_base::pattern do_neg_format () const {
-        return format_ [1];
+        return this->format_ [Intl][1];
     }
 };
 
 template <class charT, bool Intl>
-const char* Punct<charT, Intl>::grouping_ = "";
-
-template <class charT, bool Intl>
-typename Punct<charT, Intl>::char_type
-Punct<charT, Intl>::decimal_point_ = '.';
-
-template <class charT, bool Intl>
-typename Punct<charT, Intl>::char_type
-Punct<charT, Intl>::thousands_sep_ = ',';
-
-template <class charT, bool Intl>
-const typename Punct<charT, Intl>::char_type*
-Punct<charT, Intl>::curr_symbol_;
-
-template <class charT, bool Intl>
-const typename Punct<charT, Intl>::char_type*
-Punct<charT, Intl>::positive_sign_;
-
-template <class charT, bool Intl>
-const typename Punct<charT, Intl>::char_type*
-Punct<charT, Intl>::negative_sign_;
-
-template <class charT, bool Intl>
-std::money_base::pattern Punct<charT, Intl>::format_[2] = {
-    { { // positive
-        std::money_base::symbol, std::money_base::sign,
-        std::money_base::none,   std::money_base::value
-    } },
-    { { // negative
-        std::money_base::symbol, std::money_base::sign,
-        std::money_base::none,   std::money_base::value
-    } }
-};
-
-template <class charT, bool Intl>
-int Punct<charT, Intl>::frac_digits_;
-
-
-template <class charT, bool Intl>
 int Punct<charT, Intl>::n_thousands_sep_;
 
 
@@ -221,72 +241,6 @@
 
 /**************************************************************************/
 
-const char* narrow (char *dst, const char *src)
-{
-    if (src == dst || !src || !dst)
-        return src;
-
-    std::memcpy (dst, src, std::strlen (src) + 1);
-    return dst;
-}
-
-
-const char* widen (char *dst, const char *src)
-{
-    if (src == dst || !src || !dst)
-        return src;
-
-    std::memcpy (dst, src, std::strlen (src) + 1);
-    return dst;
-}
-
-
-const char* narrow (char *dst, const wchar_t *src)
-{
-    static char buf [4096];
-
-    if (!src)
-        return 0;
-
-    if (!dst)
-        dst = buf;
-
-    std::size_t len = std::wcslen (src);
-
-    RW_ASSERT (len < sizeof buf);
-
-    len = std::wcstombs (dst, src, sizeof buf / sizeof *buf);
-
-    if (std::size_t (-1) == len)
-        *dst = 0;
-
-    return dst;
-}
-
-
-const wchar_t* widen (wchar_t *dst, const char *src)
-{
-    static wchar_t buf [4096];
-
-    if (!src)
-        return 0;
-
-    if (!dst)
-        dst = buf;
-
-    std::size_t len = std::strlen (src);
-
-    RW_ASSERT (len < sizeof buf /sizeof *buf);
-
-    len = std::mbstowcs (dst, src, sizeof buf / sizeof *buf);
-
-    if (std::size_t (-1) == len)
-        *dst = 0;
-
-    return dst;
-}
-
-
 template <class charT>
 void do_test (charT       which,   // which overload to exercise
               const char *cname,   // the name of the charT type
@@ -318,21 +272,35 @@
         fmat = pat.field;
     }
 
+    // local format? (the opposite of interantional)
+    const bool locl = !intl;
+
     // take care to initialize Punct static data before installing
     // the facet in case locale or the base facet calls the overridden
     // virtuals early to cache the results
-    Punct<charT, false>::format_ [1].field [0] = fmat [0];
-    Punct<charT, false>::format_ [1].field [1] = fmat [1];
-    Punct<charT, false>::format_ [1].field [2] = fmat [2];
-    Punct<charT, false>::format_ [1].field [3] = fmat [3];
+    PunctData<charT>::format_ [intl][1].field [0] = fmat [0];
+    PunctData<charT>::format_ [intl][1].field [1] = fmat [1];
+    PunctData<charT>::format_ [intl][1].field [2] = fmat [2];
+    PunctData<charT>::format_ [intl][1].field [3] = fmat [3];
+
+    PunctData<charT>::format_ [locl][1].field [0] = fmat [3];
+    PunctData<charT>::format_ [locl][1].field [1] = fmat [2];
+    PunctData<charT>::format_ [locl][1].field [2] = fmat [1];
+    PunctData<charT>::format_ [locl][1].field [3] = fmat [0];
 
     // zero out positive format (not used by money_get)
-    Punct<charT, false>::format_ [0] = std::money_base::pattern ();
+    PunctData<charT>::format_ [intl][0] = std::money_base::pattern ();
+    PunctData<charT>::format_ [locl][0] = std::money_base::pattern ();
 
-    charT wcursym_buf [40];
-    Punct<charT, false>::curr_symbol_ = widen (wcursym_buf, cursym);
-    Punct<charT, false>::grouping_    = grouping;
-    Punct<charT, false>::frac_digits_ = frac_digits;
+    // expand (widen) currency symbol
+    PunctData<charT>::curr_symbol_ [intl] = rw_expand ((charT*)0, cursym);
+    PunctData<charT>::curr_symbol_ [locl] = 0;
+    
+    PunctData<charT>::grouping_ [intl] = grouping;
+    PunctData<charT>::grouping_ [locl] = 0;
+
+    PunctData<charT>::frac_digits_ [intl] = frac_digits;
+    PunctData<charT>::frac_digits_ [locl] = frac_digits + 1;
 
     Ios<charT> io;
     MoneyGet<charT> mg;
@@ -351,9 +319,8 @@
 
     io.flags (std::ios_base::fmtflags (flags));
 
-    // widen input string if necessary
-    charT wstr_buf [4096];
-    const charT *next = widen (wstr_buf, str);
+    // expand (widen) input sequence
+    const charT* const next = rw_expand ((charT*)0, str);
 
     std::ios_base::iostate err = std::ios_base::goodbit;
 
@@ -374,21 +341,21 @@
             !(-1 != consumed && last - next != consumed || err != err_expect);
 
         rw_assert (success, __FILE__, lineno,
-                   "money_get<%s>::get (%s, ..., %d, ..., %s&), "
+                   "money_get<%s>::get (%{*Ac}, ..., %b, ..., %s&), "
                    "ate %d, expected %d, frac_digits = %d, "
                    "flags = %{If}, grouping = %#s, pattern = %{LM}, "
-                   "state = %{Is}, expected = %{Is}",
-                   cname, next, intl, tname,
+                   "state = %{Is}, expected %{Is}",
+                   cname, int (sizeof *next), next, intl, tname,
                    last - next, consumed, frac_digits,
                    flags, grouping, fmat,
                    err, err_expect);
 
         rw_assert (2 > rw_ldblcmp (x, val), __FILE__, lineno,
-                   "money_get<%s>::get (%s, ..., %d, ..., %s&), "
+                   "money_get<%s>::get (%{*Ac}, ..., %b, ..., %s&), "
                    "got %Lg, expected %Lg, frac_digits = %d, "
                    "flags = %{If}s, grouping = %#s, pattern = %{LM}, "
                    "state = %{Is}, expected %{Is}",
-                   cname, next, intl, tname,
+                   cname, int (sizeof *next), next, intl, tname,
                    x, val, frac_digits,
                    flags, grouping, fmat,
                    err, err_expect);
@@ -406,11 +373,11 @@
             !(-1 != consumed && last - next != consumed || err != err_expect);
 
         rw_assert (success, __FILE__, lineno,
-                   "money_get<%s>::get (%s, ..., %d, ..., "
+                   "money_get<%s>::get (%{*Ac}, ..., %b, ..., "
                    "basic_string<%s>&), ate %d, expected %d, "
                    "frac_digits = %d, flags = %{If}, grouping = %#s"
-                   ", format = %{LM}, state = %{Is}, expected = %{Is}",
-                   cname, next, intl,
+                   ", format = %{LM}, state = %{Is}, expected %{Is}",
+                   cname, int (sizeof *next), next, intl,
                    cname, last - next, consumed,
                    frac_digits, flags, grouping,
                    fmat, err, err_expect);
@@ -418,7 +385,7 @@
         if (success) {
 
             char narrow_buf [4096];
-            narrow (narrow_buf, bs.c_str ());
+            rw_narrow (narrow_buf, bs.c_str ());
 
             LongDouble x = 0;
 
@@ -434,16 +401,19 @@
                   && 1 < rw_ldblcmp (x, val));
 
             rw_assert (success, __FILE__, lineno,
-                       "money_get<%s>::get (%s, ..., %d, ..., "
+                       "money_get<%s>::get (%{*Ac}, ..., %b, ..., "
                        "basic_string<%s>&), got %s, expected %Lg, "
                        "frac_digits = %d, flags = %{If}, grouping = %#s,"
                        " pattern = %{LM}, iostate = %{Is}, expected %{Is}",
-                       cname, next, intl,
+                       cname, int (sizeof *next), next, intl,
                        cname, bs.c_str (), val,
                        frac_digits, flags, grouping,
                        fmat, err, err_expect);
         }
     }
+
+    delete[] PunctData<charT>::curr_symbol_ [intl];
+    delete[] next;
 }
 
 /**************************************************************************/
@@ -478,7 +448,7 @@
 
 
 template <class charT>
-void test_memfun (charT opt, const char *cname, const char *tname)
+void test_get (charT opt, const char *cname, const char *tname)
 {
 #define T      opt, cname, tname, __LINE__
 #define TEST   do_test
@@ -496,9 +466,12 @@
     // by decimal_point(). The other symbols are defined as follows:
     //     units ::= digits [ thousandssep units ] digits ::= adigit [ digits ]
 
-    Punct<charT, false>::positive_sign_ = 0;
-    Punct<charT, false>::negative_sign_ = 0;
-    Punct<charT, false>::thousands_sep_ = '\0';
+    PunctData<charT>::positive_sign_ [0] = 0;
+    PunctData<charT>::positive_sign_ [1] = 0;
+    PunctData<charT>::negative_sign_ [0] = 0;
+    PunctData<charT>::negative_sign_ [1] = 0;
+    PunctData<charT>::thousands_sep_ [0] = '\0';
+    PunctData<charT>::thousands_sep_ [1] = '\0';
 
     // parsing zero, no curr_symbol or sign, default pattern, 0 frac_digits
     TEST (T, 0.0, "0",   1, 0, eofbit);
@@ -566,7 +539,8 @@
     TEST (T,  54321098.0, "5432.1098", 9, 0, eofbit, 4);
     TEST (T, 432109870.0, "43210.987", 9, 0, eofbit, 4);
 
-    Punct<charT, false>::thousands_sep_ = ',';
+    PunctData<charT>::thousands_sep_ [0] = ',';
+    PunctData<charT>::thousands_sep_ [1] = ';';
 
     // parsing with thousands_sep and/or grouping
     TEST (T,      0.0, "0",        1, 0, eofbit,  0, 0, "", "\1");
@@ -637,11 +611,13 @@
 
     // parsing with a simple non-empty sign
 
-    static const charT plus[]  = { '+', '\0' };
-    static const charT minus[] = { '-', '\0' };
+    static const charT plus[][2]  = { { '+', '\0' }, { '\0' } };
+    static const charT minus[][2] = { { '-', '\0' }, { '\0' } };
 
-    Punct<charT, false>::positive_sign_ = plus;
-    Punct<charT, false>::negative_sign_ = minus;
+    PunctData<charT>::positive_sign_ [0] = plus [0];
+    PunctData<charT>::negative_sign_ [0] = minus [0];
+    PunctData<charT>::positive_sign_ [1] = plus [1];
+    PunctData<charT>::negative_sign_ [1] = minus [1];
 
     TEST (T,  15.0, "+15",     3, 0, eofbit,  0, 0, "");
     TEST (T,  16.0, "+ 16",    4, 0, eofbit,  0, 0, "");
@@ -668,11 +644,13 @@
 
     // parsing with a multi-char non-empty sign
 
-    static const charT plus_plus[]   = { '+', '+', '\0' };
-    static const charT minus_minus[] = { '-', '-', '\0' };
+    static const charT plus_plus[][3]   = { { '+', '+', '\0' }, { '\0' } };
+    static const charT minus_minus[][3] = { { '-', '-', '\0' }, { '\0' } };
 
-    Punct<charT, false>::positive_sign_ = plus_plus;
-    Punct<charT, false>::negative_sign_ = minus_minus;
+    PunctData<charT>::positive_sign_ [0] = plus_plus [0];
+    PunctData<charT>::negative_sign_ [0] = minus_minus [0];
+    PunctData<charT>::positive_sign_ [1] = plus_plus [1];
+    PunctData<charT>::negative_sign_ [1] = minus_minus [1];
 
     TEST (T,  27.0, "+27+",    4, 0, eofbit, 0, 0, "");
     TEST (T,  28.0, "+  28+",  6, 0, eofbit, 0, 0, "");
@@ -703,9 +681,12 @@
     TEST (T, 0.0, "$-3.80 -",  3, 0, failbit, 0, 0, "$");
     TEST (T, 0.0, "$- 3.91 -", 7, 0, failbit, 1, 0, "$");
 
-    static const charT plus_minus[] = { '+', '-', '\0' };
-    Punct<charT, false>::positive_sign_ = plus_plus;
-    Punct<charT, false>::negative_sign_ = plus_minus;
+    static const charT plus_minus[][3] = { { '+', '-', '\0' }, { '\0' } };
+
+    PunctData<charT>::positive_sign_ [0] = plus_plus [0];
+    PunctData<charT>::positive_sign_ [1] = plus_plus [1];
+    PunctData<charT>::negative_sign_ [0] = plus_minus [0];
+    PunctData<charT>::negative_sign_ [1] = plus_minus [1];
 
     // 22.2.6.1.2, p3: if the first character of positive
     // and negative sign is the same, the result is positive
@@ -721,8 +702,10 @@
     // none = 0, space = 1, symbol = 2, sign = 3, value = 4
 
     // test various patterns
-    Punct<charT, false>::positive_sign_ = plus;
-    Punct<charT, false>::negative_sign_ = minus;
+    PunctData<charT>::positive_sign_ [0] = plus [0];
+    PunctData<charT>::positive_sign_ [1] = plus [1];
+    PunctData<charT>::negative_sign_ [0] = minus [0];
+    PunctData<charT>::negative_sign_ [1] = minus [1];
 
     TEST (T,  -100.0, "$-1",   3, showbase, eofbit,  2, "\2\3\4\0", "$");
     TEST (T,  -200.0, "$-2 ",  3, showbase, goodbit, 2, "\2\3\4\0", "$");
@@ -746,8 +729,9 @@
     TEST (T,     0.0, "14$-",  2, showbase, failbit, 2, "\4\1\2\3", "$");
     TEST (T, -1500.0, "15 $-", 5, showbase, eofbit,  2, "\4\1\2\3", "$");
 
-    const charT parens[] = { '(', ')', '\0' };
-    Punct<charT, false>::negative_sign_ = parens;
+    const charT parens[][3] = { { '(', ')', '\0' }, { '\0' } };
+    PunctData<charT>::negative_sign_ [0] = parens [0];
+    PunctData<charT>::negative_sign_ [1] = parens [1];
 
     // { sign, space, value, symbol }, with symbol required
     TEST (T, -90.0, "( 9$)",    5, showbase, eofbit, 1, "\3\1\4\2", "$");
@@ -772,8 +756,10 @@
     TEST (T, -104.0, "(104 L)", 7, 0,        eofbit,  0, "\3\4\0\2", "L");
     TEST (T, -105.0, "(105 L)", 7, showbase, eofbit,  0, "\3\4\0\2", "L");
 
-    Punct<charT, false>::positive_sign_ = plus;
-    Punct<charT, false>::negative_sign_ = minus;
+    PunctData<charT>::positive_sign_ [0] = plus [0];
+    PunctData<charT>::negative_sign_ [0] = minus [0];
+    PunctData<charT>::positive_sign_ [1] = plus [1];
+    PunctData<charT>::negative_sign_ [1] = minus [1];
 
     // { sign, value, none, symbol }
     // trailing optional curr_symbol or whitespace preceding it (regardless
@@ -797,8 +783,9 @@
     // trailing required curr_symbol is consumed
     TEST (T, -109.0, "109-$",  5, showbase, eofbit,  0, "\4\0\3\2", "$");
 
-    const charT minus_space[] = { '-', ' ', '\0' };
-    Punct<charT, false>::negative_sign_ = minus_space;
+    const charT minus_space[][3] = { { '-', ' ', '\0' }, { '\0' } };
+    PunctData<charT>::negative_sign_ [0] = minus_space [0];
+    PunctData<charT>::negative_sign_ [1] = minus_space [1];
 
     // { sign, value, none, symbol }
     // negative_sign is "- ", (note the single trailing space)
@@ -810,24 +797,30 @@
 
     // verify that optional space after value and before currency
     // symbol is treated correctly
-    Punct<charT, false>::positive_sign_ = plus_plus;
-    Punct<charT, false>::negative_sign_ = 0;
+    PunctData<charT>::positive_sign_ [0] = plus_plus [0];
+    PunctData<charT>::positive_sign_ [1] = 0;
+    PunctData<charT>::negative_sign_ [0] = 0;
+    PunctData<charT>::negative_sign_ [1] = 0;
 
     // { sign, value, none, symbol }
     TEST (T,  1090.0, "1090 $",   6, showbase, eofbit,  0, "\3\4\0\2", "$");
     TEST (T,  1091.0, "1091 $",   6, showbase, eofbit,  0, "\3\4\0\2", "$");
     TEST (T, +1092.0, "+1092 $+", 8, showbase, eofbit,  0, "\3\4\0\2", "$");
 
-    Punct<charT, false>::positive_sign_ = 0;
-    Punct<charT, false>::negative_sign_ = parens;
+    PunctData<charT>::positive_sign_ [0] = 0;
+    PunctData<charT>::positive_sign_ [1] = 0;
+    PunctData<charT>::negative_sign_ [0] = parens [0];
+    PunctData<charT>::negative_sign_ [1] = 0;
 
     TEST (T,  1093.0, "1093 $",   6, showbase, eofbit,  0, "\3\4\0\2", "$");
     TEST (T,  1094.0, "1094 $",   6, showbase, eofbit,  0, "\3\4\0\2", "$");
     TEST (T, -1095.0, "(1095 $)", 8, showbase, eofbit,  0, "\3\4\0\2", "$");
 
     // verify a single-char sign with a multichar one (see bug #428)
-    Punct<charT, false>::positive_sign_ = plus;
-    Punct<charT, false>::negative_sign_ = parens;
+    PunctData<charT>::positive_sign_ [0] = plus [0];
+    PunctData<charT>::positive_sign_ [1] = 0;
+    PunctData<charT>::negative_sign_ [0] = parens [0];
+    PunctData<charT>::negative_sign_ [1] = 0;
 
     // { sign, value, none, symbol }
     TEST (T,  1096.0, "1096 $",   6, showbase, eofbit,  0, "\3\4\0\2", "$");
@@ -835,8 +828,10 @@
     TEST (T, +1098.0, "+1098 $",  7, showbase, eofbit,  0, "\3\4\0\2", "$");
     TEST (T, -1099.0, "(1099 $)", 8, showbase, eofbit,  0, "\3\4\0\2", "$");
 
-    Punct<charT, false>::positive_sign_ = 0;
-    Punct<charT, false>::negative_sign_ = 0;
+    PunctData<charT>::positive_sign_ [0] = 0;
+    PunctData<charT>::positive_sign_ [1] = 0;
+    PunctData<charT>::negative_sign_ [0] = 0;
+    PunctData<charT>::negative_sign_ [1] = 0;
 
     // { value, none, symbol, sign }
     // trailing whitespace is not extracted (even if required by the format)
@@ -856,9 +851,12 @@
     TEST (T,  119.0, "119 $",  5, showbase, eofbit,  0, "\4\1\2\3", "$");
 
 
-    Punct<charT, false>::positive_sign_ = plus;
-    Punct<charT, false>::negative_sign_ = minus;
-    Punct<charT, false>::thousands_sep_ = ';';
+    PunctData<charT>::positive_sign_ [0] = plus [0];
+    PunctData<charT>::positive_sign_ [1] = plus [1];
+    PunctData<charT>::negative_sign_ [0] = minus [0];
+    PunctData<charT>::negative_sign_ [1] = minus [1];
+    PunctData<charT>::thousands_sep_ [0] = ';';
+    PunctData<charT>::thousands_sep_ [1] = '*';
 
     // test grouping, default pattern { symbol sign none value }
     TEST (T, 0.0, "$0",     2, 0, eofbit, 0, 0, "$", "\1");
@@ -954,8 +952,8 @@
 test_long_double (charT, const char *cname)
 {
     if (rw_enabled ("long double"))
-        test_memfun (charT (0 /* long double argument */),
-                     cname, "long double");
+        test_get (charT (0 /* long double argument */),
+                  cname, "long double");
     else
         rw_note (0, __FILE__, __LINE__, "long double test disabled");
 }
@@ -967,8 +965,8 @@
 test_string (charT, const char *cname)
 {
     if (rw_enabled ("basic_string"))
-        test_memfun (charT (1 /* basic_string argument */),
-                     cname, "basic_string");
+        test_get (charT (1 /* basic_string argument */),
+                  cname, "basic_string");
     else
         rw_note (0, __FILE__, __LINE__,
                  "basic_string<%s> test disabled", cname);
diff --git a/tests/localization/22.locale.money.put.mt.cpp b/tests/localization/22.locale.money.put.mt.cpp
new file mode 100644
index 0000000..e175624
--- /dev/null
+++ b/tests/localization/22.locale.money.put.mt.cpp
@@ -0,0 +1,282 @@
+/************************************************************************
+ *
+ * 22.locale.money.put.mt.cpp
+ *
+ * test exercising the thread safety of the money_put facet
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#include <ios>        // for ios
+#include <iterator>   // for ostreambuf_iterator
+#include <locale>     // for locale, money_put
+
+#include <cstring>    // for strlen()
+
+#include <rw_locale.h>
+#include <rw_thread.h>
+#include <driver.h>
+
+
+// maximum number of threads allowed by the command line interface
+#define MAX_THREADS   32
+
+
+#ifdef _RWSTD_REENTRANT
+int rw_opt_nthreads = 4;
+#else   // if !defined (_RWSTD_REENTRANT)
+// in non-threaded builds use just one thread
+int rw_opt_nthreads = 1;
+#endif   // _RWSTD_REENTRANT
+
+// the number of times each thread should iterate (unless specified
+// otherwise on the command line)
+int rw_opt_nloops = 100000;
+
+/**************************************************************************/
+
+// array of locale names to use for testing
+static const char*
+locales [MAX_THREADS];
+
+// number of locale names in the array
+static std::size_t
+nlocales;
+
+/**************************************************************************/
+
+extern "C" {
+
+bool test_char;    // exercise money_put<char>
+bool test_wchar;   // exercise money_put<wchar_t>
+
+
+static void*
+thread_func (void*)
+{
+    // dummy streambuf-derived object the doesn't do anything
+    // but allows ostreambuf_iterator to "think" it can write
+    // to it
+    struct NarrowBuf: std::streambuf {
+        int_type overflow (int_type c) { return c; }
+    } sb;
+
+    const char str_vals[][20] = {
+        "1", "12", "123", "1234", "12345", "123456", "1234567", "12345678",
+        "-9", "-98", "-987", "-9876", "-98765", "-987654", "-9876543",
+        "1.9", "-12.89", "123.789", "-1234.6789", "-12345.56789"
+    };
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    struct WideBuf: std::wstreambuf {
+        int_type overflow (int_type c) { return c; }
+    } wb;
+
+    const wchar_t wstr_vals[][20] = {
+        L"1", L"12", L"123", L"1234", L"12345", L"123456", L"1234567",
+        L"-9", L"-98", L"-987", L"-9876", L"-98765", L"-987654", L"-9876543",
+        L"1.9", L"-12.89", L"123.789", L"-1234.6789", L"-12345.56789"
+    };
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+    struct Ios: std::ios {
+        Ios () { this->init (0); }
+    } io;
+
+    for (int i = 0; i != rw_opt_nloops; ++i) {
+
+        // save the name of the locale
+        const char* const locale_name = locales [i % nlocales];
+
+        // construct a named locale and imbue it in the ios object
+        // so that the locale is used not only by the money_put facet
+        // but also by the numpunct facet
+        const std::locale loc (locale_name);
+        io.imbue (loc);
+
+        enum PutId {
+            put_ldbl,
+            put_string,
+            put_max
+        };
+
+        io.width (i % 16);
+
+        // exercise postive and negative values
+        long double ldval = i & 1 ? -i : i;
+
+        // add some random fractional digits
+        if (i & 2)
+            ldval += ldval / 3.14;
+
+        // exercise domestic formats every other iteration
+        // and international formats the rest
+        const bool intl = 0 == (i & 1);
+
+        if (test_char) {
+            // exercise the narrow char specialization of the facet
+
+            const std::money_put<char> &mp =
+                std::use_facet<std::money_put<char> >(loc);
+
+            const std::ostreambuf_iterator<char> iter (&sb);
+
+            switch (PutId (i % put_max)) {
+            case put_ldbl:
+                mp.put (iter, intl, io, ' ', ldval);
+                break;
+
+            case put_string: {
+                const char* const strval =
+                    str_vals [i % sizeof str_vals / sizeof *str_vals];
+
+                mp.put (iter, intl, io, ' ', strval);
+                break;
+            }
+            }
+        }
+
+        // both specializations may be tested at the same time
+
+        if (test_wchar) {
+            // exercise the wide char specialization of the facet
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+            const std::money_put<wchar_t> &mp =
+                std::use_facet<std::money_put<wchar_t> >(loc);
+
+            const std::ostreambuf_iterator<wchar_t> iter (&wb);
+
+            switch (PutId (i % put_max)) {
+            case put_ldbl:
+                mp.put (iter, intl, io, ' ', ldval);
+                break;
+
+            case put_string: {
+                const wchar_t* const strval =
+                    wstr_vals [i % sizeof wstr_vals / sizeof *wstr_vals];
+
+                mp.put (iter, intl, io, ' ', strval);
+                break;
+            }
+            }
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+        }
+    }
+
+    return 0;
+}
+
+}   // extern "C"
+
+/**************************************************************************/
+
+static int
+run_test (int, char**)
+{
+    char* const locale_list = rw_locales ();
+
+    const std::size_t maxinx = sizeof locales / sizeof *locales;
+
+    for (char *name = locale_list; *name; name += std::strlen (name) + 1) {
+        locales [nlocales++] = name;
+
+        if (nlocales == maxinx)
+            break;
+    }
+
+    rw_info (0, 0, 0,
+             "testing std::money_put<charT> with %d thread%{?}s%{;}, "
+             "%zu iteration%{?}s%{;} each, in locales { %{ .*A@} }",
+             rw_opt_nthreads, 1 != rw_opt_nthreads,
+             rw_opt_nloops, 1 != rw_opt_nloops,
+             int (nlocales), "%#s", locales);
+
+    rw_info (0, 0, 0, "exercising std::money_put<char>");
+
+    test_char  = true;
+    test_wchar = false;
+
+    // create and start a pool of threads and wait for them to finish
+    int result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    rw_info (0, 0, 0, "exercising std::money_put<wchar_t>");
+
+    test_char  = false;
+    test_wchar = true;
+
+    // start a pool of threads to exercise wstring thread safety
+    result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+    // exercise bothe the char and the wchar_t specializations
+    // at the same time
+
+    rw_info (0, 0, 0,
+             "exercising both std::money_put<char> "
+             "and std::money_put<wchar_t>");
+
+    test_char  = true;
+    test_wchar = true;
+
+    // start a pool of threads to exercise wstring thread safety
+    result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+    return result;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv[])
+{
+    return rw_test (argc, argv, __FILE__,
+                    "lib.locale.money.put",
+                    "thread safety", run_test,
+                    "|-nloops#0 "       // must be non-negative
+                    "|-nthreads#0-*",   // must be in [0, MAX_THREADS]
+                    &rw_opt_nloops,
+                    int (MAX_THREADS),
+                    &rw_opt_nthreads);
+}
diff --git a/tests/localization/22.locale.moneypunct.cpp b/tests/localization/22.locale.moneypunct.cpp
new file mode 100644
index 0000000..1706ccf
--- /dev/null
+++ b/tests/localization/22.locale.moneypunct.cpp
@@ -0,0 +1,848 @@
+/***************************************************************************
+ *
+ * 22.locale.moneypunct.cpp - tests for the moneypunct facet
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1998-2006 Rogue Wave Software.
+ * 
+ **************************************************************************/
+
+#include <locale>
+
+#include <cassert>
+#include <clocale>       // for LC_ALL, setlocale()
+#include <cstdio>        // for fprintf(), stderr
+#include <cstdlib>       // for getenv()
+#include <cstring>       // for memcmp(), strerror()
+
+#include <driver.h>      // for rw_test()
+#include <environ.h>     // for rw_putenv()
+#include <rw_locale.h>   // for rw_locales()
+#include <rw_printf.h>   // for rw_fprintf()
+
+/**************************************************************************/
+
+typedef unsigned char UChar;
+
+/**************************************************************************/
+
+// does a deep copy of struct lconv
+std::lconv* lconvdup (const std::lconv *plconv)
+{
+    if (!plconv)
+        return 0;
+
+    const std::size_t
+        decimal_point_sz     = std::strlen (plconv->decimal_point) + 1,
+        thousands_sep_sz     = std::strlen (plconv->thousands_sep) + 1,
+        grouping_sz          = std::strlen (plconv->grouping) + 1,
+        int_curr_symbol_sz   = std::strlen (plconv->int_curr_symbol) + 1,
+        currency_symbol_sz   = std::strlen (plconv->currency_symbol) + 1,
+        mon_decimal_point_sz = std::strlen (plconv->mon_decimal_point) + 1,
+        mon_thousands_sep_sz = std::strlen (plconv->mon_thousands_sep) + 1,
+        mon_grouping_sz      = std::strlen (plconv->mon_grouping) + 1,
+        positive_sign_sz     = std::strlen (plconv->positive_sign) + 1,
+        negative_sign_sz     = std::strlen (plconv->negative_sign) + 1;
+
+    const std::size_t total_sz =
+          decimal_point_sz
+        + thousands_sep_sz
+        + grouping_sz
+        + int_curr_symbol_sz
+        + currency_symbol_sz
+        + mon_decimal_point_sz
+        + mon_thousands_sep_sz
+        + mon_grouping_sz
+        + positive_sign_sz
+        + negative_sign_sz;
+
+    char *pbuf = new char [sizeof (std::lconv) + total_sz];
+
+    std::lconv *plconv2 = _RWSTD_REINTERPRET_CAST (std::lconv*, pbuf);
+
+    plconv2->decimal_point = (pbuf += sizeof (std::lconv));
+    std::memcpy (pbuf, plconv->decimal_point, decimal_point_sz);
+
+    plconv2->thousands_sep = (pbuf += decimal_point_sz);
+    std::memcpy (pbuf, plconv->thousands_sep, thousands_sep_sz);
+
+    plconv2->grouping = (pbuf += thousands_sep_sz);
+    std::memcpy (pbuf, plconv->grouping, grouping_sz);
+
+    plconv2->int_curr_symbol = (pbuf += grouping_sz);
+    std::memcpy (pbuf, plconv->int_curr_symbol, int_curr_symbol_sz);
+
+    plconv2->currency_symbol = (pbuf += int_curr_symbol_sz);
+    std::memcpy (pbuf, plconv->currency_symbol, currency_symbol_sz);
+
+    plconv2->mon_decimal_point = (pbuf += currency_symbol_sz);
+    std::memcpy (pbuf, plconv->mon_decimal_point, mon_decimal_point_sz);
+
+    plconv2->mon_thousands_sep = (pbuf += mon_decimal_point_sz);
+    std::memcpy (pbuf, plconv->mon_thousands_sep, mon_thousands_sep_sz);
+
+    plconv2->mon_grouping = (pbuf += mon_thousands_sep_sz);
+    std::memcpy (pbuf, plconv->mon_grouping, mon_grouping_sz);
+
+    plconv2->positive_sign = (pbuf += mon_grouping_sz);
+    std::memcpy (pbuf, plconv->positive_sign, positive_sign_sz);
+
+    plconv2->negative_sign = (pbuf += positive_sign_sz);
+    std::memcpy (pbuf, plconv->negative_sign, negative_sign_sz);
+
+    plconv2->int_frac_digits   = plconv->int_frac_digits;
+    plconv2->frac_digits       = plconv->frac_digits;
+    plconv2->p_cs_precedes     = plconv->p_cs_precedes;
+    plconv2->p_sep_by_space    = plconv->p_sep_by_space;
+    plconv2->n_cs_precedes     = plconv->n_cs_precedes;
+    plconv2->n_sep_by_space    = plconv->n_sep_by_space;
+    plconv2->p_sign_posn       = plconv->p_sign_posn;
+    plconv2->n_sign_posn       = plconv->n_sign_posn;
+
+#ifndef _RWSTD_NO_LCONV_INT_FMAT
+
+    plconv2->int_p_cs_precedes   = plconv->int_p_cs_precedes; 
+    plconv2->int_p_sep_by_space  = plconv->int_p_sep_by_space; 
+    plconv2->int_n_cs_precedes   = plconv->int_n_cs_precedes;
+    plconv2->int_n_sep_by_space  = plconv->int_n_sep_by_space;
+    plconv2->int_p_sign_posn     = plconv->int_p_sign_posn;
+    plconv2->int_n_sign_posn     = plconv->int_n_sign_posn;
+
+#endif   // _RWSTD_NO_LCONV_INT_FMAT
+
+    return plconv2;
+}
+
+/**************************************************************************/
+
+template <class charT>
+class Test
+{
+    std::locale        loc_;
+    bool               intl_;        // international?
+    const char        *char_name_;   // charT name ("char" or "wchar_t")
+    const char        *locname_;
+    const char        *lang_;
+    const char        *lc_all_;
+    const char        *lc_monetary_;
+
+public:
+
+    typedef std::moneypunct<charT, false> Punct;
+    typedef std::moneypunct<charT, true>  IntlPunct;
+
+    Test (const char *cname, bool intl)
+        : loc_ (), intl_ (intl),
+          char_name_ (cname),
+          locname_ (0), lang_ (0), lc_all_ (0), lc_monetary_ (0) { }
+
+    void runTest ();
+
+    void check_decimal_point (charT);
+    void check_thousands_sep (charT);
+    void check_frac_digits (int);
+    void check_grouping (const std::string&);
+
+    typedef std::char_traits<charT>                     Traits;
+    typedef std::allocator<charT>                       Allocator;
+    typedef std::basic_string<charT, Traits, Allocator> String;
+
+    void check_curr_symbol (const String&);
+    void check_positive_sign (const String&);
+    void check_negative_sign (const String&);
+
+    void check_format (const std::lconv&);
+    void check_format (bool, std::money_base::pattern, const UChar [3]);
+
+    bool check_moneypunct (const char*);
+};
+
+/**************************************************************************/
+
+template <class charT>
+void Test<charT>::
+runTest()
+{
+    // create a copy of the classic C locale
+    loc_ = std::locale::classic ();
+
+    // verify (at compile time) that _bynam facets can be used
+    // to specialize use_facet() and has_facet()
+    typedef std::moneypunct_byname<charT, false> MoneyPunctByname;
+    typedef std::moneypunct_byname<charT, true>  MoneyPunctIntlByname;
+
+    if (1) {
+        if (_STD_HAS_FACET (MoneyPunctByname, loc_))
+            _V3_USE_FACET (MoneyPunctByname, loc_);
+
+        if (_STD_HAS_FACET (MoneyPunctIntlByname, loc_))
+            _V3_USE_FACET (MoneyPunctIntlByname, loc_);
+    }
+
+    // note that values in 7.4 of C89, and 7.11, p2 of C99, respectively,
+    // or '\0' and '\0' for decimal_point and thousands_sep, are specified
+    // in 22.2.3.1.2, p1 and p2 of C++98 to be '.', and ',' in the C locale
+    // 
+    check_decimal_point (charT ('.'));
+    check_thousands_sep (charT (','));
+    check_frac_digits (0 /* i.e., not available, or same as CHAR_MAX in C */);
+    check_grouping ("");
+
+    const charT empty[] = { '\0' };
+    check_curr_symbol (empty);
+    check_positive_sign (empty);
+    check_negative_sign (empty);
+
+    // verify 22.2.6.3.2, p7:
+    // moneypunct<char>, moneypunct<wchar_t>, moneypunct<char,true>, and
+    // moneypunct<wchar_t,true>, return an object of type pattern initialized
+    // to { symbol, sign, none, value }
+    std::money_base::pattern fmat = {
+        // initializer must be properly bracketed to prevent g++ warnings
+        {
+            std::money_base::symbol,
+            std::money_base::sign,
+            std::money_base::none,
+            std::money_base::value
+        }
+    };
+
+    const UChar cpat [4] = { '?', '?', '?', 0 };
+    check_format (false /* negative */, fmat, cpat);
+    check_format (true  /* positive */, fmat, cpat);
+
+    // exercise the native locale (affected by the environment
+    // variables LANG, LC_ALL, LC_MONETARY, etc.)
+    check_moneypunct ("");   // native locale
+
+    // the name of the first non-C (and non-POSIX) locale
+    const char *first_non_c = 0;
+
+    // exercise named locales (including "C" and "POSIX")
+    for (const char* s = rw_locales (); s && *s; s += std::strlen (s) + 1) {
+        if (check_moneypunct (s))
+            if (   !first_non_c
+                && std::strcmp ("C", s)
+                && std::strcmp ("POSIX", s)) {
+                first_non_c = s;
+            }
+    }
+
+    if (!first_non_c)
+        return;
+
+    // verify that moneypunct behaves correctly when LC_ALL is set
+    // to the name of the (non-C, non-POSIX) locale
+    char envvar [80];
+
+    // make sure buffer doesn't overflow
+    assert (std::strlen(first_non_c) + sizeof "LC_ALL=" <= sizeof envvar);
+
+    std::sprintf (envvar, "LC_ALL=%s", first_non_c);
+    rw_putenv (envvar);
+    check_moneypunct ("");
+
+    // remove LC_ALL from the environment
+    rw_putenv ("LC_ALL=");
+}
+
+/**************************************************************************/
+
+std::string convert (const char*, const char *s, const char*)
+{
+    return std::string (s);
+}
+
+
+// convert a multibyte character string in an external representation
+// to wstring object in an internal representation
+std::wstring
+convert (const char *locname, const char *s, const wchar_t*)
+{
+    // save the name of the original locale
+    const char *savename = std::setlocale (LC_ALL, 0);
+
+    // switch to (named) locale
+    const char *loc = std::setlocale (LC_ALL, locname);
+    if (!loc) {
+        rw_fprintf (rw_stderr,
+                    "%s:%d: setlocale (LC_ALL, %s) = 0: %m\n",
+                    locname);
+        return std::wstring ();
+    }
+
+    // use an extension: allocate but do not initialize
+    std::wstring res ((wchar_t*)0, 64);
+
+    for ( ; ; ) {
+        // try to convert, resizing buffer if necessary
+        std::size_t n =
+            std::mbstowcs (&res [0], s, res.capacity ());
+
+        if (res.capacity () == n)
+            // increase capacity
+            res.reserve (res.capacity () * 2);
+        else if (std::size_t (-1) == n) {
+
+            // restore the original locale before printing out
+            // the error message (we don't want it localized)
+            std::setlocale (LC_ALL, savename);
+
+            rw_fprintf (rw_stderr,
+                        "%s:%d: mbstowcs(..., %#s, %zu) "
+                        "= -1: %m\n", __FILE__, __LINE__,
+                        s, res.capacity ());
+            res = std::wstring ();   // mbstowcs() error
+            break;
+        }
+        else {
+            // shrink if necessary
+            res.resize (n);
+            break;
+        }
+    }
+
+    // restore original locale
+    std::setlocale (LC_ALL, savename);
+
+    return res;
+}
+
+/**************************************************************************/
+
+template <class charT>
+bool Test<charT>::
+check_moneypunct (const char *locname)
+{
+    // (try to) set the global C locale
+    char locnamebuf [256];
+    const char *loc = std::setlocale (LC_MONETARY, locname);
+    if (!loc)
+        return false;
+
+    loc = std::strcpy (locnamebuf, loc);
+
+    locname_ = loc;
+
+    // the values of the environment variables LANG, LC_ALL,
+    // and LC_MONETARY (and others) affect the native locale
+    lang_        = std::getenv ("LANG");
+    lc_all_      = std::getenv ("LC_ALL");
+    lc_monetary_ = std::getenv ("LC_MONETARY");
+
+    if (!lang_)
+        lang_ = "(null)";
+    if (!lc_all_)
+        lc_all_ = "(null)";
+    if (!lc_monetary_)
+        lc_monetary_ = "(null)";
+
+    _TRY {
+
+        // get a pointer to lconv and copy data to a temporray buffer
+        const std::lconv* const plconv = lconvdup (std::localeconv ());
+
+        if (!plconv)
+            return false;
+
+        // reset to default locale given by LC_LANG
+        std::setlocale (LC_MONETARY, "");
+
+        // create a new C++ locale object
+        loc_ = std::locale (locname);
+
+        // check that newly constructed locale matches
+
+        // the MBCS mon_decimal_point and mon_thousands_sep must
+        // be properly converted (i.e., *mon_decimal_point may not
+        // the same as s [0] after the conversion)
+        String s;
+
+        // `locname' may be the empty string, in which case `loc'
+        // will be set to the actual name of the locale
+        if (   std::strcmp ("C", locname)
+            && std::strcmp ("C", loc)) {
+
+            // named locale other than "C" or "POISX"
+            s = ::convert (locname, plconv->mon_decimal_point, (charT*)0);
+            check_decimal_point (s.size () ? s [0] : charT ());
+
+            s = ::convert (locname, plconv->mon_thousands_sep, (charT*)0);
+            check_thousands_sep (s.size () ? s [0] : charT ());
+
+            check_frac_digits (plconv->int_frac_digits);
+        }
+        else {
+            // note that values in 7.4 of C89, and 7.11, p2 of C99,
+            // respectively, or '\0' and '\0' for decimal_point and
+            // thousands_sep, are specified in 22.2.3.1.2, p1 and p2
+            // of C++98 to be '.', and ',' in the C locale
+            check_decimal_point (charT ('.'));
+            check_thousands_sep (charT (','));
+
+            // frac_digits is specified as CHAR_MAX (i.e., not available) by C99
+            // verify that the C++ value is NOT CHAR_MAX, but rather 0 (it could
+            // be negative with the same result)
+            check_frac_digits (0);
+        }
+
+        check_grouping (plconv->mon_grouping);
+
+        // convert a (possibly) multibyte string in external
+        // representation to one in internal representation
+        s = intl_ ? ::convert (locname, plconv->int_curr_symbol, (charT*)0)
+                  : ::convert (locname, plconv->currency_symbol, (charT*)0);
+
+        check_curr_symbol (s);
+
+        s = ::convert (locname, plconv->positive_sign, (charT*)0);
+        
+        check_positive_sign (s);
+
+        s = ::convert (locname, plconv->negative_sign, (charT*)0);
+
+        check_negative_sign (s);
+
+        check_format (*plconv);
+
+        // cast away constness to work around compiler bugs (e.g., MSVC 6)
+        delete _RWSTD_CONST_CAST (std::lconv*, plconv);
+    }
+    _CATCH (...) {
+        return false;
+    }
+    return true;
+}
+
+/**************************************************************************/
+
+template <class charT>
+void Test<charT>::
+check_decimal_point (charT result)
+{
+    const charT c = intl_ ? _V3_USE_FACET (IntlPunct, loc_).decimal_point ()
+                          : _V3_USE_FACET (Punct, loc_).decimal_point ();
+
+    rw_assert (std::char_traits<charT>::eq (c, result), 0, __LINE__,
+               "moneypunct<%s, %b>::decimal_point() == %#lc, got %#lc "
+               "in locale (\"%s\") with LANG=%s, LC_ALL=%s, LC_MONETARY=%s",
+               char_name_, intl_, result, c,
+               locname_, lang_, lc_all_, lc_monetary_);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void Test<charT>::
+check_thousands_sep (charT result)
+{
+    const charT c = intl_ ? _V3_USE_FACET (IntlPunct, loc_).thousands_sep ()
+                          : _V3_USE_FACET (Punct, loc_).thousands_sep ();
+
+    rw_assert (std::char_traits<charT>::eq (c, result), 0, __LINE__,
+               "moneypunct<%s, %b>::thousands_sep() == %#lc, got %#lc "
+               "in locale (\"%s\") with LANG=%s, LC_ALL=%s, LC_MONETARY=%s",
+               char_name_, intl_, result, c,
+               locname_, lang_, lc_all_, lc_monetary_);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void Test<charT>::
+check_frac_digits (int result)
+{
+    const int i = intl_ ? _V3_USE_FACET (IntlPunct, loc_).frac_digits ()
+                        : _V3_USE_FACET (Punct, loc_).frac_digits ();
+
+    rw_assert (i == result, 0, __LINE__,
+               "moneypunct<%s, %b>::frac_digits() == %d, got %d "
+               "in locale (\"%s\") with LANG=%s, LC_ALL=%s, LC_MONETARY=%s",
+               char_name_, intl_, result, i,
+               locname_, lang_, lc_all_, lc_monetary_);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void Test<charT>::
+check_grouping (const std::string &result)
+{
+    const std::string s = intl_ ? _V3_USE_FACET (IntlPunct, loc_).grouping ()
+                                : _V3_USE_FACET (Punct, loc_).grouping ();
+
+    if (   s != result
+        && s.size () != result.size () && s.size () && result.size ()) {
+
+        // if the grouping is not exactly the same as the expected result,
+        // verify that the actual grouping is equivalent to the expected
+        // one, e.g., that "\003\003" is equivalent to "\003"
+
+        const std::string *lng  = s.size () > result.size () ? &result : &s;
+        const std::string *shrt = s.size () < result.size () ? &result : &s;
+
+        std::size_t i = shrt->size () - 1;
+
+        for ( ; i != lng->size (); ++i)
+            if ((*shrt) [shrt->size () - 1] != (*lng)[i])
+                break;
+        
+        rw_assert (i == lng->size (), 0, __LINE__,
+                   "numpunct<%s, %b>::grouping() equivalent to %#s, got %#s "
+                   "in locale (%#s) with LANG=%s, LC_ALL=%s, "
+                   "LC_MONETARY=%s",
+                   char_name_, intl_, result.c_str (), s.c_str (),
+                   locname_, lang_, lc_all_, lc_monetary_);
+    }
+    else
+        rw_assert (s == result, 0, __LINE__,
+                   "moneypunct<%s, %b>::grouping() == %#s, got %#s "
+                   "in locale (%#s) with LANG=%s, LC_ALL=%s, "
+                   "LC_MONETARY=%s",
+                   char_name_, intl_, result.c_str (), s.c_str (),
+                   locname_, lang_, lc_all_, lc_monetary_);
+
+#if 0
+
+    // Test disabled: what's meant here is that the pattern, NOT the value,
+    // is defined identically as that of numpunct<charT>::do_grouping().
+    // The values are often going to be different since one uses
+    // lconv::grouping, and the other lconv::mon_grouping.
+
+    // 22.2.6.3.2, p3: do_grouping() returns a pattern defined identically
+    //                 as the result of numpunct<charT>::do_grouping().
+
+    const std::string grp =
+        _V3_USE_FACET (std::numpunct<charT>, loc_).grouping ();
+
+    rw_assert (s == grp, 0, __LINE__,
+               "moneypunct<%s, %b>::grouping() == numpunct<>::grouping() == "
+               "%{*Ac}, got %{*Ac} in locale (\"%s\") with LANG=%s, LC_ALL=%s, "
+               "LC_MONETARY=%s",
+               char_name_, intl_,
+               int (sizeof (charT)), result.c_str (),
+               int (sizeof (charT)), s.c_str (),
+               locname_, lang_, lc_all_, lc_monetary_);
+
+#endif   // 0
+
+}
+
+/**************************************************************************/
+
+template <class charT>
+void Test<charT>::
+check_curr_symbol (const String &result)
+{
+    const String s = intl_ ? _V3_USE_FACET (IntlPunct, loc_).curr_symbol ()
+                           : _V3_USE_FACET (Punct, loc_).curr_symbol ();
+
+    rw_assert (s == result, 0, __LINE__,
+               "moneypunct<%s, %b>::curr_symbol() == %{*Ac}, got %{*Ac} "
+               "in locale (\"%s\") with LANG=%s, LC_ALL=%s, LC_MONETARY=%s",
+               char_name_, intl_,
+               int (sizeof (charT)), result.c_str (),
+               int (sizeof (charT)), s.c_str (),
+               locname_, lang_, lc_all_, lc_monetary_);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void Test<charT>::
+check_positive_sign (const String &result)
+{
+    const String s = intl_ ? _V3_USE_FACET (IntlPunct, loc_).positive_sign ()
+                           : _V3_USE_FACET (Punct, loc_).positive_sign ();
+
+    rw_assert (s == result, 0, __LINE__,
+               "moneypunct<%s, %b>::positive_sign() == %{*Ac}, got %{*Ac} "
+               "in locale (\"%s\") with LANG=%s, LC_ALL=%s, LC_MONETARY=%s",
+               char_name_, intl_,
+               int (sizeof (charT)), result.c_str (),
+               int (sizeof (charT)), s.c_str (),
+               locname_, lang_, lc_all_, lc_monetary_);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void Test<charT>::
+check_negative_sign (const String &result)
+{
+    const String s = intl_ ? _V3_USE_FACET (IntlPunct, loc_).negative_sign ()
+                           : _V3_USE_FACET (Punct, loc_).negative_sign ();
+
+    rw_assert (s == result, 0, __LINE__,
+               "moneypunct<%s, %b>::negative_sign() == %{*Ac}, got %{*Ac} "
+               "in locale (\"%s\") with LANG=%s, LC_ALL=%s, LC_MONETARY=%s",
+               char_name_, intl_,
+               int (sizeof (charT)), result.c_str (),
+               int (sizeof (charT)), s.c_str (),
+               locname_, lang_, lc_all_, lc_monetary_);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void Test<charT>::
+check_format (const std::lconv &lc)
+{
+    const UChar cpat [2][2][3] = {
+        //            ^  ^  ^
+        //            |  |  |
+        //            |  |  +--- cs_precedes, sep_by_space, sign_posn
+        //            |  +------ positive, negative
+        //            +--------- local, international
+
+        {
+            // C90 positive local format
+            { lc.p_cs_precedes, lc.p_sep_by_space, lc.p_sign_posn },
+
+            // C90 negative local format
+            { lc.n_cs_precedes, lc.n_sep_by_space, lc.n_sign_posn }
+        },
+
+#ifndef _RWSTD_NO_LCONV_INT_FMAT
+
+        {   // C99 positive international format
+            { lc.int_p_cs_precedes, lc.int_p_sep_by_space, lc.int_p_sign_posn},
+
+            // C99 negative international format
+            { lc.int_n_cs_precedes, lc.int_n_sep_by_space, lc.int_n_sign_posn }
+        }
+
+#else   // if defined (_RWSTD_NO_LCONV_INT_FMAT)
+
+        {
+            { lc.p_cs_precedes, lc.p_sep_by_space, lc.p_sign_posn },
+            { lc.n_cs_precedes, lc.n_sep_by_space, lc.n_sign_posn }
+        }
+
+#endif   // _RWSTD_NO_LCONV_INT_FMAT
+    };
+
+    // cs_precedes [0..1]:
+    //
+    // An integer set to 1 if the currency_symbol precedes the value
+    // for a monetary value, and set to 0 if the symbol succeeds
+    // the value.
+
+    // sep_by_space [0..2]:
+    //
+    // 0  No space separates the currency_symbol from the value for
+    //    a monetary value.
+    // 1  If the currency symbol and sign string are adjacent, a space
+    //    separates them from the value; otherwise, a space separates
+    //    the currency symbol from the value.
+    // 2  If the currency symbol and sign string are adjacent, a space
+    //    separates them; otherwise, a space separates the sign string
+    //    from the value.
+
+    // sign_posn [0..4]:
+    //
+    // An integer set to a value indicating the positioning of the
+    // positive_sign for a monetary value. The following integer
+    // values shall be recognized:
+    //
+    // 0  Parentheses enclose the value and the currency_symbol.
+    // 1  The sign string precedes the value and the currency_symbol.
+    // 2  The sign string succeeds the value and the currency_symbol.
+    // 3  The sign string immediately precedes the currency_symbol.
+    // 4  The sign string immediately succeeds the currency_symbol.
+
+    enum {
+        none   = std::money_base::none,
+        space  = std::money_base::space,
+        symbol = std::money_base::symbol,
+        sign   = std::money_base::sign,
+        value  = std::money_base::value
+    };
+
+    static const std::money_base::pattern patterns[] = {
+
+        /* 000: -1$. */ { { sign, value, symbol, none } },   // "\3\4\2\0"
+        /* 001: -1$. */ { { sign, value, symbol, none } },   // "\3\4\2\0"
+        /* 002: 1$-. */ { { value, symbol, sign, none } },   // "\4\2\3\0"
+        /* 003: 1-$. */ { { value, sign, symbol, none } },   // "\4\3\2\0"
+        /* 004: 1$-. */ { { value, symbol, sign, none } },   // "\4\2\3\0"
+
+        /* 010: -1 $ */ { { sign, value, space, symbol } },  // "\3\4\1\2"
+        /* 011: -1 $ */ { { sign, value, space, symbol } },  // "\3\4\1\2"
+        /* 012: 1 $- */ { { value, space, symbol, sign } },  // "\4\1\2\3"
+        /* 013: 1 -$ */ { { value, space, sign, symbol } },  // "\4\3\3\2"
+        /* 014: 1 $- */ { { value, space, symbol, sign } },  // "\4\1\2\3"
+
+        /* 020: - 1$ */ { { sign, space, value, symbol } },  // "\3\1\4\2"
+        /* 021: - 1$ */ { { sign, space, value, symbol } },  // "\3\\14\2"
+        /* 022: 1$ - */ { { value, symbol, space, sign } },  // "\4\2\1\3"
+        /* 023: 1- $ */ { { value, sign, space, symbol } },  // "\4\3\1\2"
+        /* 024: 1$ - */ { { value, symbol, space, sign } },  // "\4\2\1\3"
+
+        /* 100: -$1. */ { { sign, symbol, value, none } },   // "\3\2\4\0"
+        /* 101: -$1. */ { { sign, symbol, value, none } },   // "\3\2\4\0"
+        /* 102: $1-. */ { { symbol, value, sign, none } },   // "\2\4\3\0"
+        /* 103: -$1. */ { { sign, symbol, value, none } },   // "\3\2\4\0"
+        /* 104: $-1. */ { { symbol, sign, value, none } },   // "\2\3\4\0"
+
+        /* 110: -$ 1 */ { { sign, symbol, space, value } },  // "\3\2\1\4"
+        /* 111: -$ 1 */ { { sign, symbol, space, value } },  // "\3\2\1\4"
+        /* 112: $ 1- */ { { symbol, space, value, sign } },  // "\2\1\4\3"
+        /* 113: -$ 1 */ { { sign, symbol, space, value } },  // "\3\2\1\4"
+        /* 114: $- 1 */ { { symbol, sign, space, value } },  // "\2\3\1\4"
+
+        /* 120: - $1 */ { { sign, space, symbol, value } },  // "\3\1\2\4"
+        /* 121: - $1 */ { { sign, space, symbol, value } },  // "\3\1\2\4"
+        /* 122: $1 - */ { { symbol, value, space, sign } },  // "\2\4\1\3"
+        /* 123: - $1 */ { { sign, space, symbol, value } },  // "\3\1\2\4"
+        /* 124: $ -1 */ { { symbol, space, sign, value } }   // "\2\1\3\4"
+    };
+
+    for (int neg = 0; neg != 2; ++neg) {
+
+        enum { cs_precedes, sep_by_space, sign_posn };
+
+        // ignore unspecified formats (-1)
+        if (   cpat [intl_][neg][cs_precedes] > 1
+            || cpat [intl_][neg][sep_by_space] > 2
+            || cpat [intl_][neg][sign_posn] > 4)
+            continue;
+
+        const int inx =
+              cpat [intl_][neg][cs_precedes] * 3 * 5
+            + cpat [intl_][neg][sep_by_space] * 5
+            + cpat [intl_][neg][sign_posn];
+
+        check_format (!neg, patterns [inx], cpat [intl_][neg]);
+    }
+}
+
+/**************************************************************************/
+
+template <class charT>
+void Test<charT>::
+check_format (bool pos, std::money_base::pattern result, const UChar cpat [3])
+{
+    const std::money_base::pattern pat =
+        intl_ ? pos ? _V3_USE_FACET (IntlPunct, loc_).pos_format ()
+                    : _V3_USE_FACET (IntlPunct, loc_).neg_format ()
+              : pos ? _V3_USE_FACET (Punct, loc_).pos_format ()
+                    : _V3_USE_FACET (Punct, loc_).neg_format ();
+
+    // number of times each symbol appears in pattern
+    int counts [5] = { 0 };
+
+    for (unsigned i = 0; i != sizeof pat.field / sizeof *pat.field; i++) {
+
+        if (UChar (pat.field [i] < char (sizeof counts / sizeof *counts)))
+            ++counts [UChar (pat.field [i])];
+
+        // verify 22.2.6.3, p1
+        if (std::money_base::none == pat.field [i] && !i)
+            rw_assert (false, 0, __LINE__,
+                       "moneypunct<%s, %b>::%s_format() == %{LM}, "
+                       "none must not appear first",
+                       char_name_, intl_, pos ? "pos" : "neg",
+                       pat.field);
+
+        if (   std::money_base::space == pat.field [i]
+            && !i && i != sizeof pat.field / sizeof *pat.field - 1)
+            rw_assert (false, 0, __LINE__,
+                       "moneypunct<%s, %b>::%s_format() == %{LM}, "
+                       "space must not appear first or last",
+                       char_name_, intl_, pos ? "pos" : "neg",
+                       pat.field);
+    }
+
+    // verify that the actual pattern matches the expected one
+    rw_assert (0 == std::memcmp (&pat, &result, sizeof pat), 0, __LINE__,
+               "moneypunct<%s, %b>::%s_format() == %{LM}, got %{LM}; "
+               "(cs_precedes = '\\%o', sep_by_space = '\\%o', "
+               "sign_posn = '\\%o')",
+               char_name_, intl_, pos ? "pos" : "neg",
+               pat.field, result.field, cpat [0], cpat [1], cpat [2]);
+
+    // verify 22.2.6.3, p1
+    rw_assert (1 == counts [std::money_base::symbol], 0, __LINE__,
+               "money_base::symbol must apear exactly once, did %d times",
+               counts [std::money_base::symbol]);
+
+    rw_assert (1 == counts [std::money_base::sign], 0, __LINE__,
+               "money_base::sign must apear exactly once, did %d times",
+               counts [std::money_base::sign]);
+
+    rw_assert (1 == counts [std::money_base::value], 0, __LINE__,
+               "money_base::value must apear exactly once, did %d times",
+               counts [std::money_base::value]);
+
+    rw_assert (1 ==   counts [std::money_base::space]
+                    + counts [std::money_base::none], 0, __LINE__,
+               "money_base::space or money_base::none must appear "
+               "exactly once, did %d times",
+                 counts [std::money_base::space]
+               + counts [std::money_base::none]);
+}
+
+/****************************************************************************/
+
+static int
+run_test (int, char**)
+{
+    {
+        Test<char> t ("char", false);
+        t.runTest ();
+    }
+
+    {
+        Test<char> t ("char", true);
+        t.runTest ();
+    }
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    {
+        Test<wchar_t> t ("wchar_t", false);
+        t.runTest ();
+    }
+
+    {
+        Test<wchar_t> t ("wchar_t", true);
+        t.runTest ();
+    }
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+    return 0;
+}
+
+
+/****************************************************************************/
+
+int main (int argc, char *argv[])
+{
+    return rw_test (argc, argv, __FILE__,
+                    "lib.locale.moneypunct",
+                    0 /* no comment */,
+                    run_test,
+                    "",
+                    (void*)0   /* sentinel */);
+}
diff --git a/tests/localization/22.locale.moneypunct.mt.cpp b/tests/localization/22.locale.moneypunct.mt.cpp
new file mode 100644
index 0000000..4c22460
--- /dev/null
+++ b/tests/localization/22.locale.moneypunct.mt.cpp
@@ -0,0 +1,542 @@
+/************************************************************************
+ *
+ * 22.locale.moneypunct.mt.cpp
+ *
+ * test exercising the thread safety of the moneypunct facet
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#include <ios>        // for ios
+#include <locale>     // for locale, moneypunct
+
+#include <clocale>    // for lconv, localeconv()
+#include <cstdlib>    // for mbstowcs()
+#include <cstring>    // for size_t, strcpy()
+
+#include <rw_locale.h>
+#include <rw_thread.h>
+#include <driver.h>
+#include <valcmp.h>
+
+
+// maximum number of threads allowed by the command line interface
+#define MAX_THREADS   32
+
+
+#ifdef _RWSTD_REENTRANT
+int rw_opt_nthreads = 4;
+#else   // if !defined (_RWSTD_REENTRANT)
+// in non-threaded builds use just one thread
+int rw_opt_nthreads = 1;
+#endif   // _RWSTD_REENTRANT
+
+// the number of times each thread should iterate (unless specified
+// otherwise on the command line)
+int rw_opt_nloops = 200000;
+
+/**************************************************************************/
+
+// number of locales to test
+static std::size_t
+nlocales;
+
+/**************************************************************************/
+
+struct MoneypunctData
+{
+    // the name of the locale the data goes with
+    const char* locale_name_;
+
+    char decimal_point_;
+    char thousands_sep_;
+    char grouping_ [32];
+    char curr_symbol_ [32];
+    char positive_sign_ [32];
+    char negative_sign_ [32];
+    int  frac_digits_;
+    char pos_format_ [32];
+    char neg_format_ [32];
+
+    char int_curr_symbol_ [32];
+
+    int  int_frac_digits_;
+    char int_pos_format_ [32];
+    char int_neg_format_ [32];
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    wchar_t wdecimal_point_;
+    wchar_t wthousands_sep_;
+    wchar_t wcurr_symbol_ [32];
+    wchar_t wpositive_sign_ [32];
+    wchar_t wnegative_sign_ [32];
+
+    wchar_t wint_curr_symbol_ [32];
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+} punct_data [MAX_THREADS];
+
+
+extern "C" {
+
+bool test_char;    // exercise num_put<char>
+bool test_wchar;   // exercise num_put<wchar_t>
+
+
+static void*
+thread_func (void*)
+{
+    for (int i = 0; i != rw_opt_nloops; ++i) {
+
+        const std::size_t inx = std::size_t (i) % nlocales;
+
+        const MoneypunctData* const data = punct_data + inx;
+
+        // construct a named locale
+        const std::locale loc (data->locale_name_);
+
+        if (test_char) {
+            // exercise the narrow char, local specialization of the facet
+
+            typedef std::moneypunct<char, false> Punct;
+
+            const Punct &mp = std::use_facet<Punct>(loc);
+
+            const char           dp  = mp.decimal_point ();
+            const char           ts  = mp.thousands_sep ();
+            const std::string    grp = mp.grouping ();
+            const std::string    cur = mp.curr_symbol ();
+            const std::string    pos = mp.positive_sign ();
+            const std::string    neg = mp.negative_sign ();
+            const int            fd  = mp.frac_digits ();
+            const Punct::pattern pfm = mp.pos_format ();
+            const Punct::pattern nfm = mp.neg_format ();
+
+            RW_ASSERT (dp == data->decimal_point_);
+            RW_ASSERT (ts == data->thousands_sep_);
+            RW_ASSERT (fd == data->frac_digits_);
+            RW_ASSERT (!rw_strncmp (grp.c_str (), data->grouping_));
+            RW_ASSERT (!rw_strncmp (cur.c_str (), data->curr_symbol_));
+            RW_ASSERT (!rw_strncmp (pos.c_str (), data->positive_sign_));
+            RW_ASSERT (!rw_strncmp (neg.c_str (), data->negative_sign_));
+
+            RW_ASSERT (!std::memcmp (&pfm, data->pos_format_, 4));
+            RW_ASSERT (!std::memcmp (&nfm, data->neg_format_, 4));
+        }
+
+        if (test_char) {
+            // exercise the narrow char, international specialization
+
+            typedef std::moneypunct<char, true> Punct;
+
+            const Punct &mp = std::use_facet<Punct>(loc);
+
+            const char           dp  = mp.decimal_point ();
+            const char           ts  = mp.thousands_sep ();
+            const std::string    grp = mp.grouping ();
+            const std::string    cur = mp.curr_symbol ();
+            const std::string    pos = mp.positive_sign ();
+            const std::string    neg = mp.negative_sign ();
+            const int            fd  = mp.frac_digits ();
+            const Punct::pattern pfm = mp.pos_format ();
+            const Punct::pattern nfm = mp.neg_format ();
+
+            RW_ASSERT (dp == data->decimal_point_);
+            RW_ASSERT (ts == data->thousands_sep_);
+            RW_ASSERT (fd == data->frac_digits_);
+            RW_ASSERT (!rw_strncmp (grp.c_str (), data->grouping_));
+            RW_ASSERT (!rw_strncmp (cur.c_str (), data->int_curr_symbol_));
+            RW_ASSERT (!rw_strncmp (pos.c_str (), data->positive_sign_));
+            RW_ASSERT (!rw_strncmp (neg.c_str (), data->negative_sign_));
+
+            RW_ASSERT (!std::memcmp (&pfm, data->int_pos_format_, 4));
+            RW_ASSERT (!std::memcmp (&nfm, data->int_neg_format_, 4));
+        }
+
+        // both specializations may be tested at the same time
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+        if (test_wchar) {
+            // exercise the wide char, local specialization of the facet
+
+            typedef std::moneypunct<wchar_t, false> Punct;
+
+            const Punct &mp = std::use_facet<Punct>(loc);
+
+            const char           dp  = mp.decimal_point ();
+            const char           ts  = mp.thousands_sep ();
+            const std::string    grp = mp.grouping ();
+            const std::wstring   cur = mp.curr_symbol ();
+            const std::wstring   pos = mp.positive_sign ();
+            const std::wstring   neg = mp.negative_sign ();
+            const int            fd  = mp.frac_digits ();
+            const Punct::pattern pfm = mp.pos_format ();
+            const Punct::pattern nfm = mp.neg_format ();
+
+            RW_ASSERT (dp == data->wdecimal_point_);
+            RW_ASSERT (ts == data->wthousands_sep_);
+            RW_ASSERT (fd == data->frac_digits_);
+            RW_ASSERT (!rw_strncmp (grp.c_str (), data->grouping_));
+            RW_ASSERT (!rw_strncmp (cur.c_str (), data->wcurr_symbol_));
+            RW_ASSERT (!rw_strncmp (pos.c_str (), data->wpositive_sign_));
+            RW_ASSERT (!rw_strncmp (neg.c_str (), data->wnegative_sign_));
+
+            RW_ASSERT (!std::memcmp (&pfm, data->pos_format_, 4));
+            RW_ASSERT (!std::memcmp (&nfm, data->neg_format_, 4));
+        }
+
+        if (test_wchar) {
+            // exercise the wide char, international specialization
+
+            typedef std::moneypunct<wchar_t, true> Punct;
+
+            const Punct &mp = std::use_facet<Punct>(loc);
+
+            const char           dp  = mp.decimal_point ();
+            const char           ts  = mp.thousands_sep ();
+            const std::string    grp = mp.grouping ();
+            const std::wstring   cur = mp.curr_symbol ();
+            const std::wstring   pos = mp.positive_sign ();
+            const std::wstring   neg = mp.negative_sign ();
+            const int            fd  = mp.frac_digits ();
+            const Punct::pattern pfm = mp.pos_format ();
+            const Punct::pattern nfm = mp.neg_format ();
+
+            RW_ASSERT (dp == data->wdecimal_point_);
+            RW_ASSERT (ts == data->wthousands_sep_);
+            RW_ASSERT (fd == data->frac_digits_);
+            RW_ASSERT (!rw_strncmp (grp.c_str (), data->grouping_));
+            RW_ASSERT (!rw_strncmp (cur.c_str (), data->wint_curr_symbol_));
+            RW_ASSERT (!rw_strncmp (pos.c_str (), data->wpositive_sign_));
+            RW_ASSERT (!rw_strncmp (neg.c_str (), data->wnegative_sign_));
+
+            RW_ASSERT (!std::memcmp (&pfm, data->int_pos_format_, 4));
+            RW_ASSERT (!std::memcmp (&nfm, data->int_neg_format_, 4));
+        }
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+    }
+
+    return 0;
+}
+
+}   // extern "C"
+
+/**************************************************************************/
+
+static void
+get_format (MoneypunctData *pdata, const std::lconv *pconv)
+{
+    // code copied from src/punct.cpp
+
+    enum {
+        // for syntactic convenience
+        none   = std::money_base::none,
+        space  = std::money_base::space,
+        symbol = std::money_base::symbol,
+        sign   = std::money_base::sign,
+        value  = std::money_base::value
+    };
+
+    static const std::money_base::pattern pat[] = {
+
+        // cs_precedes [0..1]:
+        //
+        // An integer set to 1 if the currency_symbol precedes the value
+        // for a monetary value, and set to 0 if the symbol succeeds
+        // the value.
+
+        // sep_by_space [0..2]:
+        //
+        // 0  No space separates the currency_symbol from the value for
+        //    a monetary value.
+        // 1  If the currency symbol and sign string are adjacent, a space
+        //    separates them from the value; otherwise, a space separates
+        //    the currency symbol from the value.
+        // 2  If the currency symbol and sign string are adjacent, a space
+        //    separates them; otherwise, a space separates the sign string
+        //    from the value.
+
+        // sign_posn [0..4]:
+        //
+        // An integer set to a value indicating the positioning of the
+        // positive_sign for a monetary value. The following integer
+        // values shall be recognized:
+        //
+        // 0  Parentheses enclose the value and the currency_symbol.
+        // 1  The sign string precedes the value and the currency_symbol.
+        // 2  The sign string succeeds the value and the currency_symbol.
+        // 3  The sign string immediately precedes the currency_symbol.
+        // 4  The sign string immediately succeeds the currency_symbol.
+
+        // +-------- cs_precedes
+        // |+----- sep_by_space
+        // ||+-- sign_posn
+        // |||
+        // VVV  ....        -     1      $       .           // pattern
+        /* 000: -1$. */ { { sign, value, symbol, none } },   // "\3\4\2\0"
+        /* 001: -1$. */ { { sign, value, symbol, none } },   // "\3\4\2\0"
+        /* 002: 1$-. */ { { value, symbol, sign, none } },   // "\4\2\3\0"
+        /* 003: 1-$. */ { { value, sign, symbol, none } },   // "\4\3\2\0"
+        /* 004: 1$-. */ { { value, symbol, sign, none } },   // "\4\2\3\0"
+
+        /* 010: -1 $ */ { { sign, value, space, symbol } },  // "\3\4\1\2"
+        /* 011: -1 $ */ { { sign, value, space, symbol } },  // "\3\4\1\2"
+        /* 012: 1 $- */ { { value, space, symbol, sign } },  // "\4\1\2\3"
+        /* 013: 1 -$ */ { { value, space, sign, symbol } },  // "\4\3\3\2"
+        /* 014: 1 $- */ { { value, space, symbol, sign } },  // "\4\1\2\3"
+
+        /* 020: - 1$ */ { { sign, space, value, symbol } },  // "\3\1\4\2"
+        /* 021: - 1$ */ { { sign, space, value, symbol } },  // "\3\1\4\2"
+        /* 022: 1$ - */ { { value, symbol, space, sign } },  // "\4\2\1\3"
+        /* 023: 1- $ */ { { value, sign, space, symbol } },  // "\4\3\1\2"
+        /* 024: 1$ - */ { { value, symbol, space, sign } },  // "\4\2\1\3"
+
+        /* 100: -$1. */ { { sign, symbol, value, none } },   // "\3\2\4\0"
+        /* 101: -$1. */ { { sign, symbol, value, none } },   // "\3\2\4\0"
+        /* 102: $1-. */ { { symbol, value, sign, none } },   // "\2\4\3\0"
+        /* 103: -$1. */ { { sign, symbol, value, none } },   // "\3\2\4\0"
+        /* 104: $-1. */ { { symbol, sign, value, none } },   // "\2\3\4\0"
+
+        /* 110: -$ 1 */ { { sign, symbol, space, value } },  // "\3\2\1\4"
+        /* 111: -$ 1 */ { { sign, symbol, space, value } },  // "\3\2\1\4"
+        /* 112: $ 1- */ { { symbol, space, value, sign } },  // "\2\1\4\3"
+        /* 113: -$ 1 */ { { sign, symbol, space, value } },  // "\3\2\1\4"
+        /* 114: $- 1 */ { { symbol, sign, space, value } },  // "\2\3\1\4"
+
+        /* 120: - $1 */ { { sign, space, symbol, value } },  // "\3\1\2\4"
+        /* 121: - $1 */ { { sign, space, symbol, value } },  // "\3\1\2\4"
+        /* 122: $1 - */ { { symbol, value, space, sign } },  // "\2\4\1\3"
+        /* 123: - $1 */ { { sign, space, symbol, value } },  // "\3\1\2\4"
+        /* 124: $ -1 */ { { symbol, space, sign, value } }   // "\2\1\3\4"
+    };
+
+    std::size_t inx;
+
+    inx =   std::size_t (pconv->p_cs_precedes) * (3U * 5U)
+          + std::size_t (pconv->p_sep_by_space) * 5U
+          + std::size_t (pconv->p_sign_posn);
+
+    if (inx < sizeof pat / sizeof *pat)
+        std::memcpy (pdata->pos_format_, pat + inx, sizeof *pat);
+    else
+        std::memset (pdata->pos_format_, none, sizeof *pat);
+
+    inx =   std::size_t (pconv->n_cs_precedes) * (3U * 5U)
+          + std::size_t (pconv->n_sep_by_space) * 5U
+          + std::size_t (pconv->n_sign_posn);
+
+    if (inx < sizeof pat / sizeof *pat)
+        std::memcpy (pdata->neg_format_, pat + inx, sizeof *pat);
+    else
+        std::memset (pdata->neg_format_, none, sizeof *pat);
+
+
+#ifndef _RWSTD_NO_LCONV_INT_FMAT
+
+    inx =   std::size_t (pconv->int_p_cs_precedes) * (3U * 5U)
+          + std::size_t (pconv->int_p_sep_by_space) * 5U
+          + std::size_t (pconv->int_p_sign_posn);
+
+    if (inx < sizeof pat / sizeof *pat)
+        std::memcpy (pdata->int_pos_format_, pat + inx, sizeof *pat);
+    else
+        std::memset (pdata->int_pos_format_, none, sizeof *pat);
+
+    inx =   std::size_t (pconv->int_n_cs_precedes) * (3U * 5U)
+          + std::size_t (pconv->int_n_sep_by_space) * 5U
+          + std::size_t (pconv->int_n_sign_posn);
+
+    if (inx < sizeof pat / sizeof *pat)
+        memcpy (pdata->int_neg_format_, pat + inx, sizeof *pat);
+    else
+        memset (pdata->int_neg_format_, none, sizeof *pat);
+
+    std::strcpy (pdata->int_curr_symbol_, pconv->int_curr_symbol);
+
+    pdata->int_frac_digits_ = pconv->int_frac_digits;
+
+#else   // if defined (_RWSTD_NO_LCONV_INT_FMAT)
+
+    std::strcpy (pdata->int_curr_symbol_, pconv->curr_symbol);
+
+    pdata->int_frac_digits_ = pconv->frac_digits;
+
+#endif   // _RWSTD_NO_LCONV_INT_FMAT
+
+}
+
+
+static int
+run_test (int, char**)
+{
+    // get a NUL-separated list of names of installed locales
+    char* const locale_list = rw_locales ();
+
+    // array of locale names to use for testing
+    const char* locales [sizeof punct_data / sizeof *punct_data];
+
+    const std::size_t maxinx = sizeof locales / sizeof *locales;
+
+    // iterate over locales, initializing a global punct_data array
+    for (char *name = locale_list; *name; name += std::strlen (name) + 1) {
+
+        const std::size_t inx = nlocales;
+
+        // set LC_NUMERIC and LC_CTYPE to be able to use mbstowcs()
+        if (std::setlocale (LC_ALL, name)) {
+
+            const std::lconv* const pconv = std::localeconv ();
+            MoneypunctData* const pdata = punct_data + inx;
+
+            locales [inx] = pdata->locale_name_ = name;
+
+            // assign just the first character of the (potentially)
+            // multibyte decimal_point and thousands_sep (C++ locale
+            // can't deal with more)
+            pdata->decimal_point_ = *pconv->mon_decimal_point;
+            pdata->thousands_sep_ = *pconv->mon_thousands_sep;
+
+            pdata->frac_digits_   = pconv->frac_digits;
+
+            // simply copy the narrow grouping, currency symbols,
+            // and signs
+            std::strcpy (pdata->grouping_,      pconv->mon_grouping);
+            std::strcpy (pdata->curr_symbol_,   pconv->currency_symbol);
+            std::strcpy (pdata->negative_sign_, pconv->negative_sign);
+            std::strcpy (pdata->positive_sign_, pconv->positive_sign);
+            std::strcpy (pdata->grouping_,      pconv->mon_grouping);
+
+            get_format (pdata, pconv);
+
+#ifndef _RWSTD_WCHAR_T
+
+            wchar_t tmp [2];
+
+            // convert multibyte decimal point and thousands separator
+            // to wide characters (assumes they are single character
+            // each -- C++ locale can't handle more)
+            std::mbstowcs (tmp, pconv->mon_decimal_point, 2);
+            pdata->wdecimal_point_ = tmp [0];
+
+            std::mbstowcs (tmp, pconv->mon_thousands_sep, 2);
+            pdata->wthousands_sep_ = tmp [0];
+
+            const std::size_t n =
+                sizeof pdata->wcurr_symbol_ / sizeof (wchar_t);
+
+            std::mbstowcs (pdata->wcurr_symbol_,   pdata->curr_symbol_,   n);
+            std::mbstowcs (pdata->wnegative_sign_, pdata->negative_sign_, n);
+            std::mbstowcs (pdata->wpositive_sign_, pdata->positive_sign_, n);
+
+            std::mbstowcs (pdata->wint_curr_symbol_,
+                           pdata->int_curr_symbol_,
+                           n);
+
+#endif   // _RWSTD_WCHAR_T
+
+            ++nlocales;
+        }
+
+        if (nlocales == maxinx)
+            break;
+    }
+
+    // reset the global locale
+    std::setlocale (LC_ALL, "C");
+
+    rw_info (0, 0, 0,
+             "testing std::moneypunct<charT> with %d thread%{?}s%{;}, "
+             "%zu iteration%{?}s%{;} each, in locales { %{ .*A@} }",
+             rw_opt_nthreads, 1 != rw_opt_nthreads,
+             rw_opt_nloops, 1 != rw_opt_nloops,
+             int (nlocales), "%#s", locales);
+
+    rw_info (0, 0, 0, "exercising std::moneypunct<char>");
+
+    test_char  = true;
+    test_wchar = false;
+
+    // create and start a pool of threads and wait for them to finish
+    int result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    rw_info (0, 0, 0, "exercising std::moneypunct<wchar_t>");
+
+    test_char  = false;
+    test_wchar = true;
+
+    // start a pool of threads to exercise the thread safety
+    // of the wchar_t specialization
+    result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+    // exercise both the char and the wchar_t specializations
+    // at the same time
+
+    rw_info (0, 0, 0,
+             "exercising both std::moneypunct<char> "
+             "and std::moneypunct<wchar_t>");
+
+    test_char  = true;
+    test_wchar = true;
+
+    // start a pool of threads to exercise wstring thread safety
+    result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+    return result;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv[])
+{
+    return rw_test (argc, argv, __FILE__,
+                    "lib.locale.moneypunct",
+                    "thread safety", run_test,
+                    "|-nloops#0 "       // must be non-negative
+                    "|-nthreads#0-*",   // must be in [0, MAX_THREADS]
+                    &rw_opt_nloops,
+                    int (MAX_THREADS),
+                    &rw_opt_nthreads);
+}
diff --git a/tests/localization/22.locale.num.get.cpp b/tests/localization/22.locale.num.get.cpp
index d66374f..68452e1 100644
--- a/tests/localization/22.locale.num.get.cpp
+++ b/tests/localization/22.locale.num.get.cpp
@@ -192,12 +192,12 @@
 
     virtual string_type do_truename () const {
         char_type name [40];
-        return rw_widen (name, truename_, sizeof name / sizeof *name);
+        return rw_widen (name, truename_, sizeof name / sizeof *name - 1);
     }
 
     virtual string_type do_falsename () const {
         char_type name [40];
-        return rw_widen (name, falsename_, sizeof name / sizeof *name);
+        return rw_widen (name, falsename_, sizeof name / sizeof *name - 1);
     }
 };
 
@@ -266,6 +266,15 @@
         return 0;
     }
 
+    if (*grouping && '%' != *grouping && rw_opt_no_grouping) {
+        // if grouping is not empty (and doesn't start with '%')
+        // check the state of the --no-grouping command line
+        // option before proceeding with the test case
+        rw_note (0, __FILE__, __LINE__,
+                 "grouping test on line %d disabled", lineno);
+        return 0;
+    }
+
     // create a distinct punctuation facet for each iteration to make sure
     // any data cached in between successive calls to the facet's public
     // member functions are flushed
@@ -436,7 +445,7 @@
              const char *iname,           // name of iterator type
              nativeT     val,             // value expected to be extracted
              const char *str,             // input sequence
-             int         eat_expect = -1,   // number of consumed characters
+             int         eat_expect = -1, // number of consumed characters
              int         flags = 0,       // initial set of flags
              int         err_expect = -1, // expected iostate
              const char *grouping = "")   // optional grouping string
@@ -1571,12 +1580,128 @@
 #      define LL(number)   number ## I64
 #    endif   // _MSC_VER
 
-    TEST (T,  LL (   0),                    "0",  1, 0, Eof);
-    TEST (T,  LL (   0),                   "+0",  2, 0, Eof);
-    TEST (T,  LL (   0),                   "-0",  2, 0, Eof);
-    TEST (T,  LL (   1),                   "+1",  2, 0, Eof);
-    TEST (T, -LL (   1),                   "-1",  2, 0, Eof);
-    TEST (T,  LL (1079),                 "1079",  4, 0, Eof);
+    TEST (T,  LL (                  0),                    "0",   1, 0, Eof);
+    TEST (T,  LL (                  1),                    "1",   1, 0, Eof);
+    TEST (T,  LL (                 12),                   "12",   2, 0, Eof);
+    TEST (T,  LL (                123),                  "123",   3, 0, Eof);
+    TEST (T,  LL (               1234),                 "1234",   4, 0, Eof);
+    TEST (T,  LL (              12345),                "12345",   5, 0, Eof);
+    TEST (T,  LL (             123456),               "123456",   6, 0, Eof);
+    TEST (T,  LL (            1234567),              "1234567",   7, 0, Eof);
+    TEST (T,  LL (           12345678),             "12345678",   8, 0, Eof);
+    TEST (T,  LL (          123456789),            "123456789",   9, 0, Eof);
+    TEST (T,  LL (         1234567890),           "1234567890",  10, 0, Eof);
+    TEST (T,  LL (        12345678901),          "12345678901",  11, 0, Eof);
+    TEST (T,  LL (       123456789012),         "123456789012",  12, 0, Eof);
+    TEST (T,  LL (      1234567890123),        "1234567890123",  13, 0, Eof);
+    TEST (T,  LL (     12345678901234),       "12345678901234",  14, 0, Eof);
+    TEST (T,  LL (    123456789012345),      "123456789012345",  15, 0, Eof);
+    TEST (T,  LL (   1234567890123456),     "1234567890123456",  16, 0, Eof);
+    TEST (T,  LL (  12345678901234567),    "12345678901234567",  17, 0, Eof);
+    TEST (T,  LL ( 123456789012345678),   "123456789012345678",  18, 0, Eof);
+    TEST (T,  LL (1234567890123456789),  "1234567890123456789",  19, 0, Eof);
+
+    TEST (T,  LL (                  0),  "0000000000000000000",  19, dec, Eof);
+    TEST (T,  LL (                  1),  "0000000000000000001",  19, dec, Eof);
+    TEST (T,  LL (                  2),   "000000000000000002",  18, dec, Eof);
+    TEST (T,  LL (                  3),    "00000000000000003",  17, dec, Eof);
+    TEST (T,  LL (                  4),     "0000000000000004",  16, dec, Eof);
+    TEST (T,  LL (                  5),      "000000000000005",  15, dec, Eof);
+    TEST (T,  LL (                  6),       "00000000000006",  14, dec, Eof);
+    TEST (T,  LL (                  7),        "0000000000007",  13, dec, Eof);
+    TEST (T,  LL (                  8),         "000000000008",  12, dec, Eof);
+    TEST (T,  LL (                  9),          "00000000009",  11, dec, Eof);
+    TEST (T,  LL (                  1),           "0000000001",  10, dec, Eof);
+    TEST (T,  LL (                  2),            "000000002",   9, dec, Eof);
+    TEST (T,  LL (                  3),             "00000003",   8, dec, Eof);
+    TEST (T,  LL (                  4),              "0000004",   7, dec, Eof);
+    TEST (T,  LL (                  5),               "000005",   6, dec, Eof);
+    TEST (T,  LL (                  6),                "00006",   5, dec, Eof);
+    TEST (T,  LL (                  7),                 "0007",   4, dec, Eof);
+    TEST (T,  LL (                  8),                  "008",   3, dec, Eof);
+    TEST (T,  LL (                  9),                   "09",   2, dec, Eof);
+
+    TEST (T, +LL (                  0),                    "+0",  2, 0, Eof);
+    TEST (T, +LL (                  1),                    "+1",  2, 0, Eof);
+    TEST (T, +LL (                 12),                   "+12",  3, 0, Eof);
+    TEST (T, +LL (                123),                  "+123",  4, 0, Eof);
+    TEST (T, +LL (               1234),                 "+1234",  5, 0, Eof);
+    TEST (T, +LL (              12345),                "+12345",  6, 0, Eof);
+    TEST (T, +LL (             123456),               "+123456",  7, 0, Eof);
+    TEST (T, +LL (            1234567),              "+1234567",  8, 0, Eof);
+    TEST (T, +LL (           12345678),             "+12345678",  9, 0, Eof);
+    TEST (T, +LL (          123456789),            "+123456789", 10, 0, Eof);
+    TEST (T, +LL (         1234567890),           "+1234567890", 11, 0, Eof);
+    TEST (T, +LL (        12345678901),          "+12345678901", 12, 0, Eof);
+    TEST (T, +LL (       123456789012),         "+123456789012", 13, 0, Eof);
+    TEST (T, +LL (      1234567890123),        "+1234567890123", 14, 0, Eof);
+    TEST (T, +LL (     12345678901234),       "+12345678901234", 15, 0, Eof);
+    TEST (T, +LL (    123456789012345),      "+123456789012345", 16, 0, Eof);
+    TEST (T, +LL (   1234567890123456),     "+1234567890123456", 17, 0, Eof);
+    TEST (T, +LL (  12345678901234567),    "+12345678901234567", 18, 0, Eof);
+    TEST (T, +LL ( 123456789012345678),   "+123456789012345678", 19, 0, Eof);
+    TEST (T, +LL (1234567890123456789),  "+1234567890123456789", 20, 0, Eof);
+
+    TEST (T, +LL (                   0), "+0000000000000000000", 20, dec, Eof);
+    TEST (T, +LL (                   1), "+0000000000000000001", 20, dec, Eof);
+    TEST (T, +LL (                   2),  "+000000000000000002", 19, dec, Eof);
+    TEST (T, +LL (                   3),   "+00000000000000003", 18, dec, Eof);
+    TEST (T, +LL (                   4),    "+0000000000000004", 17, dec, Eof);
+    TEST (T, +LL (                   5),     "+000000000000005", 16, dec, Eof);
+    TEST (T, +LL (                   6),      "+00000000000006", 15, dec, Eof);
+    TEST (T, +LL (                   7),       "+0000000000007", 14, dec, Eof);
+    TEST (T, +LL (                   8),        "+000000000008", 13, dec, Eof);
+    TEST (T, +LL (                   9),         "+00000000009", 12, dec, Eof);
+    TEST (T, +LL (                   1),          "+0000000001", 11, dec, Eof);
+    TEST (T, +LL (                   2),           "+000000002", 10, dec, Eof);
+    TEST (T, +LL (                   3),            "+00000003",  9, dec, Eof);
+    TEST (T, +LL (                   4),             "+0000004",  8, dec, Eof);
+    TEST (T, +LL (                   5),              "+000005",  7, dec, Eof);
+    TEST (T, +LL (                   6),               "+00006",  6, dec, Eof);
+    TEST (T, +LL (                   7),                "+0007",  5, dec, Eof);
+    TEST (T, +LL (                   8),                 "+008",  4, dec, Eof);
+    TEST (T, +LL (                   9),                  "+09",  3, dec, Eof);
+
+    TEST (T, -LL (                  0),                    "-0",  2, 0, Eof);
+    TEST (T, -LL (                  1),                    "-1",  2, 0, Eof);
+    TEST (T, -LL (                 12),                   "-12",  3, 0, Eof);
+    TEST (T, -LL (                123),                  "-123",  4, 0, Eof);
+    TEST (T, -LL (               1234),                 "-1234",  5, 0, Eof);
+    TEST (T, -LL (              12345),                "-12345",  6, 0, Eof);
+    TEST (T, -LL (             123456),               "-123456",  7, 0, Eof);
+    TEST (T, -LL (            1234567),              "-1234567",  8, 0, Eof);
+    TEST (T, -LL (           12345678),             "-12345678",  9, 0, Eof);
+    TEST (T, -LL (          123456789),            "-123456789", 10, 0, Eof);
+    TEST (T, -LL (         1234567890),           "-1234567890", 11, 0, Eof);
+    TEST (T, -LL (        12345678901),          "-12345678901", 12, 0, Eof);
+    TEST (T, -LL (       123456789012),         "-123456789012", 13, 0, Eof);
+    TEST (T, -LL (      1234567890123),        "-1234567890123", 14, 0, Eof);
+    TEST (T, -LL (     12345678901234),       "-12345678901234", 15, 0, Eof);
+    TEST (T, -LL (    123456789012345),      "-123456789012345", 16, 0, Eof);
+    TEST (T, -LL (   1234567890123456),     "-1234567890123456", 17, 0, Eof);
+    TEST (T, -LL (  12345678901234567),    "-12345678901234567", 18, 0, Eof);
+    TEST (T, -LL ( 123456789012345678),   "-123456789012345678", 19, 0, Eof);
+    TEST (T, -LL (1234567890123456789),  "-1234567890123456789", 20, 0, Eof);
+
+    TEST (T, -LL (                  0),  "-0000000000000000000", 20, dec, Eof);
+    TEST (T, -LL (                  1),  "-0000000000000000001", 20, dec, Eof);
+    TEST (T, -LL (                  2),   "-000000000000000002", 19, dec, Eof);
+    TEST (T, -LL (                  3),    "-00000000000000003", 18, dec, Eof);
+    TEST (T, -LL (                  4),     "-0000000000000004", 17, dec, Eof);
+    TEST (T, -LL (                  5),      "-000000000000005", 16, dec, Eof);
+    TEST (T, -LL (                  6),       "-00000000000006", 15, dec, Eof);
+    TEST (T, -LL (                  7),        "-0000000000007", 14, dec, Eof);
+    TEST (T, -LL (                  8),         "-000000000008", 13, dec, Eof);
+    TEST (T, -LL (                  9),          "-00000000009", 12, dec, Eof);
+    TEST (T, -LL (                  1),           "-0000000001", 11, dec, Eof);
+    TEST (T, -LL (                  2),            "-000000002", 10, dec, Eof);
+    TEST (T, -LL (                  3),             "-00000003",  9, dec, Eof);
+    TEST (T, -LL (                  4),              "-0000004",  8, dec, Eof);
+    TEST (T, -LL (                  5),               "-000005",  7, dec, Eof);
+    TEST (T, -LL (                  6),                "-00006",  6, dec, Eof);
+    TEST (T, -LL (                  7),                 "-0007",  5, dec, Eof);
+    TEST (T, -LL (                  8),                  "-008",  4, dec, Eof);
+    TEST (T, -LL (                  9),                   "-09",  3, dec, Eof);
 
     // LLONG_MAX for a 64-bit long long
     TEST (T, +LL (9223372036854775807), "+9223372036854775807", 20, 0, Eof);
@@ -1589,6 +1714,179 @@
     // warning: this decimal constant is unsigned only in ISO C90
     TEST (T, -LL (9223372036854775807) - 1, "-9223372036854775808", 20, 0, Eof);
 
+    // exercise hex parsing
+    TEST (T,  LL (                  0),                    "0",   1, hex, Eof);
+    TEST (T,  LL (                0x1),                    "1",   1, hex, Eof);
+    TEST (T,  LL (               0x12),                   "12",   2, hex, Eof);
+    TEST (T,  LL (              0x123),                  "123",   3, hex, Eof);
+    TEST (T,  LL (             0x1234),                 "1234",   4, hex, Eof);
+    TEST (T,  LL (            0x12345),                "12345",   5, hex, Eof);
+    TEST (T,  LL (           0x123456),               "123456",   6, hex, Eof);
+    TEST (T,  LL (          0x1234567),              "1234567",   7, hex, Eof);
+    TEST (T,  LL (         0x12345678),             "12345678",   8, hex, Eof);
+    TEST (T,  LL (        0x123456789),            "123456789",   9, hex, Eof);
+    TEST (T,  LL (       0x123456789a),           "123456789a",  10, hex, Eof);
+    TEST (T,  LL (      0x123456789ab),          "123456789ab",  11, hex, Eof);
+    TEST (T,  LL (     0x123456789abc),         "123456789abc",  12, hex, Eof);
+    TEST (T,  LL (    0x123456789abcd),        "123456789abcd",  13, hex, Eof);
+    TEST (T,  LL (   0x123456789abcde),       "123456789abcde",  14, hex, Eof);
+    TEST (T,  LL (  0x123456789abcdef),      "123456789abcdef",  15, hex, Eof);
+    TEST (T,  LL ( 0x123456789abcdef0),     "123456789abcdef0",  16, hex, Eof);
+
+    TEST (T,  LL (                  0),                  "0x0",   3, hex, Eof);
+    TEST (T,  LL (                0x1),                  "0x1",   3, hex, Eof);
+    TEST (T,  LL (               0x12),                 "0x12",   4, hex, Eof);
+    TEST (T,  LL (              0x123),                "0x123",   5, hex, Eof);
+    TEST (T,  LL (             0x1234),               "0x1234",   6, hex, Eof);
+    TEST (T,  LL (            0x12345),              "0x12345",   7, hex, Eof);
+    TEST (T,  LL (           0x123456),             "0x123456",   8, hex, Eof);
+    TEST (T,  LL (          0x1234567),            "0x1234567",   9, hex, Eof);
+    TEST (T,  LL (         0x12345678),           "0x12345678",  10, hex, Eof);
+    TEST (T,  LL (        0x123456789),          "0x123456789",  11, hex, Eof);
+    TEST (T,  LL (       0x123456789a),         "0x123456789a",  12, hex, Eof);
+    TEST (T,  LL (      0x123456789ab),        "0x123456789ab",  13, hex, Eof);
+    TEST (T,  LL (     0x123456789abc),       "0x123456789abc",  14, hex, Eof);
+    TEST (T,  LL (    0x123456789abcd),      "0x123456789abcd",  15, hex, Eof);
+    TEST (T,  LL (   0x123456789abcde),     "0x123456789abcde",  16, hex, Eof);
+    TEST (T,  LL (  0x123456789abcdef),    "0x123456789abcdef",  17, hex, Eof);
+    TEST (T,  LL ( 0x123456789abcdef0),   "0x123456789abcdef0",  18, hex, Eof);
+
+    TEST (T,  LL (                0x0), "00000000000000000000",  20, hex, Eof);
+    TEST (T,  LL (                0x1),  "0000000000000000001",  19, hex, Eof);
+    TEST (T,  LL (                0x2),   "000000000000000002",  18, hex, Eof);
+    TEST (T,  LL (                0x3),    "00000000000000003",  17, hex, Eof);
+    TEST (T,  LL (                0x4),     "0000000000000004",  16, hex, Eof);
+    TEST (T,  LL (                0x5),      "000000000000005",  15, hex, Eof);
+    TEST (T,  LL (                0x6),       "00000000000006",  14, hex, Eof);
+    TEST (T,  LL (                0x7),        "0000000000007",  13, hex, Eof);
+    TEST (T,  LL (                0x8),         "000000000008",  12, hex, Eof);
+    TEST (T,  LL (                0x9),          "00000000009",  11, hex, Eof);
+    TEST (T,  LL (                0xa),           "000000000a",  10, hex, Eof);
+    TEST (T,  LL (                0xb),            "00000000b",   9, hex, Eof);
+    TEST (T,  LL (                0xc),             "0000000c",   8, hex, Eof);
+    TEST (T,  LL (                0xd),              "000000d",   7, hex, Eof);
+    TEST (T,  LL (                0xe),               "00000e",   6, hex, Eof);
+    TEST (T,  LL (                0xf),                "0000f",   5, hex, Eof);
+    TEST (T,  LL (                0x1),                 "0001",   4, hex, Eof);
+    TEST (T,  LL (                0x2),                  "002",   3, hex, Eof);
+    TEST (T,  LL (                0x3),                   "03",   2, hex, Eof);
+    TEST (T,  LL (                0x4),                    "4",   1, hex, Eof);
+
+    TEST (T,  LL (                0x0), "0x000000000000000000",  20, hex, Eof);
+    TEST (T,  LL (                0x1),  "0x00000000000000001",  19, hex, Eof);
+    TEST (T,  LL (                0x2),   "0x0000000000000002",  18, hex, Eof);
+    TEST (T,  LL (                0x3),    "0x000000000000003",  17, hex, Eof);
+    TEST (T,  LL (                0x4),     "0x00000000000004",  16, hex, Eof);
+    TEST (T,  LL (                0x5),      "0x0000000000005",  15, hex, Eof);
+    TEST (T,  LL (                0x6),       "0x000000000006",  14, hex, Eof);
+    TEST (T,  LL (                0x7),        "0x00000000007",  13, hex, Eof);
+    TEST (T,  LL (                0x8),         "0x0000000008",  12, hex, Eof);
+    TEST (T,  LL (                0x9),          "0x000000009",  11, hex, Eof);
+    TEST (T,  LL (                0xa),           "0x0000000a",  10, hex, Eof);
+    TEST (T,  LL (                0xb),            "0x000000b",   9, hex, Eof);
+    TEST (T,  LL (                0xc),             "0x00000c",   8, hex, Eof);
+    TEST (T,  LL (                0xd),              "0x0000d",   7, hex, Eof);
+    TEST (T,  LL (                0xe),               "0x000e",   6, hex, Eof);
+    TEST (T,  LL (                0xf),                "0x00f",   5, hex, Eof);
+    TEST (T,  LL (                0x1),                 "0x01",   4, hex, Eof);
+    TEST (T,  LL (                0x2),                  "0x2",   3, hex, Eof);
+
+    TEST (T, +LL (                0x0),                    "+0",  2, hex, Eof);
+    TEST (T, +LL (                0x1),                    "+1",  2, hex, Eof);
+    TEST (T, +LL (               0x12),                   "+12",  3, hex, Eof);
+    TEST (T, +LL (              0x123),                  "+123",  4, hex, Eof);
+    TEST (T, +LL (             0x1234),                 "+1234",  5, hex, Eof);
+    TEST (T, +LL (            0x12345),                "+12345",  6, hex, Eof);
+    TEST (T, +LL (           0x123456),               "+123456",  7, hex, Eof);
+    TEST (T, +LL (          0x1234567),              "+1234567",  8, hex, Eof);
+    TEST (T, +LL (         0x12345678),             "+12345678",  9, hex, Eof);
+    TEST (T, +LL (        0x123456789),            "+123456789", 10, hex, Eof);
+    TEST (T, +LL (       0x123456789a),           "+123456789a", 11, hex, Eof);
+    TEST (T, +LL (      0x123456789ab),          "+123456789ab", 12, hex, Eof);
+    TEST (T, +LL (     0x123456789abc),         "+123456789abc", 13, hex, Eof);
+    TEST (T, +LL (    0x123456789abcd),        "+123456789abcd", 14, hex, Eof);
+    TEST (T, +LL (   0x123456789abcde),       "+123456789abcde", 15, hex, Eof);
+    TEST (T, +LL (  0x123456789abcdef),      "+123456789abcdef", 16, hex, Eof);
+    TEST (T, +LL ( 0x123456789abcdef0),     "+123456789abcdef0", 17, hex, Eof);
+
+    TEST (T, +LL (                0x0),                  "+0x0",  4, hex, Eof);
+    TEST (T, +LL (                0x1),                  "+0x1",  4, hex, Eof);
+    TEST (T, +LL (               0x12),                 "+0x12",  5, hex, Eof);
+    TEST (T, +LL (              0x123),                "+0x123",  6, hex, Eof);
+    TEST (T, +LL (             0x1234),               "+0x1234",  7, hex, Eof);
+    TEST (T, +LL (            0x12345),              "+0x12345",  8, hex, Eof);
+    TEST (T, +LL (           0x123456),             "+0x123456",  9, hex, Eof);
+    TEST (T, +LL (          0x1234567),            "+0x1234567", 10, hex, Eof);
+    TEST (T, +LL (         0x12345678),           "+0x12345678", 11, hex, Eof);
+    TEST (T, +LL (        0x123456789),          "+0x123456789", 12, hex, Eof);
+    TEST (T, +LL (       0x123456789a),         "+0x123456789a", 13, hex, Eof);
+    TEST (T, +LL (      0x123456789ab),        "+0x123456789ab", 14, hex, Eof);
+    TEST (T, +LL (     0x123456789abc),       "+0x123456789abc", 15, hex, Eof);
+    TEST (T, +LL (    0x123456789abcd),      "+0x123456789abcd", 16, hex, Eof);
+    TEST (T, +LL (   0x123456789abcde),     "+0x123456789abcde", 17, hex, Eof);
+    TEST (T, +LL (  0x123456789abcdef),    "+0x123456789abcdef", 18, hex, Eof);
+    TEST (T, +LL ( 0x123456789abcdef0),   "+0x123456789abcdef0", 19, hex, Eof);
+
+    TEST (T, +LL (                0x0), "+00000000000000000000", 21, hex, Eof);
+    TEST (T, +LL (                0x1),  "+0000000000000000001", 20, hex, Eof);
+    TEST (T, +LL (                0x2),   "+000000000000000002", 19, hex, Eof);
+    TEST (T, +LL (                0x3),    "+00000000000000003", 18, hex, Eof);
+    TEST (T, +LL (                0x4),     "+0000000000000004", 17, hex, Eof);
+    TEST (T, +LL (                0x5),      "+000000000000005", 16, hex, Eof);
+    TEST (T, +LL (                0x6),       "+00000000000006", 15, hex, Eof);
+    TEST (T, +LL (                0x7),        "+0000000000007", 14, hex, Eof);
+    TEST (T, +LL (                0x8),         "+000000000008", 13, hex, Eof);
+    TEST (T, +LL (                0x9),          "+00000000009", 12, hex, Eof);
+    TEST (T, +LL (                0xa),           "+000000000a", 11, hex, Eof);
+    TEST (T, +LL (                0xb),            "+00000000b", 10, hex, Eof);
+    TEST (T, +LL (                0xc),             "+0000000c",  9, hex, Eof);
+    TEST (T, +LL (                0xd),              "+000000d",  8, hex, Eof);
+    TEST (T, +LL (                0xe),               "+00000e",  7, hex, Eof);
+    TEST (T, +LL (                0xf),                "+0000f",  6, hex, Eof);
+    TEST (T, +LL (                0x1),                 "+0001",  5, hex, Eof);
+    TEST (T, +LL (                0x2),                  "+002",  4, hex, Eof);
+    TEST (T, +LL (                0x3),                   "+03",  3, hex, Eof);
+    TEST (T, +LL (                0x4),                    "+4",  2, hex, Eof);
+
+    TEST (T, -LL (                0x0),                    "-0",  2, hex, Eof);
+    TEST (T, -LL (                0x1),                    "-1",  2, hex, Eof);
+    TEST (T, -LL (               0x12),                   "-12",  3, hex, Eof);
+    TEST (T, -LL (              0x123),                  "-123",  4, hex, Eof);
+    TEST (T, -LL (             0x1234),                 "-1234",  5, hex, Eof);
+    TEST (T, -LL (            0x12345),                "-12345",  6, hex, Eof);
+    TEST (T, -LL (           0x123456),               "-123456",  7, hex, Eof);
+    TEST (T, -LL (          0x1234567),              "-1234567",  8, hex, Eof);
+    TEST (T, -LL (         0x12345678),             "-12345678",  9, hex, Eof);
+    TEST (T, -LL (        0x123456789),            "-123456789", 10, hex, Eof);
+    TEST (T, -LL (       0x123456789a),           "-123456789a", 11, hex, Eof);
+    TEST (T, -LL (      0x123456789ab),          "-123456789ab", 12, hex, Eof);
+    TEST (T, -LL (     0x123456789abc),         "-123456789abc", 13, hex, Eof);
+    TEST (T, -LL (    0x123456789abcd),        "-123456789abcd", 14, hex, Eof);
+    TEST (T, -LL (   0x123456789abcde),       "-123456789abcde", 15, hex, Eof);
+    TEST (T, -LL (  0x123456789abcdef),      "-123456789abcdef", 16, hex, Eof);
+    TEST (T, -LL ( 0x123456789abcdef0),     "-123456789abcdef0", 17, hex, Eof);
+
+    TEST (T, -LL (                0x0), "-00000000000000000000", 21, hex, Eof);
+    TEST (T, -LL (                0x1),  "-0000000000000000001", 20, hex, Eof);
+    TEST (T, -LL (                0x2),   "-000000000000000002", 19, hex, Eof);
+    TEST (T, -LL (                0x3),    "-00000000000000003", 18, hex, Eof);
+    TEST (T, -LL (                0x4),     "-0000000000000004", 17, hex, Eof);
+    TEST (T, -LL (                0x5),      "-000000000000005", 16, hex, Eof);
+    TEST (T, -LL (                0x6),       "-00000000000006", 15, hex, Eof);
+    TEST (T, -LL (                0x7),        "-0000000000007", 14, hex, Eof);
+    TEST (T, -LL (                0x8),         "-000000000008", 13, hex, Eof);
+    TEST (T, -LL (                0x9),          "-00000000009", 12, hex, Eof);
+    TEST (T, -LL (                0xa),           "-000000000a", 11, hex, Eof);
+    TEST (T, -LL (                0xb),            "-00000000b", 10, hex, Eof);
+    TEST (T, -LL (                0xc),             "-0000000c",  9, hex, Eof);
+    TEST (T, -LL (                0xd),              "-000000d",  8, hex, Eof);
+    TEST (T, -LL (                0xe),               "-00000e",  7, hex, Eof);
+    TEST (T, -LL (                0xf),                "-0000f",  6, hex, Eof);
+    TEST (T, -LL (                0x1),                 "-0001",  5, hex, Eof);
+    TEST (T, -LL (                0x2),                  "-002",  4, hex, Eof);
+    TEST (T, -LL (                0x3),                   "-03",  3, hex, Eof);
+    TEST (T, -LL (                0x4),                    "-4",  2, hex, Eof);
+
     if (rw_opt_no_errno) {
         rw_note (0, 0, 0, "errno test disabled");
     }
@@ -1622,12 +1920,151 @@
 #      define ULL(number)   number ## UI64
 #    endif   // _MSC_VER
 
-    TEST (T, ULL (                  0),                     "0",  1, 0, Eof);
-    TEST (T, ULL (                  0),                    "+0",  2, 0, Eof);
-    TEST (T, ULL (                  0),                    "-0",  2, 0, Eof);
-    TEST (T, ULL (                  1),                    "+1",  2, 0, Eof);
-    TEST (T, ULL (                1080),                 "1080",  4, 0, Eof);
-    TEST (T, ULL (18446744073709551615), "18446744073709551615", 20, 0, Eof);
+    TEST (T, ULL (                   0),                     "0",  1, 0, Eof);
+    TEST (T, ULL (                   1),                     "1",  1, 0, Eof);
+    TEST (T, ULL (                  12),                    "12",  2, 0, Eof);
+    TEST (T, ULL (                 123),                   "123",  3, 0, Eof);
+    TEST (T, ULL (                1234),                  "1234",  4, 0, Eof);
+    TEST (T, ULL (               12345),                 "12345",  5, 0, Eof);
+    TEST (T, ULL (              123456),                "123456",  6, 0, Eof);
+    TEST (T, ULL (             1234567),               "1234567",  7, 0, Eof);
+    TEST (T, ULL (            12345678),              "12345678",  8, 0, Eof);
+    TEST (T, ULL (           123456789),             "123456789",  9, 0, Eof);
+    TEST (T, ULL (          1234567890),            "1234567890", 10, 0, Eof);
+    TEST (T, ULL (         12345678901),           "12345678901", 11, 0, Eof);
+    TEST (T, ULL (        123456789012),          "123456789012", 12, 0, Eof);
+    TEST (T, ULL (       1234567890123),         "1234567890123", 13, 0, Eof);
+    TEST (T, ULL (      12345678901234),        "12345678901234", 14, 0, Eof);
+    TEST (T, ULL (     123456789012345),       "123456789012345", 15, 0, Eof);
+    TEST (T, ULL (    1234567890123456),      "1234567890123456", 16, 0, Eof);
+    TEST (T, ULL (   12345678901234567),     "12345678901234567", 17, 0, Eof);
+    TEST (T, ULL (  123456789012345678),    "123456789012345678", 18, 0, Eof);
+    TEST (T, ULL ( 1234567890123456789),   "1234567890123456789", 19, 0, Eof);
+
+    TEST (T, ULL (                   0),   "0000000000000000000", 19, dec, Eof);
+    TEST (T, ULL (                   1),   "0000000000000000001", 19, dec, Eof);
+    TEST (T, ULL (                   2),    "000000000000000002", 18, dec, Eof);
+    TEST (T, ULL (                   3),     "00000000000000003", 17, dec, Eof);
+    TEST (T, ULL (                   4),      "0000000000000004", 16, dec, Eof);
+    TEST (T, ULL (                   5),       "000000000000005", 15, dec, Eof);
+    TEST (T, ULL (                   6),        "00000000000006", 14, dec, Eof);
+    TEST (T, ULL (                   7),         "0000000000007", 13, dec, Eof);
+    TEST (T, ULL (                   8),          "000000000008", 12, dec, Eof);
+    TEST (T, ULL (                   9),           "00000000009", 11, dec, Eof);
+    TEST (T, ULL (                   1),            "0000000001", 10, dec, Eof);
+    TEST (T, ULL (                   2),             "000000002",  9, dec, Eof);
+    TEST (T, ULL (                   3),              "00000003",  8, dec, Eof);
+    TEST (T, ULL (                   4),               "0000004",  7, dec, Eof);
+    TEST (T, ULL (                   5),                "000005",  6, dec, Eof);
+    TEST (T, ULL (                   6),                 "00006",  5, dec, Eof);
+    TEST (T, ULL (                   7),                  "0007",  4, dec, Eof);
+    TEST (T, ULL (                   8),                   "008",  3, dec, Eof);
+    TEST (T, ULL (                   9),                    "09",  2, dec, Eof);
+
+    TEST (T, ULL (                   0),                    "+0",  2, 0, Eof);
+    TEST (T, ULL (                   1),                    "+1",  2, 0, Eof);
+    TEST (T, ULL (                  12),                   "+12",  3, 0, Eof);
+    TEST (T, ULL (                 123),                  "+123",  4, 0, Eof);
+    TEST (T, ULL (                1234),                 "+1234",  5, 0, Eof);
+    TEST (T, ULL (               12345),                "+12345",  6, 0, Eof);
+    TEST (T, ULL (              123456),               "+123456",  7, 0, Eof);
+    TEST (T, ULL (             1234567),              "+1234567",  8, 0, Eof);
+    TEST (T, ULL (            12345678),             "+12345678",  9, 0, Eof);
+    TEST (T, ULL (           123456789),            "+123456789", 10, 0, Eof);
+    TEST (T, ULL (          1234567890),           "+1234567890", 11, 0, Eof);
+    TEST (T, ULL (         12345678901),          "+12345678901", 12, 0, Eof);
+    TEST (T, ULL (        123456789012),         "+123456789012", 13, 0, Eof);
+    TEST (T, ULL (       1234567890123),        "+1234567890123", 14, 0, Eof);
+    TEST (T, ULL (      12345678901234),       "+12345678901234", 15, 0, Eof);
+    TEST (T, ULL (     123456789012345),      "+123456789012345", 16, 0, Eof);
+    TEST (T, ULL (    1234567890123456),     "+1234567890123456", 17, 0, Eof);
+    TEST (T, ULL (   12345678901234567),    "+12345678901234567", 18, 0, Eof);
+    TEST (T, ULL (  123456789012345678),   "+123456789012345678", 19, 0, Eof);
+    TEST (T, ULL ( 1234567890123456789),  "+1234567890123456789", 20, 0, Eof);
+
+    TEST (T, ULL (                   0),  "+0000000000000000000", 20, dec, Eof);
+    TEST (T, ULL (                   1),  "+0000000000000000001", 20, dec, Eof);
+    TEST (T, ULL (                   2),   "+000000000000000002", 19, dec, Eof);
+    TEST (T, ULL (                   3),    "+00000000000000003", 18, dec, Eof);
+    TEST (T, ULL (                   4),     "+0000000000000004", 17, dec, Eof);
+    TEST (T, ULL (                   5),      "+000000000000005", 16, dec, Eof);
+    TEST (T, ULL (                   6),       "+00000000000006", 15, dec, Eof);
+    TEST (T, ULL (                   7),        "+0000000000007", 14, dec, Eof);
+    TEST (T, ULL (                   8),         "+000000000008", 13, dec, Eof);
+    TEST (T, ULL (                   9),          "+00000000009", 12, dec, Eof);
+    TEST (T, ULL (                   1),           "+0000000001", 11, dec, Eof);
+    TEST (T, ULL (                   2),            "+000000002", 10, dec, Eof);
+    TEST (T, ULL (                   3),             "+00000003",  9, dec, Eof);
+    TEST (T, ULL (                   4),              "+0000004",  8, dec, Eof);
+    TEST (T, ULL (                   5),               "+000005",  7, dec, Eof);
+    TEST (T, ULL (                   6),                "+00006",  6, dec, Eof);
+    TEST (T, ULL (                   7),                 "+0007",  5, dec, Eof);
+    TEST (T, ULL (                   8),                  "+008",  4, dec, Eof);
+    TEST (T, ULL (                   9),                   "+09",  3, dec, Eof);
+
+    TEST (T, ULL (                   0),                    "-0",  2, 0, Eof);
+    TEST (T, ULL (18446744073709551615),                    "-1",  2, 0, Eof);
+    TEST (T, ULL (18446744073709551604),                   "-12",  3, 0, Eof);
+    TEST (T, ULL (18446744073709551493),                  "-123",  4, 0, Eof);
+    TEST (T, ULL (18446744073709550382),                 "-1234",  5, 0, Eof);
+    TEST (T, ULL (18446744073709539271),                "-12345",  6, 0, Eof);
+    TEST (T, ULL (18446744073709428160),               "-123456",  7, 0, Eof);
+    TEST (T, ULL (18446744073708317049),              "-1234567",  8, 0, Eof);
+    TEST (T, ULL (18446744073697205938),             "-12345678",  9, 0, Eof);
+    TEST (T, ULL (18446744073586094827),            "-123456789", 10, 0, Eof);
+    TEST (T, ULL (18446744072474983726),           "-1234567890", 11, 0, Eof);
+    TEST (T, ULL (18446744061363872715),          "-12345678901", 12, 0, Eof);
+    TEST (T, ULL (18446743950252762604),         "-123456789012", 13, 0, Eof);
+    TEST (T, ULL (18446742839141661493),        "-1234567890123", 14, 0, Eof);
+    TEST (T, ULL (18446731728030650382),       "-12345678901234", 15, 0, Eof);
+    TEST (T, ULL (18446620616920539271),      "-123456789012345", 16, 0, Eof);
+    TEST (T, ULL (18445509505819428160),     "-1234567890123456", 17, 0, Eof);
+    TEST (T, ULL (18434398394808317049),    "-12345678901234567", 18, 0, Eof);
+    TEST (T, ULL (18323287284697205938),   "-123456789012345678", 19, 0, Eof);
+    TEST (T, ULL (17212176183586094827),  "-1234567890123456789", 20, 0, Eof);
+
+    TEST (T, ULL (                   0),  "-0000000000000000000", 20, dec, Eof);
+    TEST (T, ULL (18446744073709551615),  "-0000000000000000001", 20, dec, Eof);
+    TEST (T, ULL (18446744073709551614),   "-000000000000000002", 19, dec, Eof);
+    TEST (T, ULL (18446744073709551613),    "-00000000000000003", 18, dec, Eof);
+    TEST (T, ULL (18446744073709551612),     "-0000000000000004", 17, dec, Eof);
+    TEST (T, ULL (18446744073709551611),      "-000000000000005", 16, dec, Eof);
+    TEST (T, ULL (18446744073709551610),       "-00000000000006", 15, dec, Eof);
+    TEST (T, ULL (18446744073709551609),        "-0000000000007", 14, dec, Eof);
+    TEST (T, ULL (18446744073709551608),         "-000000000008", 13, dec, Eof);
+    TEST (T, ULL (18446744073709551607),          "-00000000009", 12, dec, Eof);
+    TEST (T, ULL (18446744073709551615),           "-0000000001", 11, dec, Eof);
+    TEST (T, ULL (18446744073709551614),            "-000000002", 10, dec, Eof);
+    TEST (T, ULL (18446744073709551613),             "-00000003",  9, dec, Eof);
+    TEST (T, ULL (18446744073709551612),              "-0000004",  8, dec, Eof);
+    TEST (T, ULL (18446744073709551611),               "-000005",  7, dec, Eof);
+    TEST (T, ULL (18446744073709551610),                "-00006",  6, dec, Eof);
+    TEST (T, ULL (18446744073709551609),                 "-0007",  5, dec, Eof);
+    TEST (T, ULL (18446744073709551608),                  "-008",  4, dec, Eof);
+    TEST (T, ULL (18446744073709551607),                   "-09",  3, dec, Eof);
+
+    TEST (T, ULL (18446744073709551615),  "18446744073709551615", 20, 0,   Eof);
+    TEST (T, ULL (18446744073709551615), "018446744073709551615", 21, dec, Eof);
+    TEST (T, ULL (18446744073709551615), "+18446744073709551615", 21, 0,   Eof);
+
+    // exercise hex parsing
+    TEST (T, ULL (                 0x0),                  "0x0",  3, hex, Eof);
+    TEST (T, ULL (                 0x1),                  "0x1",  3, hex, Eof);
+    TEST (T, ULL (                0x12),                 "0x12",  4, hex, Eof);
+    TEST (T, ULL (               0x123),                "0x123",  5, hex, Eof);
+    TEST (T, ULL (              0x1234),               "0x1234",  6, hex, Eof);
+    TEST (T, ULL (             0x12345),              "0x12345",  7, hex, Eof);
+    TEST (T, ULL (            0x123456),             "0x123456",  8, hex, Eof);
+    TEST (T, ULL (           0x1234567),            "0x1234567",  9, hex, Eof);
+    TEST (T, ULL (          0x12345678),           "0x12345678", 10, hex, Eof);
+    TEST (T, ULL (         0x123456789),          "0x123456789", 11, hex, Eof);
+    TEST (T, ULL (        0x123456789a),         "0x123456789a", 12, hex, Eof);
+    TEST (T, ULL (       0x123456789ab),        "0x123456789ab", 13, hex, Eof);
+    TEST (T, ULL (      0x123456789abc),       "0x123456789abc", 14, hex, Eof);
+    TEST (T, ULL (     0x123456789abcd),      "0x123456789abcd", 15, hex, Eof);
+    TEST (T, ULL (    0x123456789abcde),     "0x123456789abcde", 16, hex, Eof);
+    TEST (T, ULL (   0x123456789abcdef),    "0x123456789abcdef", 17, hex, Eof);
+    TEST (T, ULL (  0x123456789abcdef0),   "0x123456789abcdef0", 18, hex, Eof);
 
     if (rw_opt_no_errno) {
         rw_note (0, 0, 0, "errno test disabled");
@@ -1943,7 +2380,7 @@
     if (test_locale) {
         // verify that the global LC_NUMERIC locale setting
         // has no impact on the facet (in case it uses scanf())
-        for (const char *name = rw_locales (LC_NUMERIC, 0); *name;
+        for (const char *name = rw_locales (LC_NUMERIC, 0); name && *name;
              name += std::strlen (name) + 1) {
 
             // find the first locale whose decimal_point character
diff --git a/tests/localization/22.locale.num.put.cpp b/tests/localization/22.locale.num.put.cpp
index 2e8321f..24003ad 100644
--- a/tests/localization/22.locale.num.put.cpp
+++ b/tests/localization/22.locale.num.put.cpp
@@ -1480,7 +1480,7 @@
 
     if (1) {
         // verify that the global LC_NUMERIC setting has no impact on the facet
-        for (const char *name = rw_locales (LC_NUMERIC, 0); *name;
+        for (const char *name = rw_locales (LC_NUMERIC, 0); name && *name;
              name += std::strlen (name) + 1) {
 
             // find the first locale whose decimal_point character
diff --git a/tests/localization/22.locale.num.put.mt.cpp b/tests/localization/22.locale.num.put.mt.cpp
new file mode 100644
index 0000000..bb567b9
--- /dev/null
+++ b/tests/localization/22.locale.num.put.mt.cpp
@@ -0,0 +1,356 @@
+/************************************************************************
+ *
+ * 22.locale.num.put.mt.cpp
+ *
+ * test exercising the thread safety of the num_put facet
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#include <ios>        // for ios
+#include <iterator>   // for ostreambuf_iterator
+#include <locale>     // for locale, num_put
+
+#include <cstring>    // for strlen()
+
+#include <rw_locale.h>
+#include <rw_thread.h>
+#include <driver.h>
+
+
+// maximum number of threads allowed by the command line interface
+#define MAX_THREADS   32
+
+
+#ifdef _RWSTD_REENTRANT
+int rw_opt_nthreads = 4;
+#else   // if !defined (_RWSTD_REENTRANT)
+// in non-threaded builds use just one thread
+int rw_opt_nthreads = 1;
+#endif   // _RWSTD_REENTRANT
+
+// the number of times each thread should iterate (unless specified
+// otherwise on the command line)
+int rw_opt_nloops = 200000;
+
+/**************************************************************************/
+
+// array of locale names to use for testing
+static const char*
+locales [MAX_THREADS];
+
+// number of locale names in the array
+static std::size_t
+nlocales;
+
+/**************************************************************************/
+
+extern "C" {
+
+bool test_char;    // exercise num_put<char>
+bool test_wchar;   // exercise num_put<wchar_t>
+
+
+static void*
+thread_func (void*)
+{
+    // dummy streambuf-derived object the doesn't do anything
+    // but allows ostreambuf_iterator to "think" it can write
+    // to it
+    struct NarrowBuf: std::streambuf {
+        int_type overflow (int_type c) { return c; }
+    } sb;
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    struct WideBuf: std::wstreambuf {
+        int_type overflow (int_type c) { return c; }
+    } wb;
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+    struct Ios: std::ios {
+        Ios () { this->init (0); }
+    } io;
+
+    const std::ios::fmtflags baseflags[] = {
+        std::ios::oct,
+        std::ios::dec,
+        std::ios::hex
+    };
+
+    const std::ios::fmtflags fmtflags[] = {
+        std::ios::showpos,
+        std::ios::showpoint,
+        std::ios::fixed,
+        std::ios::scientific
+    };
+
+    const std::ios::fmtflags adjustflags[] = {
+        std::ios::internal,
+        std::ios::left,
+        std::ios::right
+    };
+
+    for (int i = 0; i != rw_opt_nloops; ++i) {
+
+        // save the name of the locale
+        const char* const locale_name = locales [i % nlocales];
+
+        // construct a named locale and imbue it in the ios object
+        // so that the locale is used not only by the num_put facet
+        // but also by the numpunct facet
+        const std::locale loc (locale_name);
+        io.imbue (loc);
+
+        enum PutId {
+            put_bool,
+            put_long,
+            put_ulong,
+
+#ifndef _RWSTD_NO_LONG_LONG
+
+            put_llong,
+            put_ullong,
+
+#endif   // _RWSTD_NO_LONG_LONG
+
+            put_dbl,
+            put_ldbl,
+            put_ptr,
+            put_max
+        };
+
+        const std::ios::fmtflags base =
+            baseflags [i % (sizeof baseflags / sizeof *baseflags)];
+
+        const std::ios::fmtflags fmt =
+            fmtflags [i % (sizeof baseflags / sizeof *baseflags)];
+
+        const std::ios::fmtflags adjust =
+            adjustflags [i % (sizeof baseflags / sizeof *baseflags)];
+
+        io.flags (base | fmt | adjust);
+
+        io.width (i % 16);
+
+        // exercise postive and negative values
+        const int ival = i & 1 ? -i : i;
+
+        if (test_char) {
+            // exercise the narrow char specialization of the facet
+
+            const std::num_put<char> &np =
+                std::use_facet<std::num_put<char> >(loc);
+
+            const std::ostreambuf_iterator<char> iter (&sb);
+
+            switch (PutId (i % put_max)) {
+            case put_bool:
+                if (i & 2)
+                    io.setf (std::ios::boolalpha);
+                else
+                    io.unsetf (std::ios::boolalpha);
+                        
+                np.put (iter, io, ' ', bool (ival));
+                break;
+
+            case put_long:
+                np.put (iter, io, ' ', long (ival));
+                break;
+
+            case put_ulong:
+                np.put (iter, io, ' ', (unsigned long)ival);
+                break;
+
+#ifndef _RWSTD_NO_LONG_LONG
+
+            case put_llong:
+                np.put (iter, io, ' ', (_RWSTD_LONG_LONG)ival);
+                break;
+
+#endif   // _RWSTD_NO_LONG_LONG
+
+            case put_ullong:
+                np.put (iter, io, ' ', (unsigned _RWSTD_LONG_LONG)ival);
+                break;
+
+            case put_dbl:
+                np.put (iter, io, ' ', double (ival));
+                break;
+
+            case put_ldbl:
+                np.put (iter, io, ' ', (long double)ival);
+                break;
+
+            case put_ptr:
+                np.put (iter, io, ' ', (void*)ival);
+                break;
+            }
+        }
+
+        // both specializations may be tested at the same time
+
+        if (test_wchar) {
+            // exercise the wide char specialization of the facet
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+            const std::num_put<wchar_t> &np =
+                std::use_facet<std::num_put<wchar_t> >(loc);
+
+            const std::ostreambuf_iterator<wchar_t> iter (&wb);
+
+            switch (PutId (i % put_max)) {
+            case put_bool:
+                np.put (iter, io, L' ', bool (ival));
+                break;
+
+            case put_long:
+                np.put (iter, io, L' ', long (ival));
+                break;
+
+            case put_ulong:
+                np.put (iter, io, L' ', (unsigned long)ival);
+                break;
+
+#ifndef _RWSTD_NO_LONG_LONG
+
+            case put_llong:
+                np.put (iter, io, L' ', (_RWSTD_LONG_LONG)ival);
+                break;
+
+            case put_ullong:
+                np.put (iter, io, L' ', (unsigned _RWSTD_LONG_LONG)ival);
+                break;
+
+#endif   // _RWSTD_NO_LONG_LONG
+
+            case put_dbl:
+                np.put (iter, io, L' ', double (ival));
+                break;
+
+            case put_ldbl:
+                np.put (iter, io, L' ', (long double)ival);
+                break;
+
+            case put_ptr:
+                np.put (iter, io, L' ', (void*)ival);
+                break;
+            }
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+        }
+    }
+
+    return 0;
+}
+
+}   // extern "C"
+
+/**************************************************************************/
+
+static int
+run_test (int, char**)
+{
+    char* const locale_list = rw_locales ();
+
+    const std::size_t maxinx = sizeof locales / sizeof *locales;
+
+    for (char *name = locale_list; *name; name += std::strlen (name) + 1) {
+        locales [nlocales++] = name;
+
+        if (nlocales == maxinx)
+            break;
+    }
+
+    rw_info (0, 0, 0,
+             "testing std::num_put<charT> with %d thread%{?}s%{;}, "
+             "%zu iteration%{?}s%{;} each, in locales { %{ .*A@} }",
+             rw_opt_nthreads, 1 != rw_opt_nthreads,
+             rw_opt_nloops, 1 != rw_opt_nloops,
+             int (nlocales), "%#s", locales);
+
+    rw_info (0, 0, 0, "exercising std::num_put<char>");
+
+    test_char  = true;
+    test_wchar = false;
+
+    // create and start a pool of threads and wait for them to finish
+    int result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    rw_info (0, 0, 0, "exercising std::num_put<wchar_t>");
+
+    test_char  = false;
+    test_wchar = true;
+
+    // start a pool of threads to exercise wstring thread safety
+    result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+    // exercise bothe the char and the wchar_t specializations
+    // at the same time
+
+    rw_info (0, 0, 0,
+             "exercising both std::num_put<char> and std::num_put<wchar_t>");
+
+    test_char  = true;
+    test_wchar = true;
+
+    // start a pool of threads to exercise wstring thread safety
+    result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+    return result;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv[])
+{
+    return rw_test (argc, argv, __FILE__,
+                    "lib.locale.num.put",
+                    "thread safety", run_test,
+                    "|-nloops#0 "       // must be non-negative
+                    "|-nthreads#0-*",   // must be in [0, MAX_THREADS]
+                    &rw_opt_nloops,
+                    int (MAX_THREADS),
+                    &rw_opt_nthreads);
+}
diff --git a/tests/localization/22.locale.numpunct.mt.cpp b/tests/localization/22.locale.numpunct.mt.cpp
new file mode 100644
index 0000000..6db7d73
--- /dev/null
+++ b/tests/localization/22.locale.numpunct.mt.cpp
@@ -0,0 +1,297 @@
+/************************************************************************
+ *
+ * 22.locale.numpunct.mt.cpp
+ *
+ * test exercising the thread safety of the numpunct facet
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#include <locale>     // for locale, numpunct
+
+#include <clocale>    // for lconv, localeconv()
+#include <cstdlib>    // for mbstowcs()
+#include <cstring>    // for size_t, strcpy()
+
+#include <rw_locale.h>
+#include <rw_thread.h>
+#include <driver.h>
+#include <valcmp.h>
+
+
+// maximum number of threads allowed by the command line interface
+#define MAX_THREADS   32
+
+
+#ifdef _RWSTD_REENTRANT
+int rw_opt_nthreads = 4;
+#else   // if !defined (_RWSTD_REENTRANT)
+// in non-threaded builds use just one thread
+int rw_opt_nthreads = 1;
+#endif   // _RWSTD_REENTRANT
+
+// the number of times each thread should iterate (unless specified
+// otherwise on the command line)
+int rw_opt_nloops = 200000;
+
+/**************************************************************************/
+
+// array of locale names to use for testing
+static const char*
+locales [MAX_THREADS];
+
+// number of locale names in the array
+static std::size_t
+nlocales;
+
+/**************************************************************************/
+
+struct NumPunctData
+{
+    char decimal_point_;
+    char thousands_sep_;
+    char grouping_ [32];
+    char truename_ [32];
+    char falsename_ [32];
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    wchar_t wdecimal_point_;
+    wchar_t wthousands_sep_;
+    wchar_t wtruename_ [32];
+    wchar_t wfalsename_ [32];
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+} punct_data [MAX_THREADS];
+
+
+extern "C" {
+
+bool test_char;    // exercise num_put<char>
+bool test_wchar;   // exercise num_put<wchar_t>
+
+
+static void*
+thread_func (void*)
+{
+    for (int i = 0; i != rw_opt_nloops; ++i) {
+
+        const std::size_t inx = std::size_t (i) % nlocales;
+
+        // save the name of the locale
+        const char* const locale_name = locales [inx];
+
+        const NumPunctData* const data = punct_data + inx;
+
+        // construct a named locale
+        const std::locale loc (locale_name);
+
+        // exercise postive and negative values
+        const int ival = i & 1 ? -i : i;
+
+        if (test_char) {
+            // exercise the narrow char specialization of the facet
+
+            const std::numpunct<char> &np =
+                std::use_facet<std::numpunct<char> >(loc);
+
+            const char        dp  = np.decimal_point ();
+            const char        ts  = np.thousands_sep ();
+            const std::string grp = np.grouping ();
+            const std::string tn  = np.truename ();
+            const std::string fn  = np.falsename ();
+
+            RW_ASSERT (dp == data->decimal_point_);
+            RW_ASSERT (ts == data->thousands_sep_);
+            RW_ASSERT (0 == rw_strncmp (grp.c_str (), data->grouping_));
+            RW_ASSERT (0 == rw_strncmp (tn.c_str (),  data->truename_));
+            RW_ASSERT (0 == rw_strncmp (fn.c_str (),  data->falsename_));
+        }
+
+        // both specializations may be tested at the same time
+
+        if (test_wchar) {
+            // exercise the wide char specialization of the facet
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+            const std::numpunct<wchar_t> &np =
+                std::use_facet<std::numpunct<wchar_t> >(loc);
+
+            const wchar_t      dp  = np.decimal_point ();
+            const wchar_t      ts  = np.thousands_sep ();
+            const std::string  grp = np.grouping ();
+            const std::wstring tn  = np.truename ();
+            const std::wstring fn  = np.falsename ();
+
+            RW_ASSERT (dp == data->wdecimal_point_);
+            RW_ASSERT (ts == data->wthousands_sep_);
+            RW_ASSERT (0 == rw_strncmp (grp.c_str (), data->grouping_));
+            RW_ASSERT (0 == rw_strncmp (tn.c_str (),  data->wtruename_));
+            RW_ASSERT (0 == rw_strncmp (fn.c_str (),  data->wfalsename_));
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+        }
+    }
+
+    return 0;
+}
+
+}   // extern "C"
+
+/**************************************************************************/
+
+static int
+run_test (int, char**)
+{
+    // get a NUL-separated list of names of installed locales
+    char* const locale_list = rw_locales ();
+
+    const std::size_t maxinx = sizeof locales / sizeof *locales;
+
+    // iterate over locales, initializing a global punct_data array
+    for (char *name = locale_list; *name; name += std::strlen (name) + 1) {
+
+        const std::size_t inx = nlocales;
+
+        locales [inx] = name;
+
+        // set LC_NUMERIC and LC_CTYPE to be able to use mbstowcs()
+        if (std::setlocale (LC_ALL, name)) {
+
+            const std::lconv* const pconv = std::localeconv ();
+            NumPunctData* const pdata = punct_data + inx;
+
+            // assign just the first character of the (potentially)
+            // multibyte decimal_point and thousands_sep (C++ locale
+            // can't deal with more)
+            pdata->decimal_point_ = *pconv->decimal_point;
+            pdata->thousands_sep_ = *pconv->thousands_sep;
+
+            // simply copy the narrow grouping
+            std::strcpy (pdata->grouping_, pconv->grouping);
+
+            // FIXME: this will need to change once useful truename
+            //        and falsename has been implemented
+            std::strcpy (pdata->truename_,  "true");
+            std::strcpy (pdata->falsename_, "false");
+
+            wchar_t tmp [2];
+
+            // convert multibyte decimal point and thousands separator
+            // to wide characters (assumes they are single character
+            // each -- C++ locale can't handle more)
+            std::mbstowcs (tmp, pconv->decimal_point, 2);
+            pdata->wdecimal_point_ = tmp [0];
+
+            std::mbstowcs (tmp, pconv->thousands_sep, 2);
+            pdata->wthousands_sep_ = tmp [0];
+
+            const std::size_t n =
+                sizeof pdata->wtruename_ / sizeof (wchar_t);
+
+            std::mbstowcs (pdata->wtruename_, pdata->truename_, n);
+            std::mbstowcs (pdata->wfalsename_, pdata->falsename_, n);
+
+            ++nlocales;
+        }
+
+        if (nlocales == maxinx)
+            break;
+    }
+
+    // reset the global locale
+    std::setlocale (LC_ALL, "C");
+
+    rw_info (0, 0, 0,
+             "testing std::numpunct<charT> with %d thread%{?}s%{;}, "
+             "%zu iteration%{?}s%{;} each, in locales { %{ .*A@} }",
+             rw_opt_nthreads, 1 != rw_opt_nthreads,
+             rw_opt_nloops, 1 != rw_opt_nloops,
+             int (nlocales), "%#s", locales);
+
+    rw_info (0, 0, 0, "exercising std::numpunct<char>");
+
+    test_char  = true;
+    test_wchar = false;
+
+    // create and start a pool of threads and wait for them to finish
+    int result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    rw_info (0, 0, 0, "exercising std::numpunct<wchar_t>");
+
+    test_char  = false;
+    test_wchar = true;
+
+    // start a pool of threads to exercise the thread safety
+    // of the wchar_t specialization
+    result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+    // exercise both the char and the wchar_t specializations
+    // at the same time
+
+    rw_info (0, 0, 0,
+             "exercising both std::numpunct<char> and std::numpunct<wchar_t>");
+
+    test_char  = true;
+    test_wchar = true;
+
+    // start a pool of threads to exercise wstring thread safety
+    result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+    return result;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv[])
+{
+    return rw_test (argc, argv, __FILE__,
+                    "lib.locale.numpunct",
+                    "thread safety", run_test,
+                    "|-nloops#0 "       // must be non-negative
+                    "|-nthreads#0-*",   // must be in [0, MAX_THREADS]
+                    &rw_opt_nloops,
+                    int (MAX_THREADS),
+                    &rw_opt_nthreads);
+}
diff --git a/tests/localization/22.locale.time.get.cpp b/tests/localization/22.locale.time.get.cpp
index 1ffea04..d131e42 100644
--- a/tests/localization/22.locale.time.get.cpp
+++ b/tests/localization/22.locale.time.get.cpp
@@ -1584,7 +1584,9 @@
 #else   // _WIN{32,64}
 
     // FIXME: handle non-UNIX systems
-    for (const char *loc = rw_locales (); *loc; loc += std::strlen (loc) + 1) {
+    for (const char *loc = rw_locales (); loc && *loc;
+         loc += std::strlen (loc) + 1) {
+
         if (!std::strcmp (loc, name))
             return loc;
     }
diff --git a/tests/localization/22.locale.time.put.mt.cpp b/tests/localization/22.locale.time.put.mt.cpp
new file mode 100644
index 0000000..c57c503
--- /dev/null
+++ b/tests/localization/22.locale.time.put.mt.cpp
@@ -0,0 +1,252 @@
+/************************************************************************
+ *
+ * 22.locale.time.put.mt.cpp
+ *
+ * test exercising the thread safety of the time_put facet
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2002-2007 Rogue Wave Software.
+ * 
+ **************************************************************************/
+
+#include <ios>        // for ios
+#include <iterator>   // for ostreambuf_iterator
+#include <locale>     // for locale, time_put
+
+#include <cstring>    // for strlen()
+#include <ctime>      // for tm
+
+#include <rw_locale.h>
+#include <rw_thread.h>
+#include <driver.h>
+
+
+#define MAX_THREADS      32
+#define MAX_LOOPS    100000
+
+
+#ifdef _RWSTD_REENTRANT
+int rw_opt_nthreads = 4;
+#else   // if !defined (_RWSTD_REENTRANT)
+// in non-threaded builds use just one thread
+int rw_opt_nthreads = 1;
+#endif   // _RWSTD_REENTRANT
+
+// the number of times each thread should iterate
+int rw_opt_nloops = MAX_LOOPS;
+
+/**************************************************************************/
+
+// array of locale names to use for testing
+static const char*
+locales [MAX_THREADS];
+
+// number of locale names in the array
+static std::size_t
+nlocales;
+
+/**************************************************************************/
+
+extern "C" {
+
+bool test_char;    // exercise time_put<char>
+bool test_wchar;   // exercise time_put<wchar_t>
+
+
+static void*
+thread_func (void *arg)
+{
+    const rw_thread_t* const pthread = (rw_thread_t*)arg;
+
+    // get the 0-based thread number
+    const std::size_t threadno = std::size_t (pthread->threadno);
+
+    std::tm tmb = std::tm ();
+
+    const char cvtspecs[] = "aAbBcCdDeFgGhHIjmMnprRStTuUVwWxXyYzZ%";
+
+    // dummy streambuf-derived object the doesn't do anything
+    // but allows ostreambuf_iterator to "think" it can write
+    // to it
+    struct NarrowBuf: std::streambuf {
+        int_type overflow (int_type c) { return c; }
+    } sb;
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    struct WideBuf: std::wstreambuf {
+        int_type overflow (int_type c) { return c; }
+    } wsb;
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+    struct Ios: std::ios {
+        Ios () { this->init (0); }
+    } io;
+
+    int j = 0;
+
+    for (int i = 0; i != rw_opt_nloops; ++i, ++j) {
+
+        // initialize tm with random but valid values
+        tmb.tm_sec  = ++j % 61;
+        tmb.tm_min  = ++j % 60;
+        tmb.tm_min  = ++j % 60;
+        tmb.tm_wday = ++j % 7;
+        tmb.tm_mon  = ++j % 12;
+        tmb.tm_year = ++j;
+
+        // generate a "random" conversion specifier from the set
+        // of valid specifiers recognized by the facet to exercise
+        // all (or most) code paths
+        const char cvt = cvtspecs [i % (sizeof cvtspecs - 1)];
+
+        // save the name of the locale
+        const char* const locale_name = locales [i % nlocales];
+
+        // construct a named locale, get a reference to the time_put
+        // facet from it and use it to format a random time value
+        // using a random conversion specifier
+        const std::locale loc (locale_name);
+
+        if (test_char) {
+            // exercise the narrow char specialization of the facet
+
+            const std::time_put<char> &tp =
+                std::use_facet<std::time_put<char> >(loc);
+
+            // format a "random" but valid tm value using the random
+            // format specifier
+            tp.put (std::ostreambuf_iterator<char>(&sb),
+                    io, ' ', &tmb, cvt);
+
+        }
+
+        // both specializations may be tested at the same time
+
+        if (test_wchar) {
+            // exercise the wide char specialization of the facet
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+            const std::time_put<wchar_t> &wtp =
+                std::use_facet<std::time_put<wchar_t> >(loc);
+
+            wtp.put (std::ostreambuf_iterator<wchar_t>(&wsb),
+                     io, L' ', &tmb, cvt);
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+        }
+    }
+
+    return 0;
+}
+
+}   // extern "C"
+
+/**************************************************************************/
+
+static int
+run_test (int, char**)
+{
+    char* const locale_list = rw_locales ();
+
+    const std::size_t maxinx = sizeof locales / sizeof *locales;
+
+    for (char *name = locale_list; *name; name += std::strlen (name) + 1) {
+        locales [nlocales++] = name;
+
+        if (nlocales == maxinx)
+            break;
+    }
+
+    rw_info (0, 0, 0,
+             "testing std::time_put<charT> with %d thread%{?}s%{;}, "
+             "%zu iteration%{?}s%{;} each, in locales { %{ .*A@} }",
+             rw_opt_nthreads, 1 != rw_opt_nthreads,
+             rw_opt_nloops, 1 != rw_opt_nloops,
+             int (nlocales), "%#s", locales);
+
+    rw_info (0, 0, 0, "exercising std::time_put<char>");
+
+    test_char  = true;
+    test_wchar = false;
+
+    // create and start a pool of threads and wait for them to finish
+    int result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    rw_info (0, 0, 0, "exercising std::time_put<wchar_t>");
+
+    test_char  = false;
+    test_wchar = true;
+
+    // start a pool of threads to exercise wstring thread safety
+    result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+    // exercise bothe the char and the wchar_t specializations
+    // at the same time
+
+    rw_info (0, 0, 0,
+             "exercising both std::time_put<char> and std::time_put<wchar_t>");
+
+    test_char  = true;
+    test_wchar = true;
+
+    // start a pool of threads to exercise wstring thread safety
+    result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+    return result;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv[])
+{
+    return rw_test (argc, argv, __FILE__,
+                    "lib.locale.time.put",
+                    "thread safety", run_test,
+                    "|-nloops#0 "       // must be non-negative
+                    "|-nthreads#0-*",   // must be in [0, MAX_THREADS]
+                    &rw_opt_nloops,
+                    int (MAX_THREADS),
+                    &rw_opt_nthreads);
+}
diff --git a/tests/regress/23.bitset.cons.stdcxx-297.cpp b/tests/regress/23.bitset.cons.stdcxx-297.cpp
new file mode 100644
index 0000000..815132a
--- /dev/null
+++ b/tests/regress/23.bitset.cons.stdcxx-297.cpp
@@ -0,0 +1,50 @@
+/************************************************************************
+ *
+ * 23.bitset.cons.stdcxx-297.cpp - test case from STDCXX-297 issue
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ * 
+ **************************************************************************/
+
+#include <cassert>
+#include <new>
+#include <bitset>
+#include <string>
+#include <cstddef>
+#include <string.h>
+
+int main ()
+{
+    typedef std::bitset<128> BitSet;
+    const std::size_t size = sizeof (BitSet);
+
+    char buf [size + 4];
+    memset (buf, '\xff', sizeof (buf));
+
+    BitSet* btest = new (buf) BitSet (std::basic_string<int> ());
+
+    for (std::size_t i = size; i < sizeof (buf); ++i)
+        assert ('\xff' == buf [i]);
+
+    btest->~BitSet ();
+
+    return 0;
+}
diff --git a/tests/regress/23.deque.special.stdcxx-127.cpp b/tests/regress/23.deque.special.stdcxx-127.cpp
new file mode 100644
index 0000000..f47f27d
--- /dev/null
+++ b/tests/regress/23.deque.special.stdcxx-127.cpp
@@ -0,0 +1,42 @@
+/************************************************************************
+ *
+ * 23.deque.special.stdcxx-127.cpp - test case from STDCXX-127 issue
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ * 
+ **************************************************************************/
+
+#include <cstddef>
+#include <deque>
+
+struct A { char tmp [32]; };
+
+int main ()
+{
+    A a [32];
+
+    std::deque<A> lhs (a, a + 0);
+    std::deque<A> rhs (a, a + 1);
+
+    lhs.swap (rhs);
+
+    return 0;
+}
diff --git a/tests/regress/23.list.cons.stdcxx-268.cpp b/tests/regress/23.list.cons.stdcxx-268.cpp
new file mode 100644
index 0000000..a27b68e
--- /dev/null
+++ b/tests/regress/23.list.cons.stdcxx-268.cpp
@@ -0,0 +1,118 @@
+/************************************************************************
+ *
+ * 23.list.cons.stdcxx-268.cpp - test case from STDCXX-268 issue
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ * 
+ **************************************************************************/
+
+#include <list>
+#include <cassert>
+
+static int throw_inx = -1;
+
+class ListItem
+{
+public:
+    static int count_;
+
+    void test ()
+    {
+        if (throw_inx == count_)
+            throw count_;
+
+        ++count_;
+    }
+
+    ListItem () { test (); }
+
+    ListItem (const ListItem&) { test (); }
+
+    ~ListItem () { --count_; }
+};
+
+int ListItem::count_ = 0;
+
+int main(int argc, char* argv[])
+{
+    typedef std::list<ListItem> List;
+    ListItem items [20];
+    List lst (20);
+
+    bool thrown = false;
+    throw_inx = 10;
+
+    try {
+        ListItem::count_ = 0;
+        List test (20);
+    } catch (...) {
+        thrown = true;
+    }
+
+    assert (thrown);
+    assert (0 == ListItem::count_);
+
+    try {
+        thrown = false;
+        ListItem::count_ = 0;
+        List test (20, items [0]);
+    } catch (...) {
+        thrown = true;
+    }
+
+    assert (thrown);
+    assert (0 == ListItem::count_);
+
+    try {
+        thrown = false;
+        ListItem::count_ = 0;
+        List test (items, items + 20);
+    } catch (...) {
+        thrown = true;
+    }
+
+    assert (thrown);
+    assert (0 == ListItem::count_);
+
+    try {
+        thrown = false;
+        ListItem::count_ = 0;
+        List test (lst.begin (), lst.end ());
+    } catch (...) {
+        thrown = true;
+    }
+
+    assert (thrown);
+    assert (0 == ListItem::count_);
+
+    try {
+        thrown = false;
+        ListItem::count_ = 0;
+        List test (lst);
+    } catch (...) {
+        thrown = true;
+    }
+
+    assert (thrown);
+    assert (0 == ListItem::count_);
+
+    return 0;
+}
diff --git a/tests/regress/23.list.insert.stdcxx-331.cpp b/tests/regress/23.list.insert.stdcxx-331.cpp
new file mode 100644
index 0000000..36e31aa
--- /dev/null
+++ b/tests/regress/23.list.insert.stdcxx-331.cpp
@@ -0,0 +1,93 @@
+/************************************************************************
+ *
+ * 23.list.insert.stdcxx-331.cpp - test case from STDCXX-331 issue
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ * 
+ **************************************************************************/
+
+#include <list>
+#include <cassert>
+
+static int throw_inx = -1;
+
+class ListItem
+{
+public:
+    static int count_;
+
+    void test ()
+    {
+        if (throw_inx == count_)
+            throw count_;
+
+        ++count_;
+    }
+
+    ListItem () { test (); }
+
+    ListItem (const ListItem&) { test (); }
+
+    ~ListItem () { --count_; }
+};
+
+int ListItem::count_ = 0;
+
+int main (int argc, char* argv[])
+{
+    typedef std::list<ListItem> List;
+    ListItem items [20];
+    List lst (1);
+
+    bool thrown = false;
+    throw_inx = 10;
+
+    List::iterator it = lst.begin ();
+    ListItem & ref = *it;
+
+    try {
+        ListItem::count_ = 0;
+        lst.insert (it, 20, items [0]);
+    } catch (...) {
+        thrown = true;
+    }
+
+    assert (thrown);
+    assert (it == lst.begin ());
+    assert (&ref == &*lst.begin ());
+    assert (1 == lst.size ());
+    assert (0 == ListItem::count_);
+
+    try {
+        ListItem::count_ = 0;
+        lst.insert (it, items, items + 20);
+    } catch (...) {
+        thrown = true;
+    }
+
+    assert (thrown);
+    assert (it == lst.begin ());
+    assert (&ref == &*lst.begin ());
+    assert (1 == lst.size ());
+    assert (0 == ListItem::count_);
+
+    return 0;
+}
diff --git a/tests/regress/23.list.special.stdcxx-334.cpp b/tests/regress/23.list.special.stdcxx-334.cpp
new file mode 100644
index 0000000..0668e8c
--- /dev/null
+++ b/tests/regress/23.list.special.stdcxx-334.cpp
@@ -0,0 +1,66 @@
+/************************************************************************
+ *
+ * 23.list.special.stdcxx-334.cpp - test case from STDCXX-334 issue
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ * 
+ **************************************************************************/
+
+#include <list>
+#include <string>
+#include <cassert>
+
+class Alloc : public std::allocator <char>
+{
+};
+
+bool operator == (Alloc a1, Alloc a2)
+{
+    return false;
+}
+
+bool operator != (Alloc a1, Alloc a2)
+{
+    return true;
+}
+
+int main(int argc, char* argv[])
+{
+    const char src [] = "source string";
+    const char dst [] = "destination string";
+
+    typedef std::list <char, Alloc> List;
+    
+    Alloc a1;
+    Alloc a2;
+
+    assert (!(a1 == a2));
+
+    List src_lst (src, src + sizeof (src) - 1, a1);
+    List dst_lst (dst, dst + sizeof (dst) - 1, a2);
+
+    src_lst.swap (dst_lst);
+
+    assert (std::string (src_lst.begin (), src_lst.end ()) == dst);
+    assert (std::string (dst_lst.begin (), dst_lst.end ()) == src);
+
+    return 0;
+}
diff --git a/tests/regress/26.valarray.sub.stdcxx-448.cpp b/tests/regress/26.valarray.sub.stdcxx-448.cpp
new file mode 100644
index 0000000..8e4e35a
--- /dev/null
+++ b/tests/regress/26.valarray.sub.stdcxx-448.cpp
@@ -0,0 +1,41 @@
+/************************************************************************
+ *
+ * 26.valarray.sub.stdcxx-448.cpp - regression test for STDCXX-448
+ *   https://issues.apache.org/jira/browse/STDCXX-448
+ *
+ * $Id:$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ * 
+ **************************************************************************/
+
+#include <cassert>
+#include <valarray>
+
+
+int main ()
+{
+    const std::valarray<double> dval;
+    
+    std::valarray<double> result (dval [std::gslice ()]);
+
+    assert (result.size () == 0);
+
+    return 0;
+}
diff --git a/tests/regress/27.stringbuf.members.stdcxx-427.cpp b/tests/regress/27.stringbuf.members.stdcxx-427.cpp
new file mode 100644
index 0000000..04ccd22
--- /dev/null
+++ b/tests/regress/27.stringbuf.members.stdcxx-427.cpp
@@ -0,0 +1,64 @@
+/************************************************************************
+ *
+ * 27.stringbuf.members.stdcxx-427.cpp - test case from STDCXX-427 issue
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ * 
+ **************************************************************************/
+
+#include <cassert>
+#include <cstdio>
+#include <sstream>
+
+int main ()
+{
+    struct Buf: std::stringbuf {
+        Buf (std::string s, std::ios::openmode m)
+            : std::stringbuf (s, m) { }
+
+        void setget (int beg, int cur, int end) {
+            setg (eback () + beg, eback () + cur, eback () + end);
+        }
+
+        void setput (int beg, int cur, int end) {
+            setp (pbase () + beg, pbase () + end);
+            pbump (cur);
+        }
+    };
+
+    {
+        Buf buf ("abcde", std::ios::in);
+        buf.setget (1, 2, 4);
+        std::printf ("%s\n", buf.str ().c_str ());
+        assert ("bcd" == buf.str ());
+    }
+    {
+        Buf buf ("abcde", std::ios::out);
+        buf.setput (1, 2, 4);
+        std::printf ("%s\n", buf.str ().c_str ());
+        assert ("bcde" == buf.str ());
+    }
+    {
+        Buf buf ("abcde", std::ios::openmode ());
+        std::printf ("%s\n", buf.str ().c_str ());
+        assert ("" == buf.str ());
+    }
+}
diff --git a/tests/self/0.inputiter.cpp b/tests/self/0.inputiter.cpp
index c87e6d2..ddf3dc5 100644
--- a/tests/self/0.inputiter.cpp
+++ b/tests/self/0.inputiter.cpp
@@ -30,6 +30,10 @@
 #include <signal.h>
 #include <stdio.h>
 
+#ifdef _MSC_VER
+#include <crtdbg.h>     // for _CrtSetReportMode()
+#endif
+
 #include <alg_test.h>   // for InputIter
 #include <rw_value.h>   // for UserClass
 #include <driver.h>     // for rw_test(), ...
@@ -353,6 +357,11 @@
 
 int main (int argc, char *argv[])
 {
+#ifdef _MSC_VER
+    // disable GUI window from abort()
+    _CrtSetReportMode (_CRT_ERROR, _CRTDBG_MODE_DEBUG);
+#endif
+
     return rw_test (argc, argv, __FILE__,
                     0 /* no clause */,
                     0 /* no comment */, run_test,
diff --git a/tests/self/0.new.cpp b/tests/self/0.new.cpp
index 066d423..96a4562 100644
--- a/tests/self/0.new.cpp
+++ b/tests/self/0.new.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/tests/self/0.outputiter.cpp b/tests/self/0.outputiter.cpp
index 4ae74fb..3b9a018 100644
--- a/tests/self/0.outputiter.cpp
+++ b/tests/self/0.outputiter.cpp
@@ -30,6 +30,10 @@
 #include <signal.h>
 #include <stdio.h>
 
+#ifdef _MSC_VER
+#include <crtdbg.h>     // for _CrtSetReportMode()
+#endif
+
 #include <alg_test.h>   // for OutputIter
 #include <rw_value.h>   // for UserClass
 #include <driver.h>     // for rw_test(), ...
@@ -326,6 +330,11 @@
 
 int main (int argc, char *argv[])
 {
+#ifdef _MSC_VER
+    // disable GUI window from abort()
+    _CrtSetReportMode (_CRT_ERROR, _CRTDBG_MODE_DEBUG);
+#endif
+
     return rw_test (argc, argv, __FILE__,
                     0 /* no clause */,
                     0 /* no comment */, run_test,
diff --git a/tests/self/0.printf.cpp b/tests/self/0.printf.cpp
index 2743d2c..f4bd0b8 100644
--- a/tests/self/0.printf.cpp
+++ b/tests/self/0.printf.cpp
@@ -361,6 +361,7 @@
     //////////////////////////////////////////////////////////////////
     printf ("%s\n", "\"%s\": character string");
 
+    TEST ("",   "",        0, 0, "");
     TEST ("%s", "",        0, 0, "");
     TEST ("%s", "a",       0, 0, "a");
     TEST ("%s", "ab",      0, 0, "ab");
@@ -1105,8 +1106,65 @@
     // "%ld", "%li" //////////////////////////////////////////////////
     printf ("\"%%l%c\": signed long\n", spec);
 
+    TEST_SPEC ("%l", 0L,       0, 0, "0");
+    TEST_SPEC ("%l", 1L,       0, 0, "1");
+    TEST_SPEC ("%l", 2L,       0, 0, "2");
+    TEST_SPEC ("%l", LONG_MAX, 0, 0, 0);
+
+    TEST_SPEC ("%l", -1L,      0, 0, 0);
+    TEST_SPEC ("%l", -2L,      0, 0, 0);
+    TEST_SPEC ("%l", LONG_MIN, 0, 0, 0);
+
+#ifndef _RWSTD_NO_LONG_LONG
+
     // "%lld", "%lli" ////////////////////////////////////////////////
     printf ("\"%%ll%c\": signed long long\n", spec);
+
+    const _RWSTD_LONG_LONG llong_min = _RWSTD_LLONG_MIN;
+    const _RWSTD_LONG_LONG llong_max = _RWSTD_LLONG_MAX;
+
+    TEST_SPEC ("%ll", 0LL,           0, 0, "0");
+    TEST_SPEC ("%ll", 1LL,           0, 0, "1");
+    TEST_SPEC ("%ll", 12LL,          0, 0, "12");
+    TEST_SPEC ("%ll", 123LL,         0, 0, "123");
+    TEST_SPEC ("%ll", 1234LL,        0, 0, "1234");
+    TEST_SPEC ("%ll", 12345LL,       0, 0, "12345");
+    TEST_SPEC ("%ll", 123456LL,      0, 0, "123456");
+    TEST_SPEC ("%ll", 1234567LL,     0, 0, "1234567");
+    TEST_SPEC ("%ll", 12345678LL,    0, 0, "12345678");
+    TEST_SPEC ("%ll", 123456789LL,   0, 0, "123456789");
+
+#  if 4 == _RWSTD_LLONG_SIZE
+
+    // FIXME: exercise 32-bit negative long long
+
+    fprintf (stderr, "Warning: %s\n", "\"%lld\" not exercised "
+             "with negative values for %u-bit long long",
+             sizeof (RWSTD_LONG_LONG) * CHAR_BIT);
+
+#  elif 8 == _RWSTD_LLONG_SIZE
+
+    TEST_SPEC ("%ll", -1LL, 0, 0, sgn ? "-1" : "18446744073709551615");
+    TEST_SPEC ("%ll", -2LL, 0, 0, sgn ? "-2" : "18446744073709551614");
+    TEST_SPEC ("%ll", -3LL, 0, 0, sgn ? "-3" : "18446744073709551613");
+
+    TEST_SPEC ("%ll", llong_min,     0, 0,
+               sgn ? "-9223372036854775808" : "9223372036854775808");
+    TEST_SPEC ("%ll", llong_min + 1, 0, 0,
+               sgn ? "-9223372036854775807" : "9223372036854775809");
+    TEST_SPEC ("%ll", llong_min + 2, 0, 0,
+               sgn ? "-9223372036854775806" : "9223372036854775810");
+
+    TEST_SPEC ("%ll", llong_max,     0, 0, "9223372036854775807");
+    TEST_SPEC ("%ll", llong_max - 1, 0, 0, "9223372036854775806");
+
+#  endif
+
+#else   // if defined (_RWSTD_NO_LONG_LONG)
+
+    fprintf (stderr, "Warning: %s\n", "\"%lld\" not exercised");
+
+#endif   // _RWSTD_NO_LONG_LONG
 }
 
 /***********************************************************************/
@@ -2880,7 +2938,10 @@
     // members must be packed with no padding
     RW_ASSERT (sizeof *sa == sizeof sa->i + sizeof sa->s);
 
-    TEST ("{%{ .*A@}}", 3, "(%i, %#s)", sa,
+    TEST ("{%{ .*A@}}",   // array of nested directives
+          3,              // three elements
+          "(%zu, %#s)",   // descrcibes structure
+          sa,             // array argument
           "{(1, \"foo\") (2, \"bar\") (3, \"foobar\")}");
 }
 
diff --git a/tests/src/any.cpp b/tests/src/any.cpp
index f12e01f..6caeeb9 100644
--- a/tests/src/any.cpp
+++ b/tests/src/any.cpp
@@ -6,16 +6,23 @@
  *
  ************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/tests/src/environ.cpp b/tests/src/environ.cpp
index 94fda03..661efb8 100644
--- a/tests/src/environ.cpp
+++ b/tests/src/environ.cpp
@@ -134,14 +134,14 @@
             // try to remove variable from the environment
 
 #ifndef _RWSTD_NO_UNSETENV
-#  ifdef _RWSTD_OS_FREEBSD
-            // FreeBSD declares void unsetenv(const char*)
+#  if defined (_RWSTD_OS_FREEBSD) || defined (_RWSTD_OS_DARWIN)
+            // FreeBSD (and Darwin) declares void unsetenv(const char*)
             // http://www.freebsd.org/cgi/man.cgi?query=unsetenv&sektion=3
             unsetenv (envvar);
             ret = 0;
-#  else   // !FreeBSD
+#  else   // !FreeBSD ...
             ret = unsetenv (envvar);
-#  endif   // FreeBSD
+#  endif   // FreeBSD ...
 #else   // ifdef _RWSTD_NO_UNSETENV
             ret = putenv (envvar);
 #endif   // _RWSTD_NO_UNSETENV
diff --git a/tests/src/locale.cpp b/tests/src/locale.cpp
index ac02870..63f01d0 100644
--- a/tests/src/locale.cpp
+++ b/tests/src/locale.cpp
@@ -34,15 +34,17 @@
 
 #include <environ.h>      // for rw_putenv()
 #include <file.h>         // for SHELL_RM_RF, rw_tmpnam
+#include <rw_printf.h>    // for rw_fprintf()
 #include <rw_process.h>   // for rw_system()
+#include <cstdio>
 
 
-#if defined __linux__
+#if defined (_RWSTD_OS_LINUX) && !defined (_XOPEN_SOURCE)
    // on Linux define _XOPEN_SOURCE to get CODESET defined in <langinfo.h>
 #  define _XOPEN_SOURCE   500   /* Single Unix conformance */
    // bring __int32_t into scope (otherwise <wctype.h> fails to compile)
 #  include <sys/types.h>
-#endif   // __linux__
+#endif   // Linux
 
 #include <fcntl.h>
 #include <sys/stat.h>   // for stat
@@ -62,7 +64,7 @@
 #include <assert.h>   // for assert
 #include <errno.h>    // for EBADF
 #include <float.h>    // for {FLT,DBL,LDBL}_DIG
-#include <limits.h>   // for CHAR_BIT, PATH_MAX
+#include <limits.h>   // for CHAR_BIT, MB_LEN_MAX, PATH_MAX
 #include <locale.h>   // for LC_XXX macros, setlocale
 #include <stdarg.h>   // for va_copy, va_list, ...
 #include <stdio.h>    // for fgets, remove, sprintf, ...
@@ -470,3 +472,241 @@
 
     return slocname;
 }
+
+/**************************************************************************/
+
+// finds a multibyte character that is `bytes' long if `bytes' is less
+// than or equal to MB_CUR_MAX, or the longest multibyte sequence in
+// the current locale
+static const char*
+_get_mb_char (char *buf, size_t bytes)
+{
+    _RWSTD_ASSERT (0 != buf);
+
+    *buf = '\0';
+
+    if (0 == bytes)
+        return buf;
+
+    const bool exact = bytes <= size_t (MB_CUR_MAX);
+
+    if (!exact)
+        bytes = MB_CUR_MAX;
+
+    wchar_t wc;
+
+    // search the first 64K characters sequentially
+    for (wc = wchar_t (1); wc != wchar_t (0xffff); ++wc) {
+
+        if (   int (bytes) == wctomb (buf, wc)
+            && int (bytes) == mblen (buf, bytes)) {
+            // NUL-terminate the multibyte character of the requested length
+            buf [bytes] = '\0';
+            break;
+        }
+
+        *buf = '\0';
+    }
+
+#if 2 < _RWSTD_WCHAR_T_SIZE
+
+    // if a multibyte character of the requested size is not found
+    // in the low 64K range, try to find one using a random search
+    if (wchar_t (0xffff) == wc) {
+
+        // iterate only so many times to prevent an infinite loop
+        // in case when MB_CUR_MAX is greater than the longest
+        // multibyte character
+        for (int i = 0; i != 0x100000; ++i) {
+
+            wc = wchar_t (rand ());
+
+            if (RAND_MAX < 0x10000) {
+                wc <<= 16;
+                wc |=  wchar_t (rand ());
+            }
+
+            if (   int (bytes) == wctomb (buf, wc)
+                && int (bytes) == mblen (buf, bytes)) {
+                // NUL-terminate the multibyte character
+                buf [bytes] = '\0';
+                break;
+            }
+
+            *buf = '\0';
+        }
+    }
+
+#endif   // 2 < _RWSTD_WCHAR_SIZE
+
+    // return 0 on failure to find a sequence exactly `bytes' long
+    return !exact || bytes == strlen (buf) ? buf : 0;
+}
+
+
+_TEST_EXPORT size_t
+rw_get_mb_chars (rw_mbchar_array_t mb_chars)
+{
+    _RWSTD_ASSERT (0 != mb_chars);
+
+    const char* mbc = _get_mb_char (mb_chars [0], size_t (-1));
+
+    if (!mbc) {
+        rw_fprintf (rw_stderr, "*** failed to find any multibyte characters "
+                    "in locale \"%s\" with MB_CUR_MAX = %u\n",
+                    setlocale (LC_CTYPE, 0), MB_CUR_MAX);
+        return 0;
+    }
+
+    size_t mb_cur_max = strlen (mbc);
+
+    if (_RWSTD_MB_LEN_MAX < mb_cur_max)
+        mb_cur_max = _RWSTD_MB_LEN_MAX;
+
+    // fill each element of `mb_chars' with a multibyte character
+    // of the corresponding length
+    for (size_t i = mb_cur_max; i; --i) {
+
+        // try to generate a multibyte character `i' bytes long
+        mbc = _get_mb_char (mb_chars [i - 1], i);
+
+        if (0 == mbc) {
+            if (i < mb_cur_max) {
+                rw_fprintf (rw_stderr, "*** failed to find %u-byte characters "
+                            "in locale \"%s\" with MB_CUR_MAX = %u\n",
+                            i + 1, setlocale (LC_CTYPE, 0), MB_CUR_MAX);
+                mb_cur_max = 0;
+                break;
+            }
+            --mb_cur_max;
+        }
+    }
+
+    return mb_cur_max;
+}
+
+
+_TEST_EXPORT const char*
+rw_find_mb_locale (size_t            *mb_cur_max,
+                   rw_mbchar_array_t  mb_chars)
+{
+    _RWSTD_ASSERT (0 != mb_cur_max);
+    _RWSTD_ASSERT (0 != mb_chars);
+
+    if (2 > _RWSTD_MB_LEN_MAX) {
+        rw_fprintf (rw_stderr, "MB_LEN_MAX = %d, giving up\n",
+                    _RWSTD_MB_LEN_MAX);
+        return 0;
+    }
+
+    static const char *mb_locale_name;
+
+    char saved_locale_name [1024];
+    strcpy (saved_locale_name, setlocale (LC_CTYPE, 0));
+
+    _RWSTD_ASSERT (strlen (saved_locale_name) < sizeof saved_locale_name);
+
+    *mb_cur_max = 0;
+
+    // iterate over all installed locales
+    for (const char *name = rw_locales (_RWSTD_LC_CTYPE, 0); name && *name;
+         name += strlen (name) + 1) {
+
+        if (setlocale (LC_CTYPE, name)) {
+
+            // try to generate a set of multibyte characters
+            // with lengths from 1 and MB_CUR_MAX (or less)
+            const size_t cur_max = rw_get_mb_chars (mb_chars);
+
+            if (*mb_cur_max < cur_max) {
+                *mb_cur_max    = cur_max;
+                mb_locale_name = name;
+
+                // break when we've found a multibyte locale
+                // with the longest possible encoding
+                if (_RWSTD_MB_LEN_MAX == *mb_cur_max)
+                    break;
+            }
+        }
+    }
+
+    if (*mb_cur_max < 2) {
+        rw_fprintf (rw_stderr, "*** failed to find a full set of multibyte "
+                    "characters in locale \"%s\" with MB_CUR_MAX = %u "
+                    "(computed)", mb_locale_name, *mb_cur_max);
+        mb_locale_name = 0;
+    }
+    else {
+        // (re)generate the multibyte characters for the saved locale
+        // as they may have been overwritten in subsequent iterations
+        // of the loop above (while searching for a locale with greater
+        // value of MB_CUR_MAX)
+        setlocale (LC_CTYPE, mb_locale_name);
+        rw_get_mb_chars (mb_chars);
+    }
+
+    setlocale (LC_CTYPE, saved_locale_name);
+
+    return mb_locale_name;
+}
+
+
+/**************************************************************************/
+
+_TEST_EXPORT const char*
+rw_create_locale (const char *charmap, const char *locale)
+{
+    // only one locale is enough (avoid invoking localedef more than once)
+    static const char* locname;
+    const char* locale_root;
+
+    if (locname)
+        return locname;
+
+    // set up RWSTD_LOCALE_ROOT and other environment variables
+    locale_root = rw_set_locale_root ();
+
+    if (0 == locale_root)
+        return 0;
+
+    // create a temporary locale definition file that exercises as
+    // many different parts of the collate standard as possible
+    char srcfname [256];
+    std::sprintf (srcfname, "%s%slocale.src", locale_root, SLASH);
+
+    std::FILE *fout = std::fopen (srcfname, "w");
+
+    if (!fout) {
+        std::fprintf (stderr, "%s:%d: fopen(\"%s\", \"w\") failed\n",
+                      __FILE__, __LINE__, srcfname);
+        return 0;
+    }
+
+       std::fprintf (fout, "%s", locale);
+
+    std::fclose (fout);
+
+    // create a temporary character map file
+    char cmfname [256];
+    std::sprintf (cmfname, "%s%scharmap.src", locale_root, SLASH);
+
+    fout = std::fopen (cmfname, "w");
+
+    if (!fout) {
+        std::fprintf (stderr, "%s:%d: fopen(\"%s\", \"w\") failed\n",
+                      __FILE__, __LINE__, cmfname);
+        return 0;
+    }
+
+       std::fprintf (fout, "%s", charmap);
+
+    std::fclose (fout);
+
+       locname = "test-locale";
+
+    // process the locale definition file and character map
+    if (0 == rw_localedef ("-w", srcfname, cmfname, locname))
+        locname = 0;
+
+    return locname;
+}
diff --git a/tests/src/opt_diags.cpp b/tests/src/opt_diags.cpp
index ba94f3d..e6fce5f 100644
--- a/tests/src/opt_diags.cpp
+++ b/tests/src/opt_diags.cpp
@@ -2,21 +2,28 @@
  *
  * opt_diags.cpp - definitions of diagnostic option handlers
  *
- * $Id:$
+ * $Id$
  *
  ************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ * 
  **************************************************************************/
 
 // expand _TEST_EXPORT macros
diff --git a/tests/src/opt_diags.h b/tests/src/opt_diags.h
index 8105a29..1fcb793 100644
--- a/tests/src/opt_diags.h
+++ b/tests/src/opt_diags.h
@@ -2,21 +2,28 @@
  *
  * opt_diags.h - declarations of diagnostic option handlers
  *
- * $Id:$
+ * $Id$
  *
  ************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ * 
  **************************************************************************/
 
 #ifndef RW_OPT_DIAGS_H_INCLUDED
diff --git a/tests/src/opt_lines.cpp b/tests/src/opt_lines.cpp
index 36f56b2..3c73931 100644
--- a/tests/src/opt_lines.cpp
+++ b/tests/src/opt_lines.cpp
@@ -2,21 +2,28 @@
  *
  * opt_lines.cpp - definitions of line option handlers
  *
- * $Id:$
+ * $Id$
  *
  ************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ * 
  **************************************************************************/
 
 // expand _TEST_EXPORT macros
diff --git a/tests/src/opt_lines.h b/tests/src/opt_lines.h
index 008da2a..c178453 100644
--- a/tests/src/opt_lines.h
+++ b/tests/src/opt_lines.h
@@ -2,21 +2,28 @@
  *
  * opt_lines.h - declarations of line option handlers
  *
- * $Id:$
+ * $Id$
  *
  ************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ * 
  **************************************************************************/
 
 #ifndef RW_OPT_LINES_H_INCLUDED
diff --git a/tests/src/opt_types.cpp b/tests/src/opt_types.cpp
index 10485e9..7174862 100644
--- a/tests/src/opt_types.cpp
+++ b/tests/src/opt_types.cpp
@@ -2,21 +2,28 @@
  *
  * opt_types.cpp - definitions of type option handlers
  *
- * $Id:$
+ * $Id$
  *
  ************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ * 
  **************************************************************************/
 
 // expand _TEST_EXPORT macros
diff --git a/tests/src/opt_types.h b/tests/src/opt_types.h
index a974c0c..dfb2d9c 100644
--- a/tests/src/opt_types.h
+++ b/tests/src/opt_types.h
@@ -2,21 +2,28 @@
  *
  * opt_types.h - declarations of type option handlers
  *
- * $Id:$
+ * $Id$
  *
  ************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ * 
  **************************************************************************/
 
 #ifndef RW_OPT_TYPES_H_INCLUDED
diff --git a/tests/src/thread.cpp b/tests/src/thread.cpp
index 5fa1dd3..482afa2 100644
--- a/tests/src/thread.cpp
+++ b/tests/src/thread.cpp
@@ -31,6 +31,7 @@
 
 #include <rw_thread.h>
 #include <stddef.h>     // for size_t
+#include <string.h>     // for memset()
 
 /**************************************************************************/
 
@@ -381,7 +382,35 @@
     // small buffer for thread ids when invoked with (thr_id == 0)
     rw_thread_t id_buf [16];
 
-    bool join       = 0 == thr_id;
+    const bool join = 0 == thr_id;
+
+#ifndef _RWSTD_REENTRANT
+
+    // when not reentrant/thread safe emulate the creation
+    // of a single thread and then waiting for it to finish
+    // by simply calling the thread procedure
+
+    if (1 == nthrs && join) {
+
+        if (0 == thr_id) {
+            thr_id = id_buf;
+            memset (thr_id, 0, sizeof *thr_id);
+        }
+
+        // when the thr_arg pointer is 0 pass the address
+        // of each thread's id as the argument to thr_proc
+        void* const arg = thr_arg ? thr_arg [0] : (void*)(thr_id);
+
+        void* const thr_result = thr_proc (arg);
+
+        if (thr_arg)
+            thr_arg [0] = thr_result;
+
+        return 0;
+    }
+
+#endif   // !_RWSTD_REENTRANT
+
     bool delete_ids = false;
 
     if (0 == thr_id) {
diff --git a/tests/src/value.cpp b/tests/src/value.cpp
index 0e6bee7..28ae825 100644
--- a/tests/src/value.cpp
+++ b/tests/src/value.cpp
@@ -455,18 +455,6 @@
 
 typedef unsigned char UChar;
 
-// used to initialize an array of objects of type UserClass
-static const char *xinit_begin;
-
-static int xinit ()
-{
-    if (xinit_begin)
-        return UChar (*xinit_begin++);
-
-    return 0;
-}
-
-
 template <class T>
 static T*
 __rw_from_char (T*, const char *str, size_t len, bool sorted)
diff --git a/tests/strings/21.cctype.cpp b/tests/strings/21.cctype.cpp
index e945487..b5a3cc1 100644
--- a/tests/strings/21.cctype.cpp
+++ b/tests/strings/21.cctype.cpp
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/tests/strings/21.cwchar.cpp b/tests/strings/21.cwchar.cpp
index dcdd02d..fc94d7b 100644
--- a/tests/strings/21.cwchar.cpp
+++ b/tests/strings/21.cwchar.cpp
@@ -22,7 +22,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2005 Rogue Wave Software.
+ * Copyright 2004-2005 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -87,6 +87,10 @@
 
 /**************************************************************************/
 
+#ifdef _MSC_VER
+#include <crtdbg.h>   // for _CrtSetReportMode()
+#endif
+
 #include <cwchar>
 #include <any.h>      // for rw_any_t
 #include <driver.h>   // for rw_test(), ...
@@ -921,8 +925,19 @@
     /* const */ int tm_buf [16] = { 0 };
     const test_tm* tmb = (const test_tm*)&tm_buf;
 
+#ifdef _MSC_VER
+    // disable GUI window with error:
+    // Assertion failed: ("Zero length output buffer passed to strftime",0)
+    int oldmode = _CrtSetReportMode (_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
+#endif
+
     TEST (test_size_t, wcsftime, (wstr, size, L"", tmb), WCSFTIME, -1);
 
+#ifdef _MSC_VER
+    // restore error report mode
+    _CrtSetReportMode (_CRT_ASSERT, oldmode);
+#endif
+
     TEST (test_wint_t, btowc, (i), BTOWC, -1);
     TEST (int, wctob, (wi), WCTOB, -1);
 
@@ -968,7 +983,8 @@
 
 // included here to avoid namespace pollution
 #include <cstdarg>       // for va_list
-#include <cstdio>        // for FILE
+#include <cstdio>        // for FILE, fopen()
+#include <file.h>        // for DEV_NUL
 #include <rw_printf.h>   // for rw_stdout
 
 namespace std {
@@ -1013,10 +1029,15 @@
     // an incomplete type and casts between two non-void pointers
     // require that the types be complete (in case they are related
     // by inheritance and need to be adjusted)
-    test_FILE* const fp = (test_FILE*)(void*)rw_stdout;
+    test_FILE* const fp = (test_FILE*)std::fopen (DEV_NULL, "w");
     test_va_list va;
     va_start (va, dummy);
 
+    // call fwide() first before any prior output since 7.19.2, p5
+    // of C99 prohibits wide character I/O functions from being called
+    // on a byte-oriented stream
+    TEST (int, fwide, (fp, i), FWIDE, -1);
+
     TEST (int, fwprintf, (fp, L""), FWPRINTF, -1);
     TEST (int, fwprintf, (fp, L"", uniqptr), FWPRINTF, -1);
 
@@ -1032,7 +1053,6 @@
     TEST (test_wint_t, getwc, (fp), GETWC, -1);
     TEST (test_wint_t, putwc, (L'\0', fp), PUTWC, -1);
     TEST (test_wint_t, ungetwc, (wi, fp), UNGETWC, -1);
-    TEST (int, fwide, (fp, i), FWIDE, -1);
 
     _RWSTD_UNUSED (str);
     _RWSTD_UNUSED (cstr);
diff --git a/tests/strings/21.string.access.cpp b/tests/strings/21.string.access.cpp
index 459d3c0..8f674ba 100644
--- a/tests/strings/21.string.access.cpp
+++ b/tests/strings/21.string.access.cpp
@@ -6,16 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/tests/strings/21.string.cons.mt.cpp b/tests/strings/21.string.cons.mt.cpp
new file mode 100644
index 0000000..da90c88
--- /dev/null
+++ b/tests/strings/21.string.cons.mt.cpp
@@ -0,0 +1,261 @@
+/***************************************************************************
+ *
+ * 21.string.cons.mt.cpp:
+ *
+ * Test exercising the thread safety of basic_string constructors
+ * and assignment operators.
+ *
+ * $Id: 21.string.push_back.mt.cpp 425530 2006-07-25 21:39:50Z sebor $
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#include <string>       // for string
+
+#include <cstddef>      // for size_t
+
+#include <driver.h>     // for rw_test()
+#include <rw_thread.h>  // for rw_thread_pool(), ...
+#include <valcmp.h>     // for rw_strncmp()
+
+/**************************************************************************/
+
+#define MAX_THREADS      32
+#define MAX_LOOPS    100000
+
+const char* const
+data [] = {
+    /*  0 */ "",
+    /*  1 */ "a",
+    /*  2 */ "bc",
+    /*  3 */ "cde",
+    /*  4 */ "defg",
+    /*  5 */ "efghi",
+    /*  6 */ "fghijk",
+    /*  7 */ "ghijklm"
+};
+
+const std::size_t
+nstrings = sizeof data / sizeof *data;
+
+const std::string
+shared [nstrings] = {
+    data [0], data [1], data [2], data [3],
+    data [4], data [5], data [6], data [7]
+};
+
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+const wchar_t* const
+wdata [] = {
+    /*  0 */ L"",
+    /*  1 */ L"a",
+    /*  2 */ L"bc",
+    /*  3 */ L"cde",
+    /*  4 */ L"defg",
+    /*  5 */ L"efghi",
+    /*  6 */ L"fghijk",
+    /*  7 */ L"ghijklm"
+};
+
+const std::wstring
+wshared [nstrings] = {
+    wdata [0], wdata [1], wdata [2], wdata [3],
+    wdata [4], wdata [5], wdata [6], wdata [7]
+};
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+/**************************************************************************/
+
+#ifdef _RWSTD_REENTRANT
+int rw_opt_nthreads = 4;
+#else   // if !defined (_RWSTD_REENTRANT)
+// in non-threaded builds use just one thread
+int rw_opt_nthreads = 1;
+#endif   // _RWSTD_REENTRANT
+
+// the number of times each thread should iterate
+int rw_opt_nloops = MAX_LOOPS;
+
+
+template <class T>
+void
+test_string_cons (const T* const             *pdata,
+                  const std::basic_string<T> *pshared,
+                  std::size_t                 threadno)
+{
+    typedef std::basic_string<T> String;
+
+    for (std::size_t i = 0; i != std::size_t (rw_opt_nloops); ++i) {
+
+        const std::size_t inx1 = (i + threadno) % nstrings;
+        const std::size_t inx2 = (inx1 + 1) % nstrings;
+
+        // create a copy of the global string
+        const String copy (pshared [inx1]);
+
+        String assigned (pshared [inx2]);
+
+        {
+            // create another copy of the same global string
+            const String copy2 (pshared [inx1]);
+
+            // verify that this copy has the expected length...
+            RW_ASSERT (pshared [inx1].length () == copy2.length ());
+
+            // ...and the expected data
+            RW_ASSERT (0 == rw_strncmp (pdata [inx1], copy2.data ()));
+
+            assigned = pshared [inx1];
+
+            // copy2 gets destroyed...
+        }
+
+        // verify that local copy has the expected length...
+        RW_ASSERT (pshared [inx1].length () == copy.length ());
+
+        // ...and the expected data
+        RW_ASSERT (0 == rw_strncmp (pdata [inx1], copy.data ()));
+
+        // verify that assigned string has the expected length...
+        RW_ASSERT (pshared [inx1].length () == assigned.length ());
+
+        // ...and the expected data
+        RW_ASSERT (0 == rw_strncmp (pdata [inx1], assigned.data ()));
+
+        // reassign and verify again
+        assigned = pdata [inx2];
+
+        RW_ASSERT (pshared [inx2].length () == assigned.length ());
+        RW_ASSERT (0 == rw_strncmp (pdata [inx2], assigned.data ()));
+    }
+
+}
+
+
+extern "C" {
+
+bool test_wstring;
+
+static void*
+thread_func (void *arg)
+{
+    const rw_thread_t* const pthread = (rw_thread_t*)arg;
+
+    // get the 0-based thread number
+    const std::size_t threadno = std::size_t (pthread->threadno);
+
+    if (test_wstring) {
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+        test_string_cons<wchar_t>(wdata, wshared, threadno);
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+    }
+    else {
+        test_string_cons (data, shared, threadno);
+    }
+
+    return 0;
+}
+
+}   // extern "C"
+
+/**************************************************************************/
+
+static int
+run_test (int, char**)
+{
+    rw_info (0, 0, 0,
+             "testing std::string with %d thread%{?}s%{;}, "
+             "%zu iteration%{?}s%{;} each",
+             rw_opt_nthreads, 1 != rw_opt_nthreads,
+             rw_opt_nloops, 1 != rw_opt_nloops);
+
+    test_wstring = false;
+
+    // create and start a pool of threads and wait for them to finish
+    int result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+    for (std::size_t i = 0; i != nstrings; ++i) {
+
+        const std::size_t size =
+            std::string::traits_type::length (data [i]);
+
+        rw_assert (size == shared [i].size (), 0, 0,
+                   "shared string modifed from %#s to %{#S}",
+                   data [i], &shared [i]);
+    }
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    rw_info (0, 0, 0,
+             "testing std::wstring with %d thread%{?}s%{;}, "
+             "%zu iteration%{?}s%{;} each",
+             rw_opt_nthreads, 1 != rw_opt_nthreads,
+             rw_opt_nloops, 1 != rw_opt_nloops);
+
+    test_wstring = true;
+
+    // start a pool of threads to exercise wstring thread safety
+    result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+    for (std::size_t i = 0; i != nstrings; ++i) {
+
+        const std::size_t size =
+            std::wstring::traits_type::length (wdata [i]);
+
+        rw_assert (size == wshared [i].size (), 0, 0,
+                   "shared string modifed from %#ls to %{#lS}",
+                   wdata [i], &wshared [i]);
+    }
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+    return result;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv[])
+{
+    return rw_test (argc, argv, __FILE__,
+                    "lib.string.cons",
+                    "thread safety", run_test,
+                    "|-nloops#0 "       // must be non-negative
+                    "|-nthreads#0-*",   // must be in [0, MAX_THREADS]
+                    &rw_opt_nloops,
+                    int (MAX_THREADS),
+                    &rw_opt_nthreads);
+}
diff --git a/tests/strings/21.string.push_back.mt.cpp b/tests/strings/21.string.push_back.mt.cpp
index 48783b4..650a950 100644
--- a/tests/strings/21.string.push_back.mt.cpp
+++ b/tests/strings/21.string.push_back.mt.cpp
@@ -28,8 +28,7 @@
  **************************************************************************/
 
 #include <string>       // for string
-
-#include <cstdio>       // for putc(), puts(), ...
+#include <cstddef>      // for size_t
 
 #include <driver.h>     // for rw_test()
 #include <rw_thread.h>  // for rw_thread_pool(), ...
@@ -49,8 +48,14 @@
 
 /**************************************************************************/
 
+#ifdef _RWSTD_REENTRANT
 int rw_opt_nthreads = 4;
-int rw_opt_nloops   = MAX_LOOPS;
+#else   // if !defined (_RWSTD_REENTRANT)
+// in non-threaded builds use just one thread
+int rw_opt_nthreads = 1;
+#endif   // _RWSTD_REENTRANT
+
+int rw_opt_nloops = MAX_LOOPS;
 
 extern "C" {
 
@@ -93,12 +98,6 @@
         // verify that the local copies have the expected data
         RW_ASSERT (0 == rw_strncmp (expect0_data, local0.data ()));
         RW_ASSERT (0 == rw_strncmp (expect1_data, local1.data ()));
-      
-        if (60 < rw_opt_nloops && 0 == i % (rw_opt_nloops / 60)) {
-            // parentheses used to thwart macro expansion
-            (std::putc)(to_append [thr_inx], stdout);
-            std::fflush (stdout);
-        }
     }
 
     return 0;
@@ -119,7 +118,9 @@
     const int result = rw_thread_pool (0, std::size_t (rw_opt_nthreads),
                                        0, thread_func, 0);
 
-    std::puts ("");
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
 
     rw_assert (0 == shared0.size (), 0, 0,
                "shared empty string modifed: expected \"\", got %{#S}",
diff --git a/tests/support/18.exception.cpp b/tests/support/18.exception.cpp
index 658df29..9467541 100644
--- a/tests/support/18.exception.cpp
+++ b/tests/support/18.exception.cpp
@@ -6,22 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright 2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
- * Copyright 2001-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2001-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -36,9 +37,8 @@
 #include <stdexcept>      // for exception classes
 #include <typeinfo>       // for bad_cast, bad_typeid
 
-#include <csetjmp>        // for jmp_buf, longjmp(), setjmp()
 #include <csignal>        // for signal(), SIGABRT
-#include <cstdio>         // for sprintf()
+#include <cstdio>         // for size_t, sprintf()
 #include <cstring>        // for strcmp(), strlen()
 
 #include <rw/_error.h>    // for _RWSTD_ERROR_XXX constants
@@ -50,6 +50,27 @@
 
 #include <driver.h>
 
+
+#ifdef _RWSTD_OS_LINUX
+   // use siglongjmp() and sigsetjmp() on Linux to avoid
+   // http://sourceware.org/bugzilla/show_bug.cgi?id=2351
+#  include <setjmp.h>    // for siglongjmp(), sigsetjmp()
+
+#  define RW_JMP_BUF             jmp_buf
+#  define RW_SETJMP(env)         sigsetjmp (env, 0)
+#  define RW_LONGJMP(env, val)   siglongjmp (env, val)
+#else   // if !defined (_RWSTD_OS_LINUX)
+#  include <csetjmp>    // for longjmp(), setjmp()
+
+#  define RW_JMP_BUF             std::jmp_buf
+#  ifdef setjmp
+#    define RW_SETJMP(env)       setjmp (env)
+#  else
+#    define RW_SETJMP(env)       std::setjmp (env)
+#  endif
+#  define RW_LONGJMP(env, val)   std::longjmp (env, val)
+#endif   // _RWSTD_OS_LINUX
+
 /**************************************************************************/
 
 // check header <exception> synopsis
@@ -195,7 +216,7 @@
 int                     expect_terminate;    // terminate expected if 1
 int                     expect_unexpected;   // unexpected expected if 1
 int                     expect_throw_proc;   // throw_proc expected if 1
-std::jmp_buf            env;
+RW_JMP_BUF              jmpenv;
 
 /**************************************************************************/
 
@@ -213,7 +234,7 @@
 
     expect_abort = -1;
 
-    std::longjmp (env, 1);
+    RW_LONGJMP (jmpenv, 1);
 }
 
 }   // extern "C"
@@ -238,7 +259,7 @@
     rw_assert (false, 0, __LINE__,
                "std::terminate() not called or returned");
 
-    std::longjmp (env, -1);
+    RW_LONGJMP (jmpenv, -1);
 }
 
 /**************************************************************************/
@@ -266,7 +287,7 @@
     rw_assert (false, 0, __LINE__,
                "std::terminate() not called or returned");
 
-    std::longjmp (env, -1);
+    RW_LONGJMP (jmpenv, -1);
 }
 
 /**************************************************************************/
@@ -325,7 +346,7 @@
         rw_assert (0,  0, __LINE__, "incompatible exception propagated");
     }
 
-    std::longjmp (env, -1);
+    RW_LONGJMP (jmpenv, -1);
 
 #else
 
@@ -741,7 +762,9 @@
 #  endif   // _RWSTD_NO_SETRLIMIT
 
             // try to allocate a huge amount of memory to induce bad_alloc
-            ::operator new (~0UL - 4096UL);
+            const std::size_t huge_amount = _RWSTD_SIZE_MAX - 4096;
+
+            ::operator new (huge_amount);
 
 #  ifndef _RWSTD_NO_SETRLIMIT
 #    if !defined (__HP_aCC)
@@ -903,7 +926,7 @@
             try {
                 // jump back here if the induced exception causes
                 // a call to terminate() and/or raises SIGABRT
-                if (0 == setjmp (env)) {
+                if (0 == RW_SETJMP (jmpenv)) {
 
                     // try to induce the standard exception
                     if (ex_id == induce_exception (ex_id, ex_name)) {
@@ -981,10 +1004,23 @@
                  "test of uncaught_exception() disabled"))
         test_uncaught_exception ();
 
+    // exercise __rw::__rw_throw() and __rw::__rw_throw_proc()
+    if (rw_note (0 <= opt_rw_throw, 0, __LINE__,
+                 "test of __rw_throw() disabled"))
+        test_rw_throw ();
+
+    // exercise the cooperation between the C++ standard library and
+    // the runtime support library when throwing standard exceptions
+    if (rw_note (0 <= opt_runtime, 0, __LINE__,
+                 "test of runtime support disabled"))
+        test_runtime ();
+
+    // exercise the effects last to defer potential problems
+    // due to the tests returning (jumping) out of the handlers
     if (rw_note (0 <= opt_effects, 0, __LINE__,
                  "test of effects disabled")) {
         // test the effects of 18.6
-        if (0 == setjmp (env)) {
+        if (0 == RW_SETJMP (jmpenv)) {
             test_effects ();
         }
 
@@ -1000,17 +1036,6 @@
                   "unexpected() was called unexpectedly");
     }
 
-    // exercise __rw::__rw_throw() and __rw::__rw_throw_proc()
-    if (rw_note (0 <= opt_rw_throw, 0, __LINE__,
-                 "test of __rw_throw() disabled"))
-        test_rw_throw ();
-
-    // exercise the cooperation between the C++ standard library and
-    // the runtime support library when throwing standard exceptions
-    if (rw_note (0 <= opt_runtime, 0, __LINE__,
-                 "test of runtime support disabled"))
-        test_runtime ();
-
     return 0;
 }
 
diff --git a/tests/tr1.util/2.smartptr.shared.cpp b/tests/tr1.util/2.smartptr.shared.cpp
index 76d1beb..7172bc2 100644
--- a/tests/tr1.util/2.smartptr.shared.cpp
+++ b/tests/tr1.util/2.smartptr.shared.cpp
@@ -7,16 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/tests/tr1.util/2.smartptr.weak.cpp b/tests/tr1.util/2.smartptr.weak.cpp
index e99f6ee..7875cb7 100644
--- a/tests/tr1.util/2.smartptr.weak.cpp
+++ b/tests/tr1.util/2.smartptr.weak.cpp
@@ -7,17 +7,24 @@
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ * 
  **************************************************************************/
 
 #include <cassert>
diff --git a/tests/utilities/20.pairs.cpp b/tests/utilities/20.pairs.cpp
index 407eace..472ce29 100644
--- a/tests/utilities/20.pairs.cpp
+++ b/tests/utilities/20.pairs.cpp
@@ -99,8 +99,6 @@
         _RWSTD_UNUSED (pu);
     }
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     if (0) {   // compile only
         Pair *p0 = 0;
         std::pair<long, double> p1 (*p0);
@@ -193,8 +191,6 @@
                    "expected 2", UserClass::n_total_op_assign_);
     }
 
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     {
 
 // exercise the signature of a nonmember (or static member) function
diff --git a/util/aliases.cpp b/util/aliases.cpp
index 24997d2..17aeb46 100644
--- a/util/aliases.cpp
+++ b/util/aliases.cpp
@@ -49,7 +49,9 @@
 
 
 #ifndef _MSC_VER
-#  include <langinfo.h>
+#  ifndef _RWSTD_NO_NL_LANGINFO
+#    include <langinfo.h>
+#  endif
 #endif  // _MSC_VER
 
 #include "aliases.h"
diff --git a/util/aliases.h b/util/aliases.h
index 9223a3c..0b1415b 100644
--- a/util/aliases.h
+++ b/util/aliases.h
@@ -2,20 +2,27 @@
  *
  * aliases.h
  *
- * $Id: //stdlib/dev/source/stdlib/util/aliases.h#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/util/charmap.cpp b/util/charmap.cpp
index 4b854c4..48db6a9 100644
--- a/util/charmap.cpp
+++ b/util/charmap.cpp
@@ -32,7 +32,9 @@
 // _XOPEN_SOURCE macro in assert.h selects a different declaration for 
 // iconv than the one used in comp test.
 #ifndef _MSC_VER
-#  include <iconv.h>
+#  ifndef _RWSTD_NO_ICONV
+#    include <iconv.h>
+#  endif
 #  include _RWSTD_CERRNO
 #else
 #  include <windows.h>
diff --git a/util/charmap.h b/util/charmap.h
index 598a4b4..f79bffb 100644
--- a/util/charmap.h
+++ b/util/charmap.h
@@ -36,7 +36,9 @@
 #include <set>
 
 #ifndef _MSC_VER
-#  include <iconv.h>
+#  ifndef _RWSTD_NO_ICONV
+#    include <iconv.h>
+#  endif
 #endif  // _MSC_VER
 
 #include "scanner.h"
diff --git a/util/display.cpp b/util/display.cpp
index a1af135..79f6478 100644
--- a/util/display.cpp
+++ b/util/display.cpp
@@ -37,8 +37,8 @@
 */
 static void print_header_plain ()
 {
-    puts ("NAME                      STATUS WARN ASSERTS FAILED PERCNT    "
-          "USER     SYS    REAL");
+    puts ("NAME                           STATUS WARN ASSERTS FAILED PERCNT"
+          "    USER     SYS    REAL");
 }
 
 /**
@@ -47,7 +47,7 @@
 static void print_target_plain (const struct target_opts*)
 {
     const char* const target_name = get_target ();
-    printf ("%-25.25s ", target_name);
+    printf ("%-30.30s ", target_name);
     fflush (stdout);
 }
 
diff --git a/util/iconv.cpp b/util/iconv.cpp
index 4230f95..465a8c9 100644
--- a/util/iconv.cpp
+++ b/util/iconv.cpp
@@ -2,20 +2,27 @@
  *
  * iconv.cpp - Win32 implementation of the POSIX iconv facility
  *
- * $Id: //stdlib/dev/source/stdlib/util/iconv.cpp#5 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/util/loc_exception.h b/util/loc_exception.h
index e81b4e5..2733d30 100644
--- a/util/loc_exception.h
+++ b/util/loc_exception.h
@@ -2,20 +2,27 @@
  *
  * loc_exception.h - exception class used in locale and localedef
  *
- * $Id: //stdlib/dev/source/stdlib/util/loc_exception.h#8 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/util/locale.cpp b/util/locale.cpp
index 53618de..48db410 100644
--- a/util/locale.cpp
+++ b/util/locale.cpp
@@ -37,8 +37,12 @@
 #ifndef _MSC_VER
 #  include <sys/mman.h>   // for mmap()
 #  include <unistd.h>     // for close ()
-#  include <iconv.h>
-#  include <langinfo.h>
+#  ifndef _RWSTD_NO_ICONV
+#    include <iconv.h>
+#  endif
+#  ifndef _RWSTD_NO_NL_LANGINFO
+#    include <langinfo.h>
+#  endif
 #else
 #  include <io.h>         // for open()
 #  include <windows.h>
diff --git a/util/localedef.h b/util/localedef.h
index 270124f..57c99f9 100644
--- a/util/localedef.h
+++ b/util/localedef.h
@@ -2,20 +2,27 @@
  *
  * localedef.h
  *
- * $Id: //stdlib/dev/source/stdlib/util/localedef.h#93 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/util/memchk.h b/util/memchk.h
index c6abde7..9efcd06 100644
--- a/util/memchk.h
+++ b/util/memchk.h
@@ -2,20 +2,27 @@
  *
  * memchk.cpp - declarations of memory checking helper functions
  *
- * $Id: //stdlib/dev/source/stdlib/util/memchk.h#2 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/util/output.cpp b/util/output.cpp
index 5ffa9f0..9898114 100644
--- a/util/output.cpp
+++ b/util/output.cpp
@@ -58,10 +58,14 @@
 static void
 check_test (FILE* data, struct target_status* status)
 {
-    unsigned r_lvl = 0, r_active = 0, r_total = 0;
-    int fmt_ok = 0;
-    unsigned fsm = 0;
-    char tok;
+    unsigned r_lvl    = 0;   /* diagnostic severity level */
+    unsigned r_active = 0;   /* number of active diagnostics */
+    unsigned r_total  = 0;   /* total number of diagnostics */
+
+    int fmt_ok = 0;          /* is output format okay? */
+
+    unsigned fsm = 0;        /* state */
+    char tok;                /* current character */
 
     const char* const target_name = get_target ();
 
@@ -69,7 +73,15 @@
     assert (0 != data);
     assert (0 != status);
 
-    for (tok = fgetc (data); fsm < 6 && !feof (data); tok = fgetc (data)) {
+    tok = fgetc (data);
+
+    if (feof (data)) {
+        /* target produced no output (regression test?) */
+        status->status = ST_NO_OUTPUT;
+        return;
+    }
+
+    for ( ; fsm < 6 && !feof (data); tok = fgetc (data)) {
         switch (tok) {
         case '\n':
             fsm = 1;
@@ -145,7 +157,15 @@
     assert (0 != data);
     assert (0 != status);
 
-    for (tok = fgetc (data); !feof (data); tok = fgetc (data)) {
+    tok = fgetc (data);
+
+    if (feof (data)) {
+        /* target produced no output (regression test?) */
+        status->status = ST_NO_OUTPUT;
+        return;
+    }
+
+    for ( ; !feof (data); tok = fgetc (data)) {
         switch (tok) {
         case '\n':
             fsm = 1;
diff --git a/util/path.cpp b/util/path.cpp
index 495170a..6cff312 100644
--- a/util/path.cpp
+++ b/util/path.cpp
@@ -2,20 +2,27 @@
  *
  * path.cpp
  *
- * $Id: //stdlib/dev/source/stdlib/util/path.cpp#5 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/