You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by vi...@apache.org on 2008/06/25 19:24:52 UTC
svn commit: r671608 [2/4] - in /stdcxx/trunk: etc/config/ examples/include/
examples/manual/ examples/tutorial/ include/ src/ tests/algorithms/
tests/containers/ tests/diagnostics/ tests/include/ tests/intro/
tests/iostream/ tests/iterators/ tests/loca...
Modified: stdcxx/trunk/tests/include/rw_locale.h
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/include/rw_locale.h?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/include/rw_locale.h (original)
+++ stdcxx/trunk/tests/include/rw_locale.h Wed Jun 25 10:24:43 2008
@@ -30,7 +30,7 @@
#define RW_LOCALE_H_INCLUDED
-#include <testdefs.h>
+#include <rw_testdefs.h>
#define _UNUSED_CAT 69
Modified: stdcxx/trunk/tests/include/rw_new.h
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/include/rw_new.h?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/include/rw_new.h (original)
+++ stdcxx/trunk/tests/include/rw_new.h Wed Jun 25 10:24:43 2008
@@ -36,7 +36,7 @@
#include <new> // for bad_alloc
-#include <testdefs.h> // for test config macros
+#include <rw_testdefs.h> // for test config macros
struct rwt_free_store
Modified: stdcxx/trunk/tests/include/rw_printf.h
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/include/rw_printf.h?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/include/rw_printf.h (original)
+++ stdcxx/trunk/tests/include/rw_printf.h Wed Jun 25 10:24:43 2008
@@ -29,7 +29,7 @@
#ifndef RW_PRINTF_H_INCLUDED
#define RW_PRINTF_H_INCLUDED
-#include <testdefs.h>
+#include <rw_testdefs.h>
struct rw_file;
Modified: stdcxx/trunk/tests/include/rw_process.h
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/include/rw_process.h?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/include/rw_process.h (original)
+++ stdcxx/trunk/tests/include/rw_process.h Wed Jun 25 10:24:43 2008
@@ -28,7 +28,7 @@
#define RW_PROCESS_H_INCLUDED
-#include <testdefs.h>
+#include <rw_testdefs.h>
typedef _RWSTD_SSIZE_T rw_pid_t;
Modified: stdcxx/trunk/tests/include/rw_rand.h
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/include/rw_rand.h?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/include/rw_rand.h (original)
+++ stdcxx/trunk/tests/include/rw_rand.h Wed Jun 25 10:24:43 2008
@@ -30,7 +30,8 @@
#define RW_RAND_H_INCLUDED
#include <rw/_defs.h> // for libstd config macros
-#include <testdefs.h> // for test config macros
+
+#include <rw_testdefs.h> // for test config macros
// seeds the 32-bit random number generator
// if the seed is equal UINT32_MAX picks a random value to seed
Modified: stdcxx/trunk/tests/include/rw_streambuf.h
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/include/rw_streambuf.h?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/include/rw_streambuf.h (original)
+++ stdcxx/trunk/tests/include/rw_streambuf.h Wed Jun 25 10:24:43 2008
@@ -33,7 +33,7 @@
#include <cstring> // for memset()
#include <streambuf> // for basic_streambuf
-#include <testdefs.h>
+#include <rw_testdefs.h>
#include <rw_char.h> // for make_char()
#include <rw_exception.h> // for rw_throw()
Modified: stdcxx/trunk/tests/include/rw_thread.h
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/include/rw_thread.h?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/include/rw_thread.h (original)
+++ stdcxx/trunk/tests/include/rw_thread.h Wed Jun 25 10:24:43 2008
@@ -29,7 +29,7 @@
#ifndef RW_RWTHREAD_H_INCLUDED
#define RW_RWTHREAD_H_INCLUDED
-#include <testdefs.h>
+#include <rw_testdefs.h>
extern "C" {
Modified: stdcxx/trunk/tests/include/rw_value.h
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/include/rw_value.h?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/include/rw_value.h (original)
+++ stdcxx/trunk/tests/include/rw_value.h Wed Jun 25 10:24:43 2008
@@ -29,8 +29,8 @@
#ifndef RW_VALUE_H_INCLUDED
#define RW_VALUE_H_INCLUDED
-#include <testdefs.h>
-#include <alg_test.h> // for conv_to_bool
+#include <rw_testdefs.h>
+#include <rw_alg_test.h> // for conv_to_bool
/**************************************************************************/
Modified: stdcxx/trunk/tests/intro/17.extensions.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/intro/17.extensions.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/intro/17.extensions.cpp (original)
+++ stdcxx/trunk/tests/intro/17.extensions.cpp Wed Jun 25 10:24:43 2008
@@ -295,7 +295,7 @@
/***********************************************************************/
-#include <driver.h>
+#include <rw_driver.h>
bool predicate (int /* unused */) { return true; }
Modified: stdcxx/trunk/tests/intro/17.names.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/intro/17.names.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/intro/17.names.cpp (original)
+++ stdcxx/trunk/tests/intro/17.names.cpp Wed Jun 25 10:24:43 2008
@@ -35,7 +35,8 @@
// as compilation errors
#include <rw/_defs.h>
-#include <driver.h>
+
+#include <rw_driver.h>
#ifdef __SUNPRO_CC
Modified: stdcxx/trunk/tests/iostream/27.basic.ios.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/iostream/27.basic.ios.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/iostream/27.basic.ios.cpp (original)
+++ stdcxx/trunk/tests/iostream/27.basic.ios.cpp Wed Jun 25 10:24:43 2008
@@ -162,7 +162,7 @@
// additional compilation tests
-#include <driver.h>
+#include <rw_driver.h>
static void
test_synopsis ()
Modified: stdcxx/trunk/tests/iostream/27.filebuf.codecvt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/iostream/27.filebuf.codecvt.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/iostream/27.filebuf.codecvt.cpp (original)
+++ stdcxx/trunk/tests/iostream/27.filebuf.codecvt.cpp Wed Jun 25 10:24:43 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/trunk/tests/iostream/27.filebuf.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/iostream/27.filebuf.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/iostream/27.filebuf.cpp (original)
+++ stdcxx/trunk/tests/iostream/27.filebuf.cpp Wed Jun 25 10:24:43 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/trunk/tests/iostream/27.forward.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/iostream/27.forward.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/iostream/27.forward.cpp (original)
+++ stdcxx/trunk/tests/iostream/27.forward.cpp Wed Jun 25 10:24:43 2008
@@ -127,7 +127,7 @@
/**************************************************************************/
-#include <driver.h>
+#include <rw_driver.h>
/**************************************************************************/
Modified: stdcxx/trunk/tests/iostream/27.ios.members.static.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/iostream/27.ios.members.static.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/iostream/27.ios.members.static.cpp (original)
+++ stdcxx/trunk/tests/iostream/27.ios.members.static.cpp Wed Jun 25 10:24:43 2008
@@ -40,8 +40,8 @@
#include <iostream>
// rwtest headers
-#include <driver.h>
-#include <file.h>
+#include <rw_driver.h>
+#include <rw_file.h>
#ifndef _WIN32
Modified: stdcxx/trunk/tests/iostream/27.istream.fmat.arith.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/iostream/27.istream.fmat.arith.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/iostream/27.istream.fmat.arith.cpp (original)
+++ stdcxx/trunk/tests/iostream/27.istream.fmat.arith.cpp Wed Jun 25 10:24:43 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/trunk/tests/iostream/27.istream.get.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/iostream/27.istream.get.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/iostream/27.istream.get.cpp (original)
+++ stdcxx/trunk/tests/iostream/27.istream.get.cpp Wed Jun 25 10:24:43 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/trunk/tests/iostream/27.istream.manip.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/iostream/27.istream.manip.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/iostream/27.istream.manip.cpp (original)
+++ stdcxx/trunk/tests/iostream/27.istream.manip.cpp Wed Jun 25 10:24:43 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/trunk/tests/iostream/27.istream.readsome.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/iostream/27.istream.readsome.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/iostream/27.istream.readsome.cpp (original)
+++ stdcxx/trunk/tests/iostream/27.istream.readsome.cpp Wed Jun 25 10:24:43 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/trunk/tests/iostream/27.istream.sentry.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/iostream/27.istream.sentry.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/iostream/27.istream.sentry.cpp (original)
+++ stdcxx/trunk/tests/iostream/27.istream.sentry.cpp Wed Jun 25 10:24:43 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/trunk/tests/iostream/27.istream.unformatted.get.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/iostream/27.istream.unformatted.get.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/iostream/27.istream.unformatted.get.cpp (original)
+++ stdcxx/trunk/tests/iostream/27.istream.unformatted.get.cpp Wed Jun 25 10:24:43 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/trunk/tests/iostream/27.objects.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/iostream/27.objects.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/iostream/27.objects.cpp (original)
+++ stdcxx/trunk/tests/iostream/27.objects.cpp Wed Jun 25 10:24:43 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/trunk/tests/iostream/27.ostream.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/iostream/27.ostream.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/iostream/27.ostream.cpp (original)
+++ stdcxx/trunk/tests/iostream/27.ostream.cpp Wed Jun 25 10:24:43 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/trunk/tests/iostream/27.std.manip.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/iostream/27.std.manip.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/iostream/27.std.manip.cpp (original)
+++ stdcxx/trunk/tests/iostream/27.std.manip.cpp Wed Jun 25 10:24:43 2008
@@ -53,7 +53,7 @@
#include <ostream>
#include <sstream>
-#include <driver.h>
+#include <rw_driver.h>
/***********************************************************************/
Modified: stdcxx/trunk/tests/iostream/27.stringbuf.virtuals.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/iostream/27.stringbuf.virtuals.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/iostream/27.stringbuf.virtuals.cpp (original)
+++ stdcxx/trunk/tests/iostream/27.stringbuf.virtuals.cpp Wed Jun 25 10:24:43 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/trunk/tests/iterators/24.istream.iterator.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/iterators/24.istream.iterator.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/iterators/24.istream.iterator.cpp (original)
+++ stdcxx/trunk/tests/iterators/24.istream.iterator.cpp Wed Jun 25 10:24:43 2008
@@ -31,7 +31,7 @@
#include <rw_char.h>
#include <rw_printf.h>
-#include <driver.h>
+#include <rw_driver.h>
/***********************************************************************/
Modified: stdcxx/trunk/tests/localization/22.locale.codecvt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.codecvt.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.codecvt.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.codecvt.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.codecvt.length.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.codecvt.length.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.codecvt.length.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.codecvt.length.cpp Wed Jun 25 10:24:43 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()
@@ -510,7 +510,7 @@
#undef TEST
#define TEST(from, nc, maxi, res) \
test_length (wchar_t (), __LINE__, 0, cvt_libc, \
- from, std::size_t (nc), std::size_t (maxi), res)
+ from, std::size_t (nc), maxi, res)
TEST (0, 0, 0, 0);
TEST ("", 0, 0, 0);
Modified: stdcxx/trunk/tests/localization/22.locale.codecvt.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.codecvt.mt.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.codecvt.mt.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.codecvt.mt.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.codecvt.out.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.codecvt.out.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.codecvt.out.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.codecvt.out.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.collate.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.collate.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.collate.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.collate.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.cons.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.cons.mt.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.cons.mt.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.cons.mt.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.ctype.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.ctype.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.ctype.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.ctype.cpp Wed Jun 25 10:24:43 2008
@@ -65,8 +65,8 @@
# include <langinfo.h>
#endif // _WIN32
-#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/trunk/tests/localization/22.locale.ctype.is.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.ctype.is.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.ctype.is.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.ctype.is.cpp Wed Jun 25 10:24:43 2008
@@ -65,8 +65,8 @@
# include <langinfo.h>
#endif // _WIN32
-#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/trunk/tests/localization/22.locale.ctype.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.ctype.mt.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.ctype.mt.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.ctype.mt.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.ctype.narrow.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.ctype.narrow.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.ctype.narrow.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.ctype.narrow.cpp Wed Jun 25 10:24:43 2008
@@ -66,8 +66,8 @@
# include <langinfo.h>
#endif // _WIN32
-#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/trunk/tests/localization/22.locale.ctype.scan.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.ctype.scan.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.ctype.scan.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.ctype.scan.cpp Wed Jun 25 10:24:43 2008
@@ -65,8 +65,8 @@
# include <langinfo.h>
#endif // _WIN32
-#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/trunk/tests/localization/22.locale.ctype.tolower.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.ctype.tolower.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.ctype.tolower.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.ctype.tolower.cpp Wed Jun 25 10:24:43 2008
@@ -65,8 +65,8 @@
# include <langinfo.h>
#endif // _WIN32
-#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/trunk/tests/localization/22.locale.ctype.toupper.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.ctype.toupper.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.ctype.toupper.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.ctype.toupper.cpp Wed Jun 25 10:24:43 2008
@@ -65,8 +65,8 @@
# include <langinfo.h>
#endif // _WIN32
-#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/trunk/tests/localization/22.locale.globals.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.globals.mt.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.globals.mt.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.globals.mt.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.messages.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.messages.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.messages.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.messages.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.messages.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.messages.mt.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.messages.mt.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.messages.mt.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.money.get.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.money.get.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.money.get.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.money.get.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.money.get.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.money.get.mt.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.money.get.mt.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.money.get.mt.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.money.put.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.money.put.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.money.put.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.money.put.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.money.put.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.money.put.mt.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.money.put.mt.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.money.put.mt.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.moneypunct.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.moneypunct.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.moneypunct.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.moneypunct.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.moneypunct.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.moneypunct.mt.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.moneypunct.mt.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.moneypunct.mt.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.num.get.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.num.get.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.num.get.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.num.get.cpp Wed Jun 25 10:24:43 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()
/**************************************************************************/
@@ -528,7 +528,7 @@
for (i = 0; i != sizeof errnos / sizeof *errnos; ++i) { \
errno = errnos [i]; \
TEST (T, numT (val), _RWSTD_STR (val), \
- sizeof (_RWSTD_STR (val)) -1, 0, Eof); \
+ int (sizeof (_RWSTD_STR (val))) -1, 0, Eof); \
rw_assert (errnos [i] == errno, 0, __LINE__, \
"%d. errno unexpectedly changed from %d to %d", \
i, errnos [i], errno); \
@@ -1174,7 +1174,7 @@
"1"
};
- static const std::size_t NC = sizeof many_groups - 1;
+ static const int NC = int (sizeof many_groups - 1);
const int nfail = TEST (T, 1L, many_groups + i, NC - i, dec, Eof, "\1");
@@ -1322,18 +1322,20 @@
const char vflow_1[] = "999999999999999999990";
#endif
- TEST (T, LONG_MIN, lmin, sizeof lmin - 1, 0, Eof);
- TEST (T, LONG_MIN, lmin_minus_1, sizeof lmin_minus_1 - 1, 0, Eof | Fail);
- TEST (T, LONG_MIN, lmin_minus_2, sizeof lmin_minus_2 - 1, 0, Eof | Fail);
- TEST (T, LONG_MIN, lmin_minus_3, sizeof lmin_minus_3 - 1, 0, Eof | Fail);
-
- TEST (T, LONG_MAX, lmax, sizeof lmax - 1, 0, Eof);
- TEST (T, LONG_MAX, lmax_plus_1, sizeof lmax_plus_1 - 1, 0, Eof | Fail);
- TEST (T, LONG_MAX, lmax_plus_2, sizeof lmax_plus_2 - 1, 0, Eof | Fail);
- TEST (T, LONG_MAX, lmax_plus_3, sizeof lmax_plus_3 - 1, 0, Eof | Fail);
- TEST (T, LONG_MAX, lmax_x_f, sizeof lmax_x_f - 1, 0, Eof | Fail);
+#define INTSIZE(x) _RWSTD_STATIC_CAST(int, sizeof (x))
- TEST (T, LONG_MAX, vflow_1, sizeof vflow_1 - 1, 0, Eof | Fail);
+ TEST (T, LONG_MIN, lmin, INTSIZE (lmin - 1), 0, Eof);
+ TEST (T, LONG_MIN, lmin_minus_1, INTSIZE (lmin_minus_1 - 1), 0, Eof | Fail);
+ TEST (T, LONG_MIN, lmin_minus_2, INTSIZE (lmin_minus_2 - 1), 0, Eof | Fail);
+ TEST (T, LONG_MIN, lmin_minus_3, INTSIZE (lmin_minus_3 - 1), 0, Eof | Fail);
+
+ TEST (T, LONG_MAX, lmax, INTSIZE (lmax - 1), 0, Eof);
+ TEST (T, LONG_MAX, lmax_plus_1, INTSIZE (lmax_plus_1 - 1), 0, Eof | Fail);
+ TEST (T, LONG_MAX, lmax_plus_2, INTSIZE (lmax_plus_2 - 1), 0, Eof | Fail);
+ TEST (T, LONG_MAX, lmax_plus_3, INTSIZE (lmax_plus_3 - 1), 0, Eof | Fail);
+ TEST (T, LONG_MAX, lmax_x_f, INTSIZE (lmax_x_f - 1), 0, Eof | Fail);
+
+ TEST (T, LONG_MAX, vflow_1, INTSIZE (vflow_1 - 1), 0, Eof | Fail);
// verify that the combination of ERANGE and LONG_MAX
@@ -1533,13 +1535,13 @@
const char vflow_1[] = "999999999999999999990";
#endif
- TEST (T, ULONG_MAX, ulmax, sizeof ulmax - 1, 0, Eof);
- TEST (T, ULONG_MAX, ulmax_plus_1, sizeof ulmax_plus_1 - 1, 0, Eof | Fail);
- TEST (T, ULONG_MAX, ulmax_plus_2, sizeof ulmax_plus_2 - 1, 0, Eof | Fail);
- TEST (T, ULONG_MAX, ulmax_plus_3, sizeof ulmax_plus_3 - 1, 0, Eof | Fail);
- TEST (T, ULONG_MAX, ulmax_x_f, sizeof ulmax_x_f - 1, 0, Eof | Fail);
+ TEST (T, ULONG_MAX, ulmax, INTSIZE (ulmax - 1), 0, Eof);
+ TEST (T, ULONG_MAX, ulmax_plus_1, INTSIZE (ulmax_plus_1 - 1), 0, Eof | Fail);
+ TEST (T, ULONG_MAX, ulmax_plus_2, INTSIZE (ulmax_plus_2 - 1), 0, Eof | Fail);
+ TEST (T, ULONG_MAX, ulmax_plus_3, INTSIZE (ulmax_plus_3 - 1), 0, Eof | Fail);
+ TEST (T, ULONG_MAX, ulmax_x_f, INTSIZE (ulmax_x_f - 1), 0, Eof | Fail);
- TEST (T, ULONG_MAX, vflow_1, sizeof vflow_1 - 1, 0, Eof | Fail);
+ TEST (T, ULONG_MAX, vflow_1, INTSIZE (vflow_1 - 1), 0, Eof | Fail);
// verify that the combination of ERANGE and ULONG_MAX
// doesn't trip the facet up if it uses strtoul()
@@ -2119,7 +2121,7 @@
const char pvmax_plus_1[] = "0xffffffffffffffffffffffffffffffff";
#endif
-#define PVOIDSTR(name) name, sizeof name - 1
+#define PVOIDSTR(name) name, INTSIZE (name - 1)
TEST (T, PVoid (~0), PVOIDSTR (pvmax), 0, Eof);
TEST (T, PVoid (~0), PVOIDSTR (pvmax_plus_1), 0, Eof | Fail);
@@ -2825,7 +2827,7 @@
long_str [sizeof long_str - 1] = '\0';
// parse a string of LDBL_MAX_10_EXP + 1 zeros
- TEST (T, 0.0L, long_str, sizeof long_str - 1, 0, Eof);
+ TEST (T, 0.0L, long_str, INTSIZE (long_str - 1), 0, Eof);
const char *start;
@@ -2836,7 +2838,7 @@
TEST (T, 1.0e+38L, start, 39, 0, Eof);
// parse the same as above but preceded by a bunch of zeros
- TEST (T, 1.0e+38L, long_str, sizeof long_str - 1, 0, Eof);
+ TEST (T, 1.0e+38L, long_str, INTSIZE (long_str - 1), 0, Eof);
long_str [sizeof long_str - 40] = '0';
# endif // _RWSTD_LDBL_MAX_10_EXP > 129
@@ -2849,7 +2851,7 @@
TEST (T, 1.0e+128L, start, 129, 0, Eof);
// parse the same as above but preceded by a bunch of zeros
- TEST (T, 1.0e+128L, long_str, sizeof long_str - 1, 0, Eof);
+ TEST (T, 1.0e+128L, long_str, INTSIZE (long_str - 1), 0, Eof);
long_str [sizeof long_str - 130] = '0';
# endif // _RWSTD_LDBL_MAX_10_EXP > 129
@@ -2861,7 +2863,7 @@
TEST (T, 1.0e+308L, start, 309, 0, Eof);
// parse the same as above but preceded by a bunch of zeros
- TEST (T, 1.0e+308L, long_str, sizeof long_str - 1, 0, Eof);
+ TEST (T, 1.0e+308L, long_str, INTSIZE (long_str - 1), 0, Eof);
long_str [sizeof long_str - 310] = '0';
# endif // _RWSTD_LDBL_MAX_10_EXP > 308
@@ -2876,7 +2878,7 @@
long_str [0] = '1';
long_val = CAT (CAT (1.0e+, _RWSTD_LDBL_MAX_10_EXP), L);
- TEST (T, long_val, long_str, sizeof long_str - 1, 0, Eof);
+ TEST (T, long_val, long_str, INTSIZE (long_str - 1), 0, Eof);
# endif // _RWSTD_NO_LONG_DOUBLE
Modified: stdcxx/trunk/tests/localization/22.locale.num.get.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.num.get.mt.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.num.get.mt.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.num.get.mt.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.num.put.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.num.put.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.num.put.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.num.put.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.num.put.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.num.put.mt.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.num.put.mt.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.num.put.mt.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.numpunct.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.numpunct.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.numpunct.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.numpunct.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.numpunct.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.numpunct.mt.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.numpunct.mt.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.numpunct.mt.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.statics.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.statics.mt.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.statics.mt.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.statics.mt.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.synopsis.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.synopsis.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.synopsis.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.synopsis.cpp Wed Jun 25 10:24:43 2008
@@ -42,7 +42,7 @@
#include <iterator>
#include <locale>
-#include <driver.h>
+#include <rw_driver.h>
static void
test_lc_defs ()
Modified: stdcxx/trunk/tests/localization/22.locale.time.get.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.time.get.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.time.get.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.time.get.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.time.get.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.time.get.mt.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.time.get.mt.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.time.get.mt.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.time.put.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.time.put.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.time.put.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.time.put.cpp Wed Jun 25 10:24:43 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/trunk/tests/localization/22.locale.time.put.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.time.put.mt.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.time.put.mt.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.time.put.mt.cpp Wed Jun 25 10:24:43 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/trunk/tests/numerics/26.accumulate.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/numerics/26.accumulate.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/numerics/26.accumulate.cpp (original)
+++ stdcxx/trunk/tests/numerics/26.accumulate.cpp Wed Jun 25 10:24:43 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/trunk/tests/numerics/26.adjacent.diff.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/numerics/26.adjacent.diff.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/numerics/26.adjacent.diff.cpp (original)
+++ stdcxx/trunk/tests/numerics/26.adjacent.diff.cpp Wed Jun 25 10:24:43 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/trunk/tests/numerics/26.c.math.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/numerics/26.c.math.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/numerics/26.c.math.cpp (original)
+++ stdcxx/trunk/tests/numerics/26.c.math.cpp Wed Jun 25 10:24:43 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
@@ -131,7 +131,7 @@
// returns true if all `size' bytes starting at `s' are 0
static bool
-check_bits (const char *s, unsigned size)
+check_bits (const char *s, std::size_t size)
{
while (size-- && !s [size]);
return unsigned (-1) == size;
@@ -168,8 +168,8 @@
const float f = std::modf (3.141592f, &u.f);
rw_assert ( 3000 == int (u.f * 1000) && 141592 == int (f * 1000000)
- && check_bits (u.buf + sizeof u.f, sizeof u - sizeof u.f),
- 0, __LINE__, "float std::modf (float)");
+ && check_bits (u.buf + sizeof (u.f), sizeof (u) - sizeof (u.f)),
+ __FILE__, __LINE__, "float std::modf (float)");
#endif // SunPro > 5.3
@@ -177,8 +177,8 @@
const double d = std::modf (3.1415926, &u.d);
rw_assert ( 3000 == int (u.d * 1000) && 1415926 == int (d * 10000000)
- && check_bits (u.buf + sizeof u.d, sizeof u - sizeof u.d),
- 0, __LINE__, "double std::modf (double)");
+ && check_bits (u.buf + sizeof (u.d), sizeof (u) - sizeof (u.d)),
+ __FILE__, __LINE__, "double std::modf (double)");
#ifndef _RWSTD_NO_LONG_DOUBLE
@@ -188,14 +188,13 @@
const long double l = std::modf (3.1415926L, &u.l);
rw_assert ( 3000 == int (u.l * 1000) && 1415926 == int (l * 10000000)
- && check_bits (u.buf + sizeof u.l, sizeof u - sizeof u.l),
- 0, __LINE__, "long double std::modf (long double)");
+ && check_bits (u.buf + sizeof (u.l), sizeof (u) - sizeof (u.l)),
+ __FILE__, __LINE__, "long double std::modf (long double)");
# endif // SunPro > 5.3
#endif // _RWSTD_NO_LONG_DOUBLE
-
// check overloads of std::pow()
for (int i = -10; i != 10; ++i) {
Modified: stdcxx/trunk/tests/numerics/26.class.gslice.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/numerics/26.class.gslice.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/numerics/26.class.gslice.cpp (original)
+++ stdcxx/trunk/tests/numerics/26.class.gslice.cpp Wed Jun 25 10:24:43 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;
}
Modified: stdcxx/trunk/tests/numerics/26.indirect.array.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/numerics/26.indirect.array.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/numerics/26.indirect.array.cpp (original)
+++ stdcxx/trunk/tests/numerics/26.indirect.array.cpp Wed Jun 25 10:24:43 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/trunk/tests/numerics/26.inner.product.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/numerics/26.inner.product.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/numerics/26.inner.product.cpp (original)
+++ stdcxx/trunk/tests/numerics/26.inner.product.cpp Wed Jun 25 10:24:43 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/trunk/tests/numerics/26.mask.array.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/numerics/26.mask.array.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/numerics/26.mask.array.cpp (original)
+++ stdcxx/trunk/tests/numerics/26.mask.array.cpp Wed Jun 25 10:24:43 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/trunk/tests/numerics/26.partial.sum.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/numerics/26.partial.sum.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/numerics/26.partial.sum.cpp (original)
+++ stdcxx/trunk/tests/numerics/26.partial.sum.cpp Wed Jun 25 10:24:43 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/trunk/tests/numerics/26.valarray.cassign.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/numerics/26.valarray.cassign.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/numerics/26.valarray.cassign.cpp (original)
+++ stdcxx/trunk/tests/numerics/26.valarray.cassign.cpp Wed Jun 25 10:24:43 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/trunk/tests/numerics/26.valarray.cons.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/numerics/26.valarray.cons.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/numerics/26.valarray.cons.cpp (original)
+++ stdcxx/trunk/tests/numerics/26.valarray.cons.cpp Wed Jun 25 10:24:43 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/trunk/tests/numerics/26.valarray.transcend.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/numerics/26.valarray.transcend.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/numerics/26.valarray.transcend.cpp (original)
+++ stdcxx/trunk/tests/numerics/26.valarray.transcend.cpp Wed Jun 25 10:24:43 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/trunk/tests/regress/21.c.strings.stdcxx-843.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/regress/21.c.strings.stdcxx-843.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/regress/21.c.strings.stdcxx-843.cpp (original)
+++ stdcxx/trunk/tests/regress/21.c.strings.stdcxx-843.cpp Wed Jun 25 10:24:43 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/trunk/tests/regress/21.string.io.stdcxx-206.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/regress/21.string.io.stdcxx-206.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/regress/21.string.io.stdcxx-206.cpp (original)
+++ stdcxx/trunk/tests/regress/21.string.io.stdcxx-206.cpp Wed Jun 25 10:24:43 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/trunk/tests/regress/22.locale.cons.stdcxx-485.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/regress/22.locale.cons.stdcxx-485.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/regress/22.locale.cons.stdcxx-485.cpp (original)
+++ stdcxx/trunk/tests/regress/22.locale.cons.stdcxx-485.cpp Wed Jun 25 10:24:43 2008
@@ -31,7 +31,7 @@
#include <locale>
#include <rw_locale.h>
-#include <driver.h>
+#include <rw_driver.h>
static int
Modified: stdcxx/trunk/tests/regress/22.locale.messages.stdcxx-542.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/regress/22.locale.messages.stdcxx-542.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/regress/22.locale.messages.stdcxx-542.cpp (original)
+++ stdcxx/trunk/tests/regress/22.locale.messages.stdcxx-542.cpp Wed Jun 25 10:24:43 2008
@@ -31,7 +31,7 @@
#include <locale>
#include <rw_locale.h>
-#include <driver.h>
+#include <rw_driver.h>
#ifdef _MSC_VER
#include <crtdbg.h>
Modified: stdcxx/trunk/tests/regress/24.operations.stdcxx-234.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/regress/24.operations.stdcxx-234.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/regress/24.operations.stdcxx-234.cpp (original)
+++ stdcxx/trunk/tests/regress/24.operations.stdcxx-234.cpp Wed Jun 25 10:24:43 2008
@@ -43,5 +43,5 @@
int main ()
{
- return std::distance (X (), X ());
+ return int (std::distance (X (), X ()));
}
Modified: stdcxx/trunk/tests/regress/27.filebuf.sgetn.stdcxx-161.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/regress/27.filebuf.sgetn.stdcxx-161.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/regress/27.filebuf.sgetn.stdcxx-161.cpp (original)
+++ stdcxx/trunk/tests/regress/27.filebuf.sgetn.stdcxx-161.cpp Wed Jun 25 10:24:43 2008
@@ -30,7 +30,7 @@
#include <cassert>
#include <cstdio>
-#include <file.h>
+#include <rw_file.h>
int main ()
{
Modified: stdcxx/trunk/tests/regress/27.stringbuf.members.stdcxx-427.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/regress/27.stringbuf.members.stdcxx-427.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/regress/27.stringbuf.members.stdcxx-427.cpp (original)
+++ stdcxx/trunk/tests/regress/27.stringbuf.members.stdcxx-427.cpp Wed Jun 25 10:24:43 2008
@@ -25,6 +25,7 @@
**************************************************************************/
#include <cassert>
+#include <cstdio>
#include <sstream>
int main ()
@@ -46,15 +47,18 @@
{
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 ());
}
}
Modified: stdcxx/trunk/tests/regress/27.stringbuf.overflow.stdcxx-149.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/regress/27.stringbuf.overflow.stdcxx-149.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/regress/27.stringbuf.overflow.stdcxx-149.cpp (original)
+++ stdcxx/trunk/tests/regress/27.stringbuf.overflow.stdcxx-149.cpp Wed Jun 25 10:24:43 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/trunk/tests/self/0.alloc.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/self/0.alloc.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/self/0.alloc.cpp (original)
+++ stdcxx/trunk/tests/self/0.alloc.cpp Wed Jun 25 10:24:43 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/trunk/tests/self/0.braceexp.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/self/0.braceexp.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/self/0.braceexp.cpp (original)
+++ stdcxx/trunk/tests/self/0.braceexp.cpp Wed Jun 25 10:24:43 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/trunk/tests/self/0.char.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/self/0.char.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/self/0.char.cpp (original)
+++ stdcxx/trunk/tests/self/0.char.cpp Wed Jun 25 10:24:43 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/trunk/tests/self/0.cmdopts.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/self/0.cmdopts.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/self/0.cmdopts.cpp (original)
+++ stdcxx/trunk/tests/self/0.cmdopts.cpp Wed Jun 25 10:24:43 2008
@@ -27,7 +27,7 @@
*
**************************************************************************/
-#include <cmdopt.h>
+#include <rw_cmdopt.h>
#include <stdio.h>
#include <string.h>
Modified: stdcxx/trunk/tests/self/0.ctype.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/self/0.ctype.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/self/0.ctype.cpp (original)
+++ stdcxx/trunk/tests/self/0.ctype.cpp Wed Jun 25 10:24:43 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/trunk/tests/self/0.inputiter.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/self/0.inputiter.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/self/0.inputiter.cpp (original)
+++ stdcxx/trunk/tests/self/0.inputiter.cpp Wed Jun 25 10:24:43 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/trunk/tests/self/0.locale.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/self/0.locale.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/self/0.locale.cpp (original)
+++ stdcxx/trunk/tests/self/0.locale.cpp Wed Jun 25 10:24:43 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/trunk/tests/self/0.new.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/self/0.new.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/self/0.new.cpp (original)
+++ stdcxx/trunk/tests/self/0.new.cpp Wed Jun 25 10:24:43 2008
@@ -34,7 +34,7 @@
#include <signal.h> // for SIGABRT, signal()
#include <rw_new.h>
-#include <driver.h>
+#include <rw_driver.h>
/**************************************************************************/
Modified: stdcxx/trunk/tests/self/0.outputiter.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/self/0.outputiter.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/self/0.outputiter.cpp (original)
+++ stdcxx/trunk/tests/self/0.outputiter.cpp Wed Jun 25 10:24:43 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/trunk/tests/self/0.printf.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/self/0.printf.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/self/0.printf.cpp (original)
+++ stdcxx/trunk/tests/self/0.printf.cpp Wed Jun 25 10:24:43 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/trunk/tests/self/0.process.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/self/0.process.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/self/0.process.cpp (original)
+++ stdcxx/trunk/tests/self/0.process.cpp Wed Jun 25 10:24:43 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/trunk/tests/self/0.strncmp.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/self/0.strncmp.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/self/0.strncmp.cpp (original)
+++ stdcxx/trunk/tests/self/0.strncmp.cpp Wed Jun 25 10:24:43 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/trunk/tests/self/0.valcmp.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/self/0.valcmp.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/self/0.valcmp.cpp (original)
+++ stdcxx/trunk/tests/self/0.valcmp.cpp Wed Jun 25 10:24:43 2008
@@ -27,7 +27,7 @@
*
**************************************************************************/
-#include <valcmp.h>
+#include <rw_valcmp.h>
#include <stdio.h> // for fprintf, size_t
Modified: stdcxx/trunk/tests/src/21.strings.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/21.strings.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/21.strings.cpp (original)
+++ stdcxx/trunk/tests/src/21.strings.cpp Wed Jun 25 10:24:43 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/trunk/tests/src/23.containers.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/23.containers.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/23.containers.cpp (original)
+++ stdcxx/trunk/tests/src/23.containers.cpp Wed Jun 25 10:24:43 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/trunk/tests/src/alg_test.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/alg_test.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/alg_test.cpp (original)
+++ stdcxx/trunk/tests/src/alg_test.cpp Wed Jun 25 10:24:43 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/trunk/tests/src/alloc.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/alloc.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/alloc.cpp (original)
+++ stdcxx/trunk/tests/src/alloc.cpp Wed Jun 25 10:24:43 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/trunk/tests/src/allocator.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/allocator.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/allocator.cpp (original)
+++ stdcxx/trunk/tests/src/allocator.cpp Wed Jun 25 10:24:43 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/trunk/tests/src/any.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/any.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/any.cpp (original)
+++ stdcxx/trunk/tests/src/any.cpp Wed Jun 25 10:24:43 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/trunk/tests/src/char.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/char.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/char.cpp (original)
+++ stdcxx/trunk/tests/src/char.cpp Wed Jun 25 10:24:43 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()
@@ -1204,7 +1204,7 @@
else if (isdigit (UChar (*fmt))) {
// process positional parameter or width
char* end = 0;
- const int arg = strtol (fmt, &end, 10);
+ const int arg = int (strtol (fmt, &end, 10));
if ('$' == *end)
paramno = arg;
else
Modified: stdcxx/trunk/tests/src/cmdopt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/cmdopt.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/cmdopt.cpp (original)
+++ stdcxx/trunk/tests/src/cmdopt.cpp Wed Jun 25 10:24:43 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
@@ -364,10 +364,10 @@
if (have_maxval) {
_rw_cmdopts [_rw_ncmdopts].minval_ = 0;
- _rw_cmdopts [_rw_ncmdopts].maxval_ = val;
+ _rw_cmdopts [_rw_ncmdopts].maxval_ = int (val);
}
else
- _rw_cmdopts [_rw_ncmdopts].minval_ = val;
+ _rw_cmdopts [_rw_ncmdopts].minval_ = int (val);
if (sep == *next && !have_maxval) {
++next;
@@ -704,7 +704,7 @@
else if (optspec->pcntr_) {
// set the counter
- *optspec->pcntr_ = optval;
+ *optspec->pcntr_ = int (optval);
}
return status;
Modified: stdcxx/trunk/tests/src/ctype.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/ctype.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/ctype.cpp (original)
+++ stdcxx/trunk/tests/src/ctype.cpp Wed Jun 25 10:24:43 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/trunk/tests/src/driver.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/driver.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/driver.cpp (original)
+++ stdcxx/trunk/tests/src/driver.cpp Wed Jun 25 10:24:43 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>
/************************************************************************/