From commits-return-3063-apmail-stdcxx-commits-archive=stdcxx.apache.org@stdcxx.apache.org Sat Jun 07 02:25:04 2008
Return-Path: <commits-return-3063-apmail-stdcxx-commits-archive=stdcxx.apache.org@stdcxx.apache.org>
Delivered-To: apmail-stdcxx-commits-archive@www.apache.org
Received: (qmail 63650 invoked from network); 7 Jun 2008 02:25:04 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 7 Jun 2008 02:25:04 -0000
Received: (qmail 52107 invoked by uid 500); 7 Jun 2008 02:25:07 -0000
Delivered-To: apmail-stdcxx-commits-archive@stdcxx.apache.org
Received: (qmail 52090 invoked by uid 500); 7 Jun 2008 02:25:07 -0000
Mailing-List: contact commits-help@stdcxx.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@stdcxx.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@stdcxx.apache.org>
List-Post: <mailto:commits@stdcxx.apache.org>
List-Id: <commits.stdcxx.apache.org>
Reply-To: dev@stdcxx.apache.org
Delivered-To: mailing list commits@stdcxx.apache.org
Received: (qmail 52081 invoked by uid 99); 7 Jun 2008 02:25:07 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jun 2008 19:25:07 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Jun 2008 02:24:15 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 333AA2388A06; Fri,  6 Jun 2008 19:24:36 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r664244 [2/3] - in /stdcxx/branches/4.3.x: etc/config/
 examples/include/ examples/tutorial/ include/ src/ tests/algorithms/
 tests/containers/ tests/diagnostics/ tests/include/ tests/intro/
 tests/iostream/ tests/iterators/ tests/localization...
Date: Sat, 07 Jun 2008 02:24:26 -0000
To: commits@stdcxx.apache.org
From: vitek@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080607022436.333AA2388A06@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Modified: stdcxx/branches/4.3.x/tests/intro/17.extensions.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/intro/17.extensions.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/intro/17.extensions.cpp (original)
+++ stdcxx/branches/4.3.x/tests/intro/17.extensions.cpp Fri Jun  6 19:24:19 2008
@@ -295,7 +295,7 @@
 
 /***********************************************************************/
 
-#include <driver.h>
+#include <rw_driver.h>
 
 bool predicate (int /* unused */) { return true; }
 

Modified: stdcxx/branches/4.3.x/tests/intro/17.names.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/intro/17.names.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/intro/17.names.cpp (original)
+++ stdcxx/branches/4.3.x/tests/intro/17.names.cpp Fri Jun  6 19:24:19 2008
@@ -35,7 +35,8 @@
 //   as compilation errors
 
 #include <rw/_defs.h>
-#include <driver.h>
+
+#include <rw_driver.h>
 
 
 #ifdef __SUNPRO_CC

Modified: stdcxx/branches/4.3.x/tests/iostream/27.basic.ios.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/iostream/27.basic.ios.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/iostream/27.basic.ios.cpp (original)
+++ stdcxx/branches/4.3.x/tests/iostream/27.basic.ios.cpp Fri Jun  6 19:24:19 2008
@@ -162,7 +162,7 @@
 
 // additional compilation tests
 
-#include <driver.h>
+#include <rw_driver.h>
 
 static void
 test_synopsis ()

Modified: stdcxx/branches/4.3.x/tests/iostream/27.filebuf.codecvt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/iostream/27.filebuf.codecvt.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/iostream/27.filebuf.codecvt.cpp (original)
+++ stdcxx/branches/4.3.x/tests/iostream/27.filebuf.codecvt.cpp Fri Jun  6 19:24:19 2008
@@ -63,8 +63,8 @@
 #include <cstring>   // for memset(), strcmp(), strlen()
 #include <cwchar>    // for mbstate_t
 
-#include <driver.h>
-#include <file.h>
+#include <rw_driver.h>
+#include <rw_file.h>
 
 /**************************************************************************/
 
@@ -581,7 +581,7 @@
     do_in (st, from, from_end, from_next,
            to_next, to_next + max, to_next);
 
-    return to_next - (intern_type*)0;
+    return int (to_next - (intern_type*)0);
 }
 
 /***********************************************************************/
@@ -1059,7 +1059,7 @@
     // will be populated with file offsets and escape sequences
     char buffer [4096] = { '\0' };
 
-    int buflen = 0;
+    std::size_t buflen = 0;
 
     // generate file contents using UD conversion
     if (1) {

Modified: stdcxx/branches/4.3.x/tests/iostream/27.filebuf.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/iostream/27.filebuf.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/iostream/27.filebuf.cpp (original)
+++ stdcxx/branches/4.3.x/tests/iostream/27.filebuf.cpp Fri Jun  6 19:24:19 2008
@@ -56,9 +56,9 @@
 #  define SIGPIPE   13   /* HP-UX, Linux, and SunOS value */
 #endif   // SIGPIPE
 
-#include <driver.h>
-#include <file.h>
-#include <valcmp.h>
+#include <rw_driver.h>
+#include <rw_file.h>
+#include <rw_valcmp.h>
 
 
 #define REMOVE_FILE(tmpfname) \

Modified: stdcxx/branches/4.3.x/tests/iostream/27.forward.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/iostream/27.forward.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/iostream/27.forward.cpp (original)
+++ stdcxx/branches/4.3.x/tests/iostream/27.forward.cpp Fri Jun  6 19:24:19 2008
@@ -127,7 +127,7 @@
 
 /**************************************************************************/
 
-#include <driver.h>
+#include <rw_driver.h>
 
 /**************************************************************************/
 

Modified: stdcxx/branches/4.3.x/tests/iostream/27.ios.members.static.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/iostream/27.ios.members.static.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/iostream/27.ios.members.static.cpp (original)
+++ stdcxx/branches/4.3.x/tests/iostream/27.ios.members.static.cpp Fri Jun  6 19:24:19 2008
@@ -40,8 +40,8 @@
 #include <iostream>
 
 // rwtest headers
-#include <driver.h>
-#include <file.h>
+#include <rw_driver.h>
+#include <rw_file.h>
 
 #if !defined _WIN32 && !defined _WIN64
 

Modified: stdcxx/branches/4.3.x/tests/iostream/27.istream.fmat.arith.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/iostream/27.istream.fmat.arith.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/iostream/27.istream.fmat.arith.cpp (original)
+++ stdcxx/branches/4.3.x/tests/iostream/27.istream.fmat.arith.cpp Fri Jun  6 19:24:19 2008
@@ -33,7 +33,7 @@
 #include <rw_exception.h>
 #include <rw_printf.h>
 #include <rw_streambuf.h>
-#include <driver.h>
+#include <rw_driver.h>
 
 /***********************************************************************/
 

Modified: stdcxx/branches/4.3.x/tests/iostream/27.istream.get.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/iostream/27.istream.get.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/iostream/27.istream.get.cpp (original)
+++ stdcxx/branches/4.3.x/tests/iostream/27.istream.get.cpp Fri Jun  6 19:24:19 2008
@@ -26,11 +26,10 @@
 
 #include <fstream>
 #include <sstream>
-
 #include <cstdio>
 #include <cstring>
 
-#include <driver.h>
+#include <rw_driver.h>
 
 
 template <class CharT, class FileStream>

Modified: stdcxx/branches/4.3.x/tests/iostream/27.istream.manip.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/iostream/27.istream.manip.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/iostream/27.istream.manip.cpp (original)
+++ stdcxx/branches/4.3.x/tests/iostream/27.istream.manip.cpp Fri Jun  6 19:24:19 2008
@@ -29,7 +29,7 @@
 #include <cstddef>
 #include <istream>
 
-#include <driver.h>
+#include <rw_driver.h>
 
 /************************************************************************
 
@@ -205,14 +205,14 @@
         // have the stream buffer object's underflow() fail (by throwing
         // an exception if possible) after j characters have been extracted
         // (this object calls underflow() for every char)
-        sb.throw_after_ = err_after;
+        sb.throw_after_ = int (err_after);
         err_type        = "threw";
     }
     else {
         // have the stream buffer object's underflow() fail by returning
         // eof after j characters have been extracted (this object calls
         // underflow() for every char)
-        sb.fail_after_ = err_after;
+        sb.fail_after_ = int (err_after);
         err_type       = "returned EOF";
     }
 

Modified: stdcxx/branches/4.3.x/tests/iostream/27.istream.readsome.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/iostream/27.istream.readsome.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/iostream/27.istream.readsome.cpp (original)
+++ stdcxx/branches/4.3.x/tests/iostream/27.istream.readsome.cpp Fri Jun  6 19:24:19 2008
@@ -29,7 +29,7 @@
 #include <istream>
 #include <sstream>
 
-#include <driver.h>
+#include <rw_driver.h>
 #include <rw_char.h>     // for UserChar, UserTraits
 #include <rw_printf.h>   // for rw_printf()
 

Modified: stdcxx/branches/4.3.x/tests/iostream/27.istream.sentry.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/iostream/27.istream.sentry.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/iostream/27.istream.sentry.cpp (original)
+++ stdcxx/branches/4.3.x/tests/iostream/27.istream.sentry.cpp Fri Jun  6 19:24:19 2008
@@ -32,7 +32,7 @@
 
 #include <rw_char.h>     // for UserChar, UserTraits
 #include <rw_printf.h>   // for rw_printf()
-#include <driver.h>
+#include <rw_driver.h>
 
 /************************************************************************
 

Modified: stdcxx/branches/4.3.x/tests/iostream/27.istream.unformatted.get.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/iostream/27.istream.unformatted.get.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/iostream/27.istream.unformatted.get.cpp (original)
+++ stdcxx/branches/4.3.x/tests/iostream/27.istream.unformatted.get.cpp Fri Jun  6 19:24:19 2008
@@ -32,7 +32,7 @@
 #include <sstream>
 #include <cstddef>          // for size_t
 
-#include <driver.h>         // for rw_test(), ...
+#include <rw_driver.h>      // for rw_test(), ...
 #include <rw_char.h>        // for UserTraits
 #include <rw_streambuf.h>   // for MyStreambuf
 
@@ -98,7 +98,7 @@
         // verify that the original gcount of 0 was unaffected
         // (for non-array forms of unformatted input functions)
         // or that it increased exactly `fail_when_'
-        const int actual = strm.gcount () - gcount;
+        const std::streamsize actual = strm.gcount () - gcount;
 
         rw_assert (!actual || actual == sb.fail_when_ - 1, 0, lineno,
                    "line %d: basic_istream<%s>::%s changed "
@@ -121,7 +121,7 @@
 
         // verify that gcount has the expected value
 
-        const int actual = strm.gcount () - gcount;
+        const std::streamsize actual = strm.gcount () - gcount;
 
         rw_assert (nexpect == actual, 0, lineno,
                    "line %d: basic_istream<%s>::%s changed "
@@ -205,8 +205,8 @@
 
     TRY_GET (got = strm.get ());
 
-    check_failure (sb, cname, lineno, "get()", strm, gcount, !rdstate,
-                   rdstate, exceptions, caught);
+    check_failure (sb, cname, lineno, "get()", strm, int (gcount),
+                   !rdstate, rdstate, exceptions, caught);
 
     // verify that the extracted value is the one expected
 
@@ -316,7 +316,7 @@
     TRY_GET (strm.get (got));
 
     check_failure (sb, cname, lineno, "get(char_type&)", strm,
-                   gcount, !rdstate, rdstate, exceptions, caught);
+                   int (gcount), !rdstate, rdstate, exceptions, caught);
 
     // verify that the extracted value is the one expected
 
@@ -456,7 +456,7 @@
         TRY_GET (strm.get (got, std::streamsize (nread)));
     }
 
-    check_failure (sb, cname, lineno, fun, strm, gcount, nexpect,
+    check_failure (sb, cname, lineno, fun, strm, int (gcount), nexpect,
                    rdstate, exceptions, caught);
 
     // verify that number and values of the extracted characters
@@ -539,10 +539,10 @@
     TEST (T, "ghij",  4, 4, eof, 3, Good,       Bad,  Underflow | Throw, 4);
     TEST (T, "hijk",  4, 5, eof, 3, Bad,        Bad,  Underflow | Throw, 4);
 
-    const std::streamsize N = std::streamsize (MAXCHARS);
+    const int N = int (MAXCHARS);
     char *buf = new char [N];
 
-    for (std::streamsize i = 0; i != N; ++i) {
+    for (int i = 0; i != N; ++i) {
         buf [i] = char (i);
     }
 
@@ -557,7 +557,7 @@
     TEST (T, "12347", 5, 6, eof, 5, Good, Good, 0, -1);
     TEST (T, "12348", 5, 7, eof, 5, Eof,  Good, 0, -1);
     
-    for (std::streamsize i = 0; i < N; i += 256) {
+    for (int i = 0; i < N; i += 256) {
         TEST (T, buf, N, N, eof, '\n' + i, Good, Good, 0, -1);
 
         buf ['\n' + i] = '\0';
@@ -646,8 +646,8 @@
         TRY_GET (strm.get (outbuf));
     }
 
-    check_failure (inbuf, cname, lineno, fun, strm, gcount, nexpect,
-                   rdstate, exceptions, caught);
+    check_failure (inbuf, cname, lineno, fun, strm, int (gcount),
+                   nexpect, rdstate, exceptions, caught);
 
     // verify that number and values of the extracted characters
     // matches the expected number and values

Modified: stdcxx/branches/4.3.x/tests/iostream/27.objects.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/iostream/27.objects.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/iostream/27.objects.cpp (original)
+++ stdcxx/branches/4.3.x/tests/iostream/27.objects.cpp Fri Jun  6 19:24:19 2008
@@ -26,7 +26,7 @@
  * 
  **************************************************************************/
 
-#include <driver.h>
+#include <rw_driver.h>
 
 // If the following macro is defined, then new header provides 
 // an implementation for operator new [] & delete []; undef them here

Modified: stdcxx/branches/4.3.x/tests/iostream/27.ostream.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/iostream/27.ostream.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/iostream/27.ostream.cpp (original)
+++ stdcxx/branches/4.3.x/tests/iostream/27.ostream.cpp Fri Jun  6 19:24:19 2008
@@ -33,8 +33,8 @@
 #include <cstddef>     // for ptrdiff_t
 #include <cstring>     // for memset()
 
-#include <any.h>       // for rw_any_t()
-#include <driver.h>    // for rw_test()
+#include <rw_any.h>    // for rw_any_t()
+#include <rw_driver.h> // for rw_test()
 
 /***************************************************************************/
 

Modified: stdcxx/branches/4.3.x/tests/iostream/27.std.manip.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/iostream/27.std.manip.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/iostream/27.std.manip.cpp (original)
+++ stdcxx/branches/4.3.x/tests/iostream/27.std.manip.cpp Fri Jun  6 19:24:19 2008
@@ -53,7 +53,7 @@
 #include <ostream>
 #include <sstream>
 
-#include <driver.h>
+#include <rw_driver.h>
 
 /***********************************************************************/
 

Modified: stdcxx/branches/4.3.x/tests/iostream/27.stringbuf.virtuals.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/iostream/27.stringbuf.virtuals.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/iostream/27.stringbuf.virtuals.cpp (original)
+++ stdcxx/branches/4.3.x/tests/iostream/27.stringbuf.virtuals.cpp Fri Jun  6 19:24:19 2008
@@ -27,8 +27,8 @@
 #include <sstream>     // for stringbuf
 #include <cstring>     // for size_t, strchr()
 
-#include <cmdopt.h>    // for rw_enabled()
-#include <driver.h>    // for rw_assert(), ...
+#include <rw_cmdopt.h> // for rw_enabled()
+#include <rw_driver.h> // for rw_assert(), ...
 #include <rw_char.h>   // for rw_expand(), rw_match()
 
 /**************************************************************************/
@@ -98,7 +98,7 @@
         Base buf (std::ios::out);
         while (n--)
             buf.sputc ('c');
-        return ((PubBuf&)buf).Epptr () - ((PubBuf&)buf).Pbase ();
+        return int (((PubBuf&)buf).Epptr () - ((PubBuf&)buf).Pbase ());
     }
 };
 
@@ -236,14 +236,14 @@
         if (pfid->strarg_) {
             rw_expand (warg, pfid->strarg_, _RWSTD_SIZE_MAX, &warg_len);
             if (std::strchr (pfid->strarg_, '@'))
-                arg0 = warg_len;
+                arg0 = int (warg_len);
 
             RW_ASSERT (std::size_t (arg0) < sizeof wstr / sizeof *wstr);
-            ret = pbuf->sputn (warg, arg0);
+            ret = int (pbuf->sputn (warg, std::streamsize (arg0)));
         }
         else {
             // invoke sputn() with pbase as an argument
-            ret = pbuf->sputn (pbuf->Pbase (), arg0);
+            ret = int (pbuf->sputn (pbuf->Pbase (), std::streamsize (arg0)));
         }
 
         break;
@@ -463,7 +463,7 @@
 #define TEST(str, mode, gbump, sarg, result, pback, read, write)        \
     pfid->strarg_ = sarg;                                                \
     test_virtual (pfid, __LINE__, str, sizeof str - 1, mode,            \
-                  gbump, sizeof sarg - 1, IGN, IGN, result,             \
+                  gbump, int (sizeof sarg - 1), IGN, IGN, result,       \
                   pback, read, write)
 
     //    +-------------------------------------------- initial sequence

Modified: stdcxx/branches/4.3.x/tests/iterators/24.istream.iterator.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/iterators/24.istream.iterator.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/iterators/24.istream.iterator.cpp (original)
+++ stdcxx/branches/4.3.x/tests/iterators/24.istream.iterator.cpp Fri Jun  6 19:24:19 2008
@@ -31,7 +31,7 @@
 
 #include <rw_char.h>
 #include <rw_printf.h>
-#include <driver.h>
+#include <rw_driver.h>
 
 /***********************************************************************/
 

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.codecvt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.codecvt.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.codecvt.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.codecvt.cpp Fri Jun  6 19:24:19 2008
@@ -55,8 +55,8 @@
 #endif
 
 #define DEFINE_REPLACEMENT_NEW_AND_DELETE
-#include <driver.h>
-#include <file.h>
+#include <rw_driver.h>
+#include <rw_file.h>
 #include <rw_locale.h>
 
 #ifndef PATH_MAX

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.codecvt.length.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.codecvt.length.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.codecvt.length.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.codecvt.length.cpp Fri Jun  6 19:24:19 2008
@@ -39,10 +39,10 @@
 #include <cstring>   // for strcpy(), strlen()
 #include <cwchar>    // for mbstate_t
 
-#include <any.h>         // for rw_any
-#include <cmdopt.h>      // for rw_enabled()
-#include <driver.h>      // for rw_test()
-#include <file.h>        // for rw_fwrite()
+#include <rw_any.h>      // for rw_any
+#include <rw_cmdopt.h>   // for rw_enabled()
+#include <rw_driver.h>   // for rw_test()
+#include <rw_file.h>     // for rw_fwrite()
 #include <rw_locale.h>   // for rw_localedef(), rw_find_mb_locale()
 #include <rw_printf.h>   // for rw_printf()
 

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.codecvt.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.codecvt.mt.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.codecvt.mt.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.codecvt.mt.cpp Fri Jun  6 19:24:19 2008
@@ -35,8 +35,8 @@
 
 #include <rw_locale.h>
 #include <rw_thread.h>
-#include <driver.h>
-#include <valcmp.h>    // for rw_strncmp ()
+#include <rw_driver.h>
+#include <rw_valcmp.h>    // for rw_strncmp ()
 
 
 // maximum number of threads allowed by the command line interface
@@ -322,7 +322,7 @@
         if (rw_thread_pool_timeout_expired ())
             break;
 
-        const int inx = i % nlocales;
+        const std::size_t inx = i % nlocales;
         const MyCodecvtData& data = my_codecvt_data [inx];
 
         // construct a named locale, get a reference to the codecvt

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.codecvt.out.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.codecvt.out.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.codecvt.out.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.codecvt.out.cpp Fri Jun  6 19:24:19 2008
@@ -39,11 +39,11 @@
 #include <cstring>   // for strcpy(), strlen()
 #include <cwchar>    // for codecvt
 
-#include <driver.h>      // for rw_test(), ...
-#include <file.h>        // for rw_fwrite()
+#include <rw_driver.h>   // for rw_test(), ...
+#include <rw_file.h>     // for rw_fwrite()
 #include <rw_locale.h>   // for rw_locales(), rw_set_locale_root()
 #include <rw_printf.h>   // for rw_sprintf()
-#include <valcmp.h>      // for rw_strcmp()
+#include <rw_valcmp.h>   // for rw_strcmp()
 
 /****************************************************************************/
 

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.collate.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.collate.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.collate.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.collate.cpp Fri Jun  6 19:24:19 2008
@@ -37,9 +37,9 @@
 #include <cstring>    // for strcmp(), strcoll(), ...
 #include <cwchar>     // for wcscoll()
 
-#include <driver.h>
-#include <environ.h>
-#include <file.h>
+#include <rw_driver.h>
+#include <rw_environ.h>
+#include <rw_file.h>
 #include <rw_locale.h>
 #include <rw_process.h>
 

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.cons.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.cons.mt.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.cons.mt.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.cons.mt.cpp Fri Jun  6 19:24:19 2008
@@ -32,7 +32,7 @@
 
 #include <rw_locale.h>
 #include <rw_thread.h>   // for rw_get_processors (), rw_thread_pool()
-#include <driver.h>
+#include <rw_driver.h>
 
 
 // maximum number of threads allowed by the command line interface

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.cpp Fri Jun  6 19:24:19 2008
@@ -65,8 +65,8 @@
 #  include <langinfo.h>
 #endif  // _MSC_VER
 
-#include <driver.h>
-#include <file.h>        // for SLASH
+#include <rw_driver.h>
+#include <rw_file.h>     // for SLASH
 #include <rw_locale.h>   // for rw_locale_query()
 
 /**************************************************************************/

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.is.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.is.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.is.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.is.cpp Fri Jun  6 19:24:19 2008
@@ -65,8 +65,8 @@
 #  include <langinfo.h>
 #endif  // _MSC_VER
 
-#include <driver.h>
-#include <file.h>        // for SLASH
+#include <rw_driver.h>
+#include <rw_file.h>        // for SLASH
 #include <rw_locale.h>   // for rw_locale_query()
 
 /**************************************************************************/

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.mt.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.mt.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.mt.cpp Fri Jun  6 19:24:19 2008
@@ -34,8 +34,8 @@
 
 #include <rw_locale.h>
 #include <rw_thread.h>
-#include <driver.h>
-#include <valcmp.h>
+#include <rw_driver.h>
+#include <rw_valcmp.h>
 
 
 // maximum number of threads allowed by the command line interface

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.narrow.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.narrow.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.narrow.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.narrow.cpp Fri Jun  6 19:24:19 2008
@@ -66,8 +66,8 @@
 #  include <langinfo.h>
 #endif  // _MSC_VER
 
-#include <driver.h>
-#include <file.h>        // for SLASH
+#include <rw_driver.h>
+#include <rw_file.h>        // for SLASH
 #include <rw_locale.h>   // for rw_locale_query()
 
 /**************************************************************************/

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.scan.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.scan.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.scan.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.scan.cpp Fri Jun  6 19:24:19 2008
@@ -65,8 +65,8 @@
 #  include <langinfo.h>
 #endif  // _MSC_VER
 
-#include <driver.h>
-#include <file.h>        // for SLASH
+#include <rw_driver.h>
+#include <rw_file.h>     // for SLASH
 #include <rw_locale.h>   // for rw_locale_query()
 
 /**************************************************************************/

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.tolower.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.tolower.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.tolower.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.tolower.cpp Fri Jun  6 19:24:19 2008
@@ -65,8 +65,8 @@
 #  include <langinfo.h>
 #endif  // _MSC_VER
 
-#include <driver.h>
-#include <file.h>        // for SLASH
+#include <rw_driver.h>
+#include <rw_file.h>     // for SLASH
 #include <rw_locale.h>   // for rw_locale_query()
 
 /**************************************************************************/

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.toupper.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.toupper.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.toupper.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.ctype.toupper.cpp Fri Jun  6 19:24:19 2008
@@ -65,8 +65,8 @@
 #  include <langinfo.h>
 #endif  // _MSC_VER
 
-#include <driver.h>
-#include <file.h>        // for SLASH
+#include <rw_driver.h>
+#include <rw_file.h>     // for SLASH
 #include <rw_locale.h>   // for rw_locale_query()
 
 /**************************************************************************/

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.globals.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.globals.mt.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.globals.mt.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.globals.mt.cpp Fri Jun  6 19:24:19 2008
@@ -33,7 +33,7 @@
 
 #include <rw_locale.h>   // for rw_locales()
 #include <rw_thread.h>   // for rw_get_processors(), rw_thread_pool()
-#include <driver.h>      // for rw_test()
+#include <rw_driver.h>   // for rw_test()
 
 
 // maximum number of threads allowed by the command line interface

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.messages.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.messages.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.messages.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.messages.cpp Fri Jun  6 19:24:19 2008
@@ -28,9 +28,9 @@
 
 #include <locale>
 
-#include <driver.h>      // for rw_test()
-#include <environ.h>     // for rw_putenv()
-#include <file.h>        // for rw_nextfd()
+#include <rw_driver.h>   // for rw_test()
+#include <rw_environ.h>  // for rw_putenv()
+#include <rw_file.h>     // for rw_nextfd()
 #include <rw_locale.h>   // for rw_locales(), rw_create_catalog()
 #include <rw_process.h>  // for rw_system()
 

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.messages.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.messages.mt.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.messages.mt.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.messages.mt.cpp Fri Jun  6 19:24:19 2008
@@ -28,12 +28,12 @@
 
 #include <locale>
 
-#include <driver.h>      // for rw_test()
+#include <rw_driver.h>   // for rw_test()
 #include <rw_locale.h>   // for rw_create_catalog()
 #include <rw_thread.h>   // for rw_thread_pool()
 #include <rw_process.h>  // for rw_system()
-#include <file.h>        // for SHELL_RM_F
-#include <valcmp.h>      // for rw_strncmp ()
+#include <rw_file.h>     // for SHELL_RM_F
+#include <rw_valcmp.h>   // for rw_strncmp ()
 
 #include <cstring>   // for strlen()
 #include <cstdio>    // for remove()

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.money.get.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.money.get.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.money.get.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.money.get.cpp Fri Jun  6 19:24:19 2008
@@ -31,10 +31,10 @@
 
 #include <cstdio>     // for sscanf()
 
-#include <cmdopt.h>   // for rw_enabled()
-#include <driver.h>   // for rw_assert(), rw_test(), ...
-#include <rw_char.h>  // for rw_expand()
-#include <valcmp.h>   // for rw_ldblcmp()
+#include <rw_cmdopt.h>   // for rw_enabled()
+#include <rw_driver.h>   // for rw_assert(), rw_test(), ...
+#include <rw_char.h>     // for rw_expand()
+#include <rw_valcmp.h>   // for rw_ldblcmp()
 
 
 #ifndef _RWSTD_NO_LONG_DOUBLE

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.money.get.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.money.get.mt.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.money.get.mt.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.money.get.mt.cpp Fri Jun  6 19:24:19 2008
@@ -34,8 +34,8 @@
 
 #include <rw_locale.h>
 #include <rw_thread.h>
-#include <driver.h>
-#include <valcmp.h>    // for rw_strncmp ()
+#include <rw_driver.h>
+#include <rw_valcmp.h>    // for rw_strncmp ()
 
 
 // maximum number of threads allowed by the command line interface

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.money.put.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.money.put.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.money.put.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.money.put.cpp Fri Jun  6 19:24:19 2008
@@ -30,9 +30,9 @@
 #include <locale>
 #include <cstdio>      // for sprintf()
 
-#include <cmdopt.h>    // for rw_enabled()
-#include <driver.h>    // for rw_assert(), rw_test(), ...
-#include <valcmp.h>    // for rw_strncmp()
+#include <rw_cmdopt.h>    // for rw_enabled()
+#include <rw_driver.h>    // for rw_assert(), rw_test(), ...
+#include <rw_valcmp.h>    // for rw_strncmp()
 
 /**************************************************************************/
 

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.money.put.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.money.put.mt.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.money.put.mt.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.money.put.mt.cpp Fri Jun  6 19:24:19 2008
@@ -34,8 +34,8 @@
 
 #include <rw_locale.h>
 #include <rw_thread.h>
-#include <driver.h>
-#include <valcmp.h>    // for rw_strncmp ()
+#include <rw_driver.h>
+#include <rw_valcmp.h>    // for rw_strncmp ()
 
 
 // maximum number of threads allowed by the command line interface
@@ -125,7 +125,7 @@
     PutId type_;
 
     // index into string array [n,w]_money_vals
-    unsigned money_index_;
+    std::size_t money_index_;
 
     // narrow representations of money_
     char ncs_ [BufferSize];

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.moneypunct.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.moneypunct.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.moneypunct.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.moneypunct.cpp Fri Jun  6 19:24:19 2008
@@ -34,8 +34,8 @@
 #include <cstdlib>       // for getenv()
 #include <cstring>       // for memcmp(), strerror()
 
-#include <driver.h>      // for rw_test()
-#include <environ.h>     // for rw_putenv()
+#include <rw_driver.h>   // for rw_test()
+#include <rw_environ.h>  // for rw_putenv()
 #include <rw_locale.h>   // for rw_locales()
 #include <rw_printf.h>   // for rw_fprintf()
 

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.moneypunct.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.moneypunct.mt.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.moneypunct.mt.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.moneypunct.mt.cpp Fri Jun  6 19:24:19 2008
@@ -34,8 +34,8 @@
 
 #include <rw_locale.h>
 #include <rw_thread.h>
-#include <driver.h>
-#include <valcmp.h>
+#include <rw_driver.h>
+#include <rw_valcmp.h>
 
 
 // maximum number of threads allowed by the command line interface

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.num.get.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.num.get.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.num.get.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.num.get.cpp Fri Jun  6 19:24:19 2008
@@ -68,13 +68,13 @@
 #include <limits>
 #include <locale>
 
-#include <alg_test.h>    // for InputIter
-#include <any.h>         // for rw_any_t
-#include <cmdopt.h>      // for rw_enabled()
-#include <driver.h>      // for rw_test(), ...
-#include <rw_char.h>     // for rw_widen()
-#include <rw_locale.h>   // for rw_locales()
-#include <valcmp.h>      // for rw_equal()
+#include <rw_alg_test.h>    // for InputIter
+#include <rw_any.h>         // for rw_any_t
+#include <rw_cmdopt.h>      // for rw_enabled()
+#include <rw_driver.h>      // for rw_test(), ...
+#include <rw_char.h>        // for rw_widen()
+#include <rw_locale.h>      // for rw_locales()
+#include <rw_valcmp.h>      // for rw_equal()
 
 /**************************************************************************/
 

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.num.get.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.num.get.mt.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.num.get.mt.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.num.get.mt.cpp Fri Jun  6 19:24:19 2008
@@ -34,8 +34,8 @@
 
 #include <rw_locale.h>
 #include <rw_thread.h>   // for rw_get_processors (), rw_thread_pool()
-#include <driver.h>
-#include <valcmp.h>
+#include <rw_driver.h>
+#include <rw_valcmp.h>
 
 #define MAX_THREADS      32
 #define MAX_LOOPS    100000

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.num.put.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.num.put.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.num.put.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.num.put.cpp Fri Jun  6 19:24:19 2008
@@ -47,11 +47,11 @@
 #include <cstdio>    // for sprintf()
 #include <cstring>   // for strcmp(), strlen()
 
-#include <any.h>         // for TOSTR()
-#include <cmdopt.h>      // for rw_enabled
-#include <driver.h>      // for rw_test
-#include <rw_locale.h>   // for rw_locales
-#include <valcmp.h>      // for rw_equal
+#include <rw_any.h>         // for TOSTR()
+#include <rw_cmdopt.h>      // for rw_enabled
+#include <rw_driver.h>      // for rw_test
+#include <rw_locale.h>      // for rw_locales
+#include <rw_valcmp.h>      // for rw_equal
 
 /**************************************************************************/
 

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.num.put.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.num.put.mt.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.num.put.mt.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.num.put.mt.cpp Fri Jun  6 19:24:19 2008
@@ -34,8 +34,8 @@
 
 #include <rw_locale.h>
 #include <rw_thread.h>   // for rw_get_processors (), rw_thread_pool()
-#include <driver.h>
-#include <valcmp.h>
+#include <rw_driver.h>
+#include <rw_valcmp.h>
 
 #define MAX_THREADS      32
 #define MAX_LOOPS    100000

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.numpunct.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.numpunct.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.numpunct.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.numpunct.cpp Fri Jun  6 19:24:19 2008
@@ -42,8 +42,8 @@
 #include <cstring>   // for strcmp()
 #include <locale>
 
-#include <driver.h>
-#include <environ.h>
+#include <rw_driver.h>
+#include <rw_environ.h>
 #include <rw_locale.h>
 
 /**************************************************************************/

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.numpunct.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.numpunct.mt.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.numpunct.mt.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.numpunct.mt.cpp Fri Jun  6 19:24:19 2008
@@ -34,8 +34,8 @@
 
 #include <rw_locale.h>
 #include <rw_thread.h>
-#include <driver.h>
-#include <valcmp.h>
+#include <rw_driver.h>
+#include <rw_valcmp.h>
 
 
 // maximum number of threads allowed by the command line interface

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.statics.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.statics.mt.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.statics.mt.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.statics.mt.cpp Fri Jun  6 19:24:19 2008
@@ -33,7 +33,7 @@
 
 #include <rw_locale.h>   // for rw_locales()
 #include <rw_thread.h>   // for rw_get_processors(), rw_thread_pool()
-#include <driver.h>      // for rw_test()
+#include <rw_driver.h>   // for rw_test()
 
 
 // maximum number of threads allowed by the command line interface

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.time.get.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.time.get.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.time.get.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.time.get.cpp Fri Jun  6 19:24:19 2008
@@ -36,8 +36,8 @@
 #include <cstring>   // for memcmp(), strlen()
 #include <ctime>     // for struct tm
 
-#include <driver.h>      // for rw_test()
-#include <file.h>        // for rw_nextfd()
+#include <rw_driver.h>   // for rw_test()
+#include <rw_file.h>     // for rw_nextfd()
 #include <rw_locale.h>   // for rw_locale_query()
 #include <rw_printf.h>   // for rw_snprintf()
 
@@ -930,7 +930,7 @@
         // Tru64 UNIX)
         char buf [32];
         const std::tm tmb = mktm (0, 0, 1);
-        len = std::strftime (buf, sizeof buf, "%X", &tmb);
+        len = int (std::strftime (buf, sizeof buf, "%X", &tmb));
     }
 
     const int hour = 11 == len ? 12 : 0;

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.time.get.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.time.get.mt.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.time.get.mt.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.time.get.mt.cpp Fri Jun  6 19:24:19 2008
@@ -35,8 +35,8 @@
 
 #include <rw_locale.h>
 #include <rw_thread.h>
-#include <driver.h>    // for rw_assert ()
-#include <valcmp.h>    // for rw_strncmp ()
+#include <rw_driver.h>    // for rw_assert ()
+#include <rw_valcmp.h>    // for rw_strncmp ()
 
 #define MAX_THREADS      32
 #define MAX_LOOPS    100000

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.time.put.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.time.put.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.time.put.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.time.put.cpp Fri Jun  6 19:24:19 2008
@@ -37,12 +37,12 @@
 #include <cwchar>        // for wcsftime(), wcslen()
 #include <cassert>       // for assert()
 
-#include <driver.h>      // for rw_test(), ...
-#include <environ.h>     // for rw_putenv()
-#include <file.h>        // for pcs_write(), ...
+#include <rw_driver.h>   // for rw_test(), ...
+#include <rw_environ.h>  // for rw_putenv()
+#include <rw_file.h>     // for pcs_write(), ...
 #include <rw_locale.h>   // for rw_localedef(), ...
 #include <rw_printf.h>   // for rw_snprintf()
-#include <valcmp.h>      // for rw_strncmp()
+#include <rw_valcmp.h>   // for rw_strncmp()
 
 
 #if _RWSTD_PATH_SEP == '/'

Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.time.put.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.time.put.mt.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.time.put.mt.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.time.put.mt.cpp Fri Jun  6 19:24:19 2008
@@ -37,8 +37,8 @@
 
 #include <rw_locale.h>
 #include <rw_thread.h>
-#include <driver.h>    // for rw_assert ()
-#include <valcmp.h>    // for rw_strncmp ()
+#include <rw_driver.h>    // for rw_assert ()
+#include <rw_valcmp.h>    // for rw_strncmp ()
 
 #define MAX_THREADS      32
 #define MAX_LOOPS    100000

Modified: stdcxx/branches/4.3.x/tests/numerics/26.accumulate.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/numerics/26.accumulate.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/numerics/26.accumulate.cpp (original)
+++ stdcxx/branches/4.3.x/tests/numerics/26.accumulate.cpp Fri Jun  6 19:24:19 2008
@@ -29,9 +29,9 @@
 #include <numeric>      // for accumulate 
 #include <cstddef>      // for size_t
 
-#include <alg_test.h>
+#include <rw_alg_test.h>
 #include <rw_value.h>   // for UserClass
-#include <driver.h>     // for rw_test()
+#include <rw_driver.h>  // for rw_test()
 
 /**************************************************************************/
 

Modified: stdcxx/branches/4.3.x/tests/numerics/26.adjacent.diff.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/numerics/26.adjacent.diff.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/numerics/26.adjacent.diff.cpp (original)
+++ stdcxx/branches/4.3.x/tests/numerics/26.adjacent.diff.cpp Fri Jun  6 19:24:19 2008
@@ -29,9 +29,9 @@
 #include <numeric>      // for adjacent_difference 
 #include <cstddef>      // for size_t
 
-#include <alg_test.h>
+#include <rw_alg_test.h>
 #include <rw_value.h>   // for UserClass
-#include <driver.h>     // for rw_test()
+#include <rw_driver.h>  // for rw_test()
 
 /**************************************************************************/
 

Modified: stdcxx/branches/4.3.x/tests/numerics/26.c.math.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/numerics/26.c.math.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/numerics/26.c.math.cpp (original)
+++ stdcxx/branches/4.3.x/tests/numerics/26.c.math.cpp Fri Jun  6 19:24:19 2008
@@ -39,9 +39,9 @@
 #include <cstdlib>
 #include <cmath>
 
-#include <any.h>
-#include <driver.h>
-#include <valcmp.h>
+#include <rw_any.h>
+#include <rw_driver.h>
+#include <rw_valcmp.h>
 
 
 // define function templates with the same signatures as

Modified: stdcxx/branches/4.3.x/tests/numerics/26.class.gslice.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/numerics/26.class.gslice.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/numerics/26.class.gslice.cpp (original)
+++ stdcxx/branches/4.3.x/tests/numerics/26.class.gslice.cpp Fri Jun  6 19:24:19 2008
@@ -27,7 +27,7 @@
 #include <cstdlib>    // for strtoul(), size_t
 #include <valarray>   // for gslice, valarray
 
-#include <driver.h>
+#include <rw_driver.h>
 
 /**************************************************************************/
 
@@ -35,25 +35,28 @@
 static std::valarray<std::size_t>
 make_array (const char *s)
 {
-    if (0 == s)
-        return std::valarray<std::size_t>();
-
     std::size_t buf [256];
 
-    for (std::size_t i = 0; ; ++i) {
+    std::size_t i = 0;
+    while (s && *s) {
 
         char *end;
         unsigned long val = std::strtoul (s, &end, 10);
 
         RW_ASSERT ('\0' == *end || ',' == *end);
 
-        buf [i] = std::size_t (val);
+        if (s == end)
+            break;
+
+        buf [i++] = std::size_t (val);
 
         if ('\0' == *end)
-            return std::valarray<std::size_t>(buf, i + 1);
+            break;
 
         s = end + 1;
     }
+
+    return std::valarray<std::size_t>(buf, i);
 }
 
 /**************************************************************************/
@@ -67,7 +70,8 @@
     std::size_t asize = sizes.size () ? 1 : 0;
 
     for (std::size_t i = 0; i != sizes.size (); ++i) {
-        asize *= sizes [i];
+        if (sizes [i])
+            asize *= sizes [i];
     }
 
     return asize;
@@ -92,8 +96,11 @@
         return start;
     }
 
-    while (inx && factors [inx - 1] == asizes [inx - 1] - 1)
-        --inx;
+    for (/**/; inx; --inx) {
+        if (   asizes [inx - 1]
+            && factors [inx - 1] != asizes [inx - 1] - 1)
+            break;
+    }
 
     if (0 == inx) {
         factors = 0;
@@ -156,12 +163,12 @@
         if (maxinx < indices [i])
             maxinx = indices [i];
 
-    std::valarray<std::size_t> va (maxinx + 1);
+    std::valarray<std::size_t> va (indices.size () ? maxinx + 1 : 0);
     for (std::size_t i = 0; i != va.size (); ++i)
         va [i] = i;
 
     for (int i = 0; i != 3; ++i) {
-        // repeat each test three to verify that operator[](gslice)
+        // repeat each test thrice to verify that operator[](gslice)
         // doesn't change the observable state of its argument and
         // that the same result is obtained for a copy of gslice
 
@@ -171,7 +178,7 @@
         bool equal = array_slice.size () == indices.size ();
 
         rw_assert (equal, 0, __LINE__,
-                   "size() == %zu, got %zu\n",
+                   "size() == %zu, got %zu",
                    indices.size (), array_slice.size ());
 
         if (equal) {
@@ -180,7 +187,7 @@
                 equal = array_slice [j] == va [indices [j]];
 
                 rw_assert (equal, 0, __LINE__,
-                           "mismatch at %u, index %u: expected %u, got %u\n",
+                           "mismatch at %u, index %u: expected %u, got %u",
                            j, indices [j], va [indices [j]],
                            array_slice [j]);
             }
@@ -223,7 +230,7 @@
     test_gslice ("2,4,3", "19,4,1");
 
     // includes example of a degenerate gslice from p5
-    test_gslice ("2,4,3", "19,4,1");
+    test_gslice ("2,4,3", "1,1,1");
 
     return 0;
 }

Copied: stdcxx/branches/4.3.x/tests/numerics/26.gslice.array.cassign.cpp (from r663757, stdcxx/branches/4.2.x/tests/numerics/26.gslice.array.cassign.cpp)
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/numerics/26.gslice.array.cassign.cpp?p2=stdcxx/branches/4.3.x/tests/numerics/26.gslice.array.cassign.cpp&p1=stdcxx/branches/4.2.x/tests/numerics/26.gslice.array.cassign.cpp&r1=663757&r2=664244&rev=664244&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/numerics/26.gslice.array.cassign.cpp (original)
+++ stdcxx/branches/4.3.x/tests/numerics/26.gslice.array.cassign.cpp Fri Jun  6 19:24:19 2008
@@ -30,7 +30,7 @@
 #include <valarray>      // for indirect_array, valarray
 
 //#include <rw_value.h>    // for UserClass
-#include <driver.h>      // for rw_test()
+#include <rw_driver.h>   // for rw_test()
 #include <rw_printf.h>   // for rw_asnprintf()
 
 /**************************************************************************/
@@ -117,7 +117,7 @@
     RW_ASSERT (lhs_va.size () == res_va.size ());
 
     // take a gslice of lhs_va, this is the lhs of the assignment
-    std::gslice_array<std::size_t>& lhs_ga = lhs_va [gsl];
+    std::gslice_array<std::size_t> lhs_ga = lhs_va [gsl];
 
     char*       fname = 0;
     std::size_t size  = 0;

Modified: stdcxx/branches/4.3.x/tests/numerics/26.indirect.array.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/numerics/26.indirect.array.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/numerics/26.indirect.array.cpp (original)
+++ stdcxx/branches/4.3.x/tests/numerics/26.indirect.array.cpp Fri Jun  6 19:24:19 2008
@@ -28,7 +28,7 @@
 #include <cstdlib>    // for strtol(), size_t
 #include <valarray>   // for indirect_array, valarray
 
-#include <driver.h>
+#include <rw_driver.h>
 
 /**************************************************************************/
 

Modified: stdcxx/branches/4.3.x/tests/numerics/26.inner.product.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/numerics/26.inner.product.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/numerics/26.inner.product.cpp (original)
+++ stdcxx/branches/4.3.x/tests/numerics/26.inner.product.cpp Fri Jun  6 19:24:19 2008
@@ -29,9 +29,9 @@
 #include <numeric>      // for inner_product 
 #include <cstddef>      // for size_t
 
-#include <alg_test.h>
+#include <rw_alg_test.h>
 #include <rw_value.h>   // for UserClass
-#include <driver.h>     // for rw_test()
+#include <rw_driver.h>  // for rw_test()
 
 /**************************************************************************/
 

Modified: stdcxx/branches/4.3.x/tests/numerics/26.mask.array.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/numerics/26.mask.array.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/numerics/26.mask.array.cpp (original)
+++ stdcxx/branches/4.3.x/tests/numerics/26.mask.array.cpp Fri Jun  6 19:24:19 2008
@@ -28,7 +28,7 @@
 #include <cstdlib>    // for strtol(), size_t
 #include <valarray>   // for mask_array, valarray
 
-#include <driver.h>
+#include <rw_driver.h>
 
 /**************************************************************************/
 

Modified: stdcxx/branches/4.3.x/tests/numerics/26.partial.sum.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/numerics/26.partial.sum.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/numerics/26.partial.sum.cpp (original)
+++ stdcxx/branches/4.3.x/tests/numerics/26.partial.sum.cpp Fri Jun  6 19:24:19 2008
@@ -29,9 +29,9 @@
 #include <numeric>      // for partial_sum 
 #include <cstddef>      // for size_t
 
-#include <alg_test.h>
+#include <rw_alg_test.h>
 #include <rw_value.h>   // for UserClass
-#include <driver.h>     // for rw_test()
+#include <rw_driver.h>  // for rw_test()
 
 /**************************************************************************/
 

Modified: stdcxx/branches/4.3.x/tests/numerics/26.valarray.cassign.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/numerics/26.valarray.cassign.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/numerics/26.valarray.cassign.cpp (original)
+++ stdcxx/branches/4.3.x/tests/numerics/26.valarray.cassign.cpp Fri Jun  6 19:24:19 2008
@@ -30,7 +30,7 @@
 #include <valarray>      // for indirect_array, valarray
 
 #include <rw_value.h>    // for UserClass
-#include <driver.h>      // for rw_test()
+#include <rw_driver.h>   // for rw_test()
 #include <rw_printf.h>   // for rw_asnprintf()
 
 /**************************************************************************/

Modified: stdcxx/branches/4.3.x/tests/numerics/26.valarray.cons.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/numerics/26.valarray.cons.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/numerics/26.valarray.cons.cpp (original)
+++ stdcxx/branches/4.3.x/tests/numerics/26.valarray.cons.cpp Fri Jun  6 19:24:19 2008
@@ -28,7 +28,7 @@
 #include <valarray>      // for indirect_array, valarray
 
 #include <rw_value.h>    // for UserClass
-#include <driver.h>      // for rw_test()
+#include <rw_driver.h>   // for rw_test()
 #include <rw_printf.h>   // for rw_asnprintf()
 
 /**************************************************************************/

Modified: stdcxx/branches/4.3.x/tests/numerics/26.valarray.transcend.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/numerics/26.valarray.transcend.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/numerics/26.valarray.transcend.cpp (original)
+++ stdcxx/branches/4.3.x/tests/numerics/26.valarray.transcend.cpp Fri Jun  6 19:24:19 2008
@@ -36,8 +36,8 @@
 #include <cstddef> // for std::size_t
 #include <valarray>
 
-#include <driver.h>
-#include <valcmp.h>
+#include <rw_driver.h>
+#include <rw_valcmp.h>
 
 /**************************************************************************/
 

Modified: stdcxx/branches/4.3.x/tests/regress/21.c.strings.stdcxx-843.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/regress/21.c.strings.stdcxx-843.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/regress/21.c.strings.stdcxx-843.cpp (original)
+++ stdcxx/branches/4.3.x/tests/regress/21.c.strings.stdcxx-843.cpp Fri Jun  6 19:24:19 2008
@@ -29,6 +29,13 @@
 #include <cassert>
 #include <cwchar>
 
+#ifndef _RWSTD_MBSTATE_T_SIZE
+   // explicitly include our own <rw/_defs.h> in case neither
+   // of the two above is ours (i.e., we're using the compiler's
+   // C++ C headers)
+#  include <rw/_defs.h>
+#endif   // _RWSTD_MBSTATE_T_SIZE
+
 
 // known mbstate_t sizes on major platforms
 #ifdef _RWSTD_OS_AIX

Modified: stdcxx/branches/4.3.x/tests/regress/21.string.io.stdcxx-206.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/regress/21.string.io.stdcxx-206.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/regress/21.string.io.stdcxx-206.cpp (original)
+++ stdcxx/branches/4.3.x/tests/regress/21.string.io.stdcxx-206.cpp Fri Jun  6 19:24:19 2008
@@ -32,8 +32,9 @@
 
 void test (const std::string& str, const std::streamsize width)
 {
-    char buf[10];
-    std::ostrstream os (buf, sizeof(buf));
+    enum { bufsize = 10 };
+    char buf[bufsize];
+    std::ostrstream os (buf, bufsize);
 
     os.width (width);
     os.exceptions (std::ios_base::failbit | std::ios_base::badbit);

Modified: stdcxx/branches/4.3.x/tests/regress/22.locale.cons.stdcxx-485.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/regress/22.locale.cons.stdcxx-485.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/regress/22.locale.cons.stdcxx-485.cpp (original)
+++ stdcxx/branches/4.3.x/tests/regress/22.locale.cons.stdcxx-485.cpp Fri Jun  6 19:24:19 2008
@@ -31,7 +31,7 @@
 #include <locale>
 
 #include <rw_locale.h>
-#include <driver.h>
+#include <rw_driver.h>
 
 
 static int

Modified: stdcxx/branches/4.3.x/tests/regress/22.locale.messages.stdcxx-542.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/regress/22.locale.messages.stdcxx-542.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/regress/22.locale.messages.stdcxx-542.cpp (original)
+++ stdcxx/branches/4.3.x/tests/regress/22.locale.messages.stdcxx-542.cpp Fri Jun  6 19:24:19 2008
@@ -31,7 +31,7 @@
 #include <locale>
 
 #include <rw_locale.h>
-#include <driver.h>
+#include <rw_driver.h>
 
 #ifdef _MSC_VER
 #include <crtdbg.h>

Copied: stdcxx/branches/4.3.x/tests/regress/26.valarray.sub.stdcxx-955.cpp (from r663757, stdcxx/branches/4.2.x/tests/regress/26.valarray.sub.stdcxx-955.cpp)
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/regress/26.valarray.sub.stdcxx-955.cpp?p2=stdcxx/branches/4.3.x/tests/regress/26.valarray.sub.stdcxx-955.cpp&p1=stdcxx/branches/4.2.x/tests/regress/26.valarray.sub.stdcxx-955.cpp&r1=663757&r2=664244&rev=664244&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/regress/26.valarray.sub.stdcxx-955.cpp (original)
+++ stdcxx/branches/4.3.x/tests/regress/26.valarray.sub.stdcxx-955.cpp Fri Jun  6 19:24:19 2008
@@ -24,7 +24,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2008 Rogue Wave Software, Inc.
+ * Copyright 2008 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -32,8 +32,30 @@
 #include <valarray>
 #include <cassert>
 
+void test_0 ()
+{
+    const std::size_t p_leng [] = { 0 };
+    const std::size_t p_strd [] = { 3 };
 
-int main ()
+    const std::valarray<std::size_t>
+        va_leng (p_leng, sizeof (p_leng) / sizeof (*p_leng));
+
+    const std::valarray<std::size_t>
+        va_strd (p_strd, sizeof (p_strd) / sizeof (*p_strd));
+
+    const std::gslice gs_slice (1, va_leng, va_strd);
+
+    std::valarray<char> va_lhs ('!', 4);
+
+    va_lhs [gs_slice] = '?';
+
+    assert (va_lhs [0] == '!');
+    assert (va_lhs [1] == '!');
+    assert (va_lhs [2] == '!');
+    assert (va_lhs [3] == '!');
+}
+
+void test_1 ()
 {
     const std::size_t p_leng [] = { 2, 0 };
     const std::size_t p_strd [] = { 1, 3 };
@@ -54,6 +76,12 @@
     assert (va_lhs [1] == '?');
     assert (va_lhs [2] == '?');
     assert (va_lhs [3] == '!');
+}
+
+int main ()
+{
+    test_0 ();
+    test_1 ();
 
     return 0;
 }

Modified: stdcxx/branches/4.3.x/tests/regress/27.filebuf.sgetn.stdcxx-161.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/regress/27.filebuf.sgetn.stdcxx-161.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/regress/27.filebuf.sgetn.stdcxx-161.cpp (original)
+++ stdcxx/branches/4.3.x/tests/regress/27.filebuf.sgetn.stdcxx-161.cpp Fri Jun  6 19:24:19 2008
@@ -30,7 +30,7 @@
 #include <cassert>
 #include <cstdio>
 
-#include <file.h>
+#include <rw_file.h>
 
 int main ()
 {

Modified: stdcxx/branches/4.3.x/tests/regress/27.stringbuf.overflow.stdcxx-149.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/regress/27.stringbuf.overflow.stdcxx-149.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/regress/27.stringbuf.overflow.stdcxx-149.cpp (original)
+++ stdcxx/branches/4.3.x/tests/regress/27.stringbuf.overflow.stdcxx-149.cpp Fri Jun  6 19:24:19 2008
@@ -45,7 +45,7 @@
 
     buf.overflow ('x');
 
-    const int write_positions = buf.epptr () - buf.pbase ();
+    const int write_positions = int (buf.epptr () - buf.pbase ());
 
     const int pass = 1 < write_positions;
 

Modified: stdcxx/branches/4.3.x/tests/self/0.alloc.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/self/0.alloc.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/self/0.alloc.cpp (original)
+++ stdcxx/branches/4.3.x/tests/self/0.alloc.cpp Fri Jun  6 19:24:19 2008
@@ -30,7 +30,7 @@
 
 #include <rw_alloc.h>    // for rw_alloc, rw_free
 #include <rw_printf.h>   // for rw_printf
-#include <driver.h>
+#include <rw_driver.h>
 
 static jmp_buf mark;
 

Modified: stdcxx/branches/4.3.x/tests/self/0.braceexp.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/self/0.braceexp.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/self/0.braceexp.cpp (original)
+++ stdcxx/branches/4.3.x/tests/self/0.braceexp.cpp Fri Jun  6 19:24:19 2008
@@ -26,7 +26,7 @@
  **************************************************************************/
 
 #include <rw_braceexp.h>
-#include <environ.h>      // for rw_putenv()
+#include <rw_environ.h>   // for rw_putenv()
 
 #include <stdio.h>        // for fprintf(), size_t, stderr
 #include <stdlib.h>       // for free()

Modified: stdcxx/branches/4.3.x/tests/self/0.char.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/self/0.char.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/self/0.char.cpp (original)
+++ stdcxx/branches/4.3.x/tests/self/0.char.cpp Fri Jun  6 19:24:19 2008
@@ -27,7 +27,7 @@
 
 #include <rw_char.h>
 #include <rw_printf.h>
-#include <driver.h>
+#include <rw_driver.h>
 
 #include <stdlib.h>    // for free()
 #include <string.h>    // for memset(), size_t, strlen()

Modified: stdcxx/branches/4.3.x/tests/self/0.cmdopts.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/self/0.cmdopts.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/self/0.cmdopts.cpp (original)
+++ stdcxx/branches/4.3.x/tests/self/0.cmdopts.cpp Fri Jun  6 19:24:19 2008
@@ -27,7 +27,7 @@
  * 
  **************************************************************************/
 
-#include <cmdopt.h>
+#include <rw_cmdopt.h>
 
 #include <stdio.h>
 #include <string.h>

Modified: stdcxx/branches/4.3.x/tests/self/0.ctype.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/self/0.ctype.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/self/0.ctype.cpp (original)
+++ stdcxx/branches/4.3.x/tests/self/0.ctype.cpp Fri Jun  6 19:24:19 2008
@@ -29,7 +29,7 @@
 #include <rw_char.h>     // for UserChar
 #include <rw_ctype.h>    // for UserCtype
 #include <rw_printf.h>   // for rw_printf
-#include <driver.h>
+#include <rw_driver.h>
 
 #include <stdlib.h>      // for free()
 #include <string.h>      // for memset(), size_t, strlen()

Modified: stdcxx/branches/4.3.x/tests/self/0.inputiter.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/self/0.inputiter.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/self/0.inputiter.cpp (original)
+++ stdcxx/branches/4.3.x/tests/self/0.inputiter.cpp Fri Jun  6 19:24:19 2008
@@ -34,9 +34,9 @@
 #include <crtdbg.h>     // for _CrtSetReportMode()
 #endif
 
-#include <alg_test.h>   // for InputIter
-#include <rw_value.h>   // for UserClass
-#include <driver.h>     // for rw_test(), ...
+#include <rw_alg_test.h>   // for InputIter
+#include <rw_value.h>      // for UserClass
+#include <rw_driver.h>     // for rw_test(), ...
 
 /***********************************************************************/
 

Modified: stdcxx/branches/4.3.x/tests/self/0.locale.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/self/0.locale.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/self/0.locale.cpp (original)
+++ stdcxx/branches/4.3.x/tests/self/0.locale.cpp Fri Jun  6 19:24:19 2008
@@ -29,9 +29,9 @@
 #include <cstdio>        // for remove()
 #include <cstdlib>       // for getenv()
 
-#include <environ.h>     // for rw_putenv()
-#include <file.h>        // for rw_fwrite()
-#include <driver.h>      // for rw_test(), etc.
+#include <rw_environ.h>  // for rw_putenv()
+#include <rw_file.h>     // for rw_fwrite()
+#include <rw_driver.h>   // for rw_test(), etc.
 #include <rw_locale.h>   // for rw_localedef()
 #include <rw_printf.h>   // for rw_fprintf()
 

Modified: stdcxx/branches/4.3.x/tests/self/0.new.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/self/0.new.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/self/0.new.cpp (original)
+++ stdcxx/branches/4.3.x/tests/self/0.new.cpp Fri Jun  6 19:24:19 2008
@@ -34,7 +34,7 @@
 #include <signal.h>   // for SIGABRT, signal()
 
 #include <rw_new.h>
-#include <driver.h>
+#include <rw_driver.h>
 
 /**************************************************************************/
 

Modified: stdcxx/branches/4.3.x/tests/self/0.outputiter.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/self/0.outputiter.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/self/0.outputiter.cpp (original)
+++ stdcxx/branches/4.3.x/tests/self/0.outputiter.cpp Fri Jun  6 19:24:19 2008
@@ -34,9 +34,9 @@
 #include <crtdbg.h>     // for _CrtSetReportMode()
 #endif
 
-#include <alg_test.h>   // for OutputIter
-#include <rw_value.h>   // for UserClass
-#include <driver.h>     // for rw_test(), ...
+#include <rw_alg_test.h>   // for OutputIter
+#include <rw_value.h>      // for UserClass
+#include <rw_driver.h>     // for rw_test(), ...
 
 /***********************************************************************/
 

Modified: stdcxx/branches/4.3.x/tests/self/0.printf.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/self/0.printf.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/self/0.printf.cpp (original)
+++ stdcxx/branches/4.3.x/tests/self/0.printf.cpp Fri Jun  6 19:24:19 2008
@@ -32,7 +32,7 @@
 
 #include <rw_printf.h>
 #include <rw_process.h> // for rw_pid_t
-#include <environ.h>    // for rw_putenv()
+#include <rw_environ.h> // for rw_putenv()
 
 #include <bitset>       // for bitset
 #include <ios>          // for ios::iostate, ios::openmode, ios::seekdir

Modified: stdcxx/branches/4.3.x/tests/self/0.process.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/self/0.process.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/self/0.process.cpp (original)
+++ stdcxx/branches/4.3.x/tests/self/0.process.cpp Fri Jun  6 19:24:19 2008
@@ -32,7 +32,7 @@
 #include <string.h>         // for strcmp()
 
 #include <rw_process.h>     // for rw_process_create(), rw_waitpid()
-#include <driver.h>         // for rw_test()
+#include <rw_driver.h>      // for rw_test()
 
 static int _rw_child = 0;
 static int _rw_timeout = 5;

Modified: stdcxx/branches/4.3.x/tests/self/0.strncmp.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/self/0.strncmp.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/self/0.strncmp.cpp (original)
+++ stdcxx/branches/4.3.x/tests/self/0.strncmp.cpp Fri Jun  6 19:24:19 2008
@@ -26,7 +26,7 @@
  * 
  **************************************************************************/
 
-#include <valcmp.h>   // for rw_strncmp()
+#include <rw_valcmp.h>   // for rw_strncmp()
 
 #include <stdio.h>    // for fprintf()
 

Modified: stdcxx/branches/4.3.x/tests/self/0.valcmp.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/self/0.valcmp.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/self/0.valcmp.cpp (original)
+++ stdcxx/branches/4.3.x/tests/self/0.valcmp.cpp Fri Jun  6 19:24:19 2008
@@ -27,7 +27,7 @@
  * 
  **************************************************************************/
 
-#include <valcmp.h>
+#include <rw_valcmp.h>
 
 #include <stdio.h>   // for fprintf, size_t
 

Modified: stdcxx/branches/4.3.x/tests/src/21.strings.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/21.strings.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/21.strings.cpp (original)
+++ stdcxx/branches/4.3.x/tests/src/21.strings.cpp Fri Jun  6 19:24:19 2008
@@ -30,10 +30,9 @@
 #include <memory>         // for allocator
 #include <string>         // for char_traits
 
-#include <21.strings.h>
-
-#include <cmdopt.h>         // for rw_enabled()
-#include <driver.h>         // for rw_info()
+#include <rw_strings.h>
+#include <rw_cmdopt.h>      // for rw_enabled()
+#include <rw_driver.h>      // for rw_info()
 #include <rw_allocator.h>   // for UserAlloc
 #include <rw_char.h>        // for rw_expand()
 #include <rw_printf.h>      // for rw_asnprintf()

Modified: stdcxx/branches/4.3.x/tests/src/23.containers.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/23.containers.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/23.containers.cpp (original)
+++ stdcxx/branches/4.3.x/tests/src/23.containers.cpp Fri Jun  6 19:24:19 2008
@@ -29,11 +29,10 @@
 
 #include <memory>           // for allocator
 
-#include <23.containers.h>
-#include <23.list.h>
-
-#include <cmdopt.h>         // for rw_enabled()
-#include <driver.h>         // for rw_note()
+#include <rw_containers.h>
+#include <rw_lists.h>
+#include <rw_cmdopt.h>      // for rw_enabled()
+#include <rw_driver.h>      // for rw_note()
 #include <rw_allocator.h>   // for UserAlloc
 #include <rw_printf.h>      // for rw_asnprintf()
 

Modified: stdcxx/branches/4.3.x/tests/src/alg_test.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/alg_test.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/alg_test.cpp (original)
+++ stdcxx/branches/4.3.x/tests/src/alg_test.cpp Fri Jun  6 19:24:19 2008
@@ -31,8 +31,7 @@
 
 #include <stdlib.h>     // for rand()
 
-
-#include <alg_test.h>
+#include <rw_alg_test.h>
 
 
 // generate a unique sequential number starting from 0

Modified: stdcxx/branches/4.3.x/tests/src/alloc.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/alloc.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/alloc.cpp (original)
+++ stdcxx/branches/4.3.x/tests/src/alloc.cpp Fri Jun  6 19:24:19 2008
@@ -31,7 +31,7 @@
 #include <string.h>   // for memset()
 
 #include <rw_alloc.h>
-#include <driver.h>   // for rw_error(), rw_fatal()
+#include <rw_driver.h>   // for rw_error(), rw_fatal()
 
 
 #ifdef __CYGWIN__

Modified: stdcxx/branches/4.3.x/tests/src/allocator.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/allocator.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/allocator.cpp (original)
+++ stdcxx/branches/4.3.x/tests/src/allocator.cpp Fri Jun  6 19:24:19 2008
@@ -29,11 +29,12 @@
 
 #include <rw_allocator.h>
 #include <rw_new.h>         // for operator_new()
-#include <driver.h>         // for rw_assert()
+#include <rw_driver.h>         // for rw_assert()
+#include <rw_exception.h>   // for rw_throw()
+
 #include <new>              // for bad_alloc, placement new
 #include <stdarg.h>         // for va_arg(), va_list
 #include <string.h>         // for memset()
-#include <rw_exception.h>   // for rw_throw()
 
 /**************************************************************************/
 

Modified: stdcxx/branches/4.3.x/tests/src/any.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/any.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/any.cpp (original)
+++ stdcxx/branches/4.3.x/tests/src/any.cpp Fri Jun  6 19:24:19 2008
@@ -29,9 +29,9 @@
 // expand _TEST_EXPORT macros
 #define _RWSTD_TEST_SRC
 
-#include <any.h>
-
+#include <rw_any.h>
 #include <rw_printf.h>   // for rw_sprintfa()
+
 #include <stdlib.h>      // for free()
 #include <string.h>      // for memset()
 

Modified: stdcxx/branches/4.3.x/tests/src/char.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/char.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/char.cpp (original)
+++ stdcxx/branches/4.3.x/tests/src/char.cpp Fri Jun  6 19:24:19 2008
@@ -26,8 +26,8 @@
 
 // expand _TEST_EXPORT macros
 #define _RWSTD_TEST_SRC
-#include <rw_char.h>
 
+#include <rw_char.h>
 #include <rw_printf.h>   // for rw_snprintfa()
 
 #include <ctype.h>       // for isdigit()

Modified: stdcxx/branches/4.3.x/tests/src/cmdopt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/cmdopt.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/cmdopt.cpp (original)
+++ stdcxx/branches/4.3.x/tests/src/cmdopt.cpp Fri Jun  6 19:24:19 2008
@@ -27,7 +27,7 @@
 // expand _TEST_EXPORT macros
 #define _RWSTD_TEST_SRC
 
-#include <cmdopt.h>
+#include <rw_cmdopt.h>
 
 #include <ctype.h>    // isdigit(), isspace()
 #include <errno.h>    // for errno

Modified: stdcxx/branches/4.3.x/tests/src/ctype.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/ctype.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/ctype.cpp (original)
+++ stdcxx/branches/4.3.x/tests/src/ctype.cpp Fri Jun  6 19:24:19 2008
@@ -26,6 +26,7 @@
 
 // expand _TEST_EXPORT macros
 #define _RWSTD_TEST_SRC
+
 #include <rw_ctype.h>
 
 #include <stdarg.h>   // for va_arg(), va_list

Modified: stdcxx/branches/4.3.x/tests/src/driver.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/driver.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/driver.cpp (original)
+++ stdcxx/branches/4.3.x/tests/src/driver.cpp Fri Jun  6 19:24:19 2008
@@ -34,7 +34,7 @@
 #include "opt_trace.h"
 #include "opt_types.h"
 
-#include <cmdopt.h>    // for rw_setopts()
+#include <rw_cmdopt.h> // for rw_setopts()
 #include <rw_printf.h> // for rw_snprintfa()
 
 #include <assert.h>    // for assert
@@ -79,7 +79,7 @@
 
 // expand _TEST_EXPORT macros
 #define _RWSTD_TEST_SRC
-#include <driver.h>
+#include <rw_driver.h>
 
 /************************************************************************/
 

Modified: stdcxx/branches/4.3.x/tests/src/environ.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/environ.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/environ.cpp (original)
+++ stdcxx/branches/4.3.x/tests/src/environ.cpp Fri Jun  6 19:24:19 2008
@@ -29,7 +29,7 @@
 // expand _TEST_EXPORT macros
 #define _RWSTD_TEST_SRC
 
-#include <environ.h>
+#include <rw_environ.h>
 
 #include <assert.h>   // for assert
 #include <stdlib.h>   // for getenv, malloc, putenv

Modified: stdcxx/branches/4.3.x/tests/src/exception.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/exception.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/exception.cpp (original)
+++ stdcxx/branches/4.3.x/tests/src/exception.cpp Fri Jun  6 19:24:19 2008
@@ -28,8 +28,9 @@
 #define _RWSTD_TEST_SRC
 
 #include <rw_exception.h>
-#include <driver.h>   
+#include <rw_driver.h>   
 #include <rw_printf.h>
+
 #include <string.h>         // for size_t, strcpy()
 #include <stdlib.h>         // for free()
 #include <stdarg.h>         // for va_arg(), va_list

Modified: stdcxx/branches/4.3.x/tests/src/file.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/file.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/file.cpp (original)
+++ stdcxx/branches/4.3.x/tests/src/file.cpp Fri Jun  6 19:24:19 2008
@@ -29,7 +29,7 @@
 // expand _TEST_EXPORT macros
 #define _RWSTD_TEST_SRC
 
-#include <file.h>
+#include <rw_file.h>
 
 #ifdef _RWSTD_OS_LINUX
 #  ifdef _RWSTD_NO_PURE_C_HEADERS

Modified: stdcxx/branches/4.3.x/tests/src/fmt_bits.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/fmt_bits.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/fmt_bits.cpp (original)
+++ stdcxx/branches/4.3.x/tests/src/fmt_bits.cpp Fri Jun  6 19:24:19 2008
@@ -28,7 +28,9 @@
 
 // expand _TEST_EXPORT macros
 #define _RWSTD_TEST_SRC
+
 #include "fmt_defs.h"
+
 #include <rw_printf.h>
 
 #include <ctype.h>    // for isalnum(), ...

Modified: stdcxx/branches/4.3.x/tests/src/fmt_defs.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/fmt_defs.h?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/fmt_defs.h (original)
+++ stdcxx/branches/4.3.x/tests/src/fmt_defs.h Fri Jun  6 19:24:19 2008
@@ -30,7 +30,8 @@
 #ifndef RW_FMT_DEFS_H_INCLUDED
 #define RW_FMT_DEFS_H_INCLUDED
 
-#include <testdefs.h>
+#include <rw_testdefs.h>
+
 #include <stddef.h>     // for ptrdiff_t, size_t
 
 /********************************************************************/

Modified: stdcxx/branches/4.3.x/tests/src/locale.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/locale.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/locale.cpp (original)
+++ stdcxx/branches/4.3.x/tests/src/locale.cpp Fri Jun  6 19:24:19 2008
@@ -31,14 +31,13 @@
 
 
 #include <rw_locale.h>
-
-#include <environ.h>      // for rw_putenv()
-#include <file.h>         // for SHELL_RM_RF, rw_tmpnam
+#include <rw_environ.h>   // for rw_putenv()
+#include <rw_file.h>      // for SHELL_RM_RF, rw_tmpnam
 #include <rw_process.h>   // for rw_system()
 #include <rw_printf.h>    // for rw_snprintf()
 #include <rw_fnmatch.h>   // for rw_fnmatch()
 #include <rw_braceexp.h>  // for rw_shell_expand()
-#include <driver.h>       // for rw_error()
+#include <rw_driver.h>    // for rw_error()
 
 #ifdef _RWSTD_OS_LINUX
 #  ifdef _RWSTD_NO_PURE_C_HEADERS

Modified: stdcxx/branches/4.3.x/tests/src/new.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/new.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/new.cpp (original)
+++ stdcxx/branches/4.3.x/tests/src/new.cpp Fri Jun  6 19:24:19 2008
@@ -32,7 +32,7 @@
 #include <stdlib.h>   // for abort(), getenv()
 #include <string.h>   // for memset()
 
-#include <driver.h>
+#include <rw_driver.h>
 #include <rw_printf.h>
 #include <rw_new.h>
 #include <rw_exception.h>   // for rw_throw()

Modified: stdcxx/branches/4.3.x/tests/src/opt_diags.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/opt_diags.h?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/opt_diags.h (original)
+++ stdcxx/branches/4.3.x/tests/src/opt_diags.h Fri Jun  6 19:24:19 2008
@@ -30,7 +30,7 @@
 #define RW_OPT_DIAGS_H_INCLUDED
 
 
-#include <testdefs.h>
+#include <rw_testdefs.h>
 
 
 enum diag_t {

Modified: stdcxx/branches/4.3.x/tests/src/opt_lines.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/opt_lines.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/opt_lines.cpp (original)
+++ stdcxx/branches/4.3.x/tests/src/opt_lines.cpp Fri Jun  6 19:24:19 2008
@@ -31,7 +31,7 @@
 
 #include "opt_lines.h"
 
-#include <cmdopt.h>
+#include <rw_cmdopt.h>
 
 #include <assert.h>
 #include <stdio.h>

Modified: stdcxx/branches/4.3.x/tests/src/opt_lines.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/opt_lines.h?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/opt_lines.h (original)
+++ stdcxx/branches/4.3.x/tests/src/opt_lines.h Fri Jun  6 19:24:19 2008
@@ -30,7 +30,7 @@
 #define RW_OPT_LINES_H_INCLUDED
 
 
-#include <testdefs.h>
+#include <rw_testdefs.h>
 
 
 extern int

Modified: stdcxx/branches/4.3.x/tests/src/opt_types.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/opt_types.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/opt_types.cpp (original)
+++ stdcxx/branches/4.3.x/tests/src/opt_types.cpp Fri Jun  6 19:24:19 2008
@@ -31,8 +31,8 @@
 
 #include "opt_types.h"
 
-#include <cmdopt.h>
-#include <driver.h>
+#include <rw_cmdopt.h>
+#include <rw_driver.h>
 
 #include <string.h>
 

Modified: stdcxx/branches/4.3.x/tests/src/opt_types.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/opt_types.h?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/opt_types.h (original)
+++ stdcxx/branches/4.3.x/tests/src/opt_types.h Fri Jun  6 19:24:19 2008
@@ -30,7 +30,7 @@
 #define RW_OPT_TYPES_H_INCLUDED
 
 
-#include <testdefs.h>
+#include <rw_testdefs.h>
 
 
 int _rw_setopts_types ();

Modified: stdcxx/branches/4.3.x/tests/src/printf.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/printf.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/printf.cpp (original)
+++ stdcxx/branches/4.3.x/tests/src/printf.cpp Fri Jun  6 19:24:19 2008
@@ -31,7 +31,7 @@
 #include "fmt_defs.h"
 
 #include <rw_printf.h>
-#include <environ.h>
+#include <rw_environ.h>
 
 #include <ctype.h>    // for isalpha(), ...
 #include <errno.h>    // for errno, errno constants

Modified: stdcxx/branches/4.3.x/tests/src/process.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/process.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/process.cpp (original)
+++ stdcxx/branches/4.3.x/tests/src/process.cpp Fri Jun  6 19:24:19 2008
@@ -27,8 +27,6 @@
 // expand _TEST_EXPORT macros
 #define _RWSTD_TEST_SRC
 
-#include <rw_process.h>
-
 #include <ctype.h>        // for isspace()
 #include <errno.h>        // for EACCES, errno
 #include <signal.h>       // for SIGXXX, kill()
@@ -39,7 +37,8 @@
 
 #include <sys/types.h>    // for pid_t
 
-#include <driver.h>       // for rw_note(), ...
+#include <rw_process.h>
+#include <rw_driver.h>    // for rw_note(), ...
 #include <rw_printf.h>    // for rw_fprintf()
 
 #ifdef __CYGWIN__

Modified: stdcxx/branches/4.3.x/tests/src/thread.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/src/thread.cpp?rev=664244&r1=664243&r2=664244&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/src/thread.cpp (original)
+++ stdcxx/branches/4.3.x/tests/src/thread.cpp Fri Jun  6 19:24:19 2008
@@ -31,6 +31,7 @@
 
 #include <rw_thread.h>
 #include <rw_alarm.h>   // for rw_alarm()
+
 #include <stddef.h>     // for size_t
 #include <string.h>     // for memset()