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 [3/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/src/environ.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/environ.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/environ.cpp (original)
+++ stdcxx/trunk/tests/src/environ.cpp Wed Jun 25 10:24:43 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/trunk/tests/src/exception.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/exception.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/exception.cpp (original)
+++ stdcxx/trunk/tests/src/exception.cpp Wed Jun 25 10:24:43 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/trunk/tests/src/file.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/file.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/file.cpp (original)
+++ stdcxx/trunk/tests/src/file.cpp Wed Jun 25 10:24:43 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/trunk/tests/src/fmt_bits.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/fmt_bits.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/fmt_bits.cpp (original)
+++ stdcxx/trunk/tests/src/fmt_bits.cpp Wed Jun 25 10:24:43 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/trunk/tests/src/fmt_defs.h
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/fmt_defs.h?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/fmt_defs.h (original)
+++ stdcxx/trunk/tests/src/fmt_defs.h Wed Jun 25 10:24:43 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/trunk/tests/src/locale.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/locale.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/locale.cpp (original)
+++ stdcxx/trunk/tests/src/locale.cpp Wed Jun 25 10:24:43 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
@@ -457,7 +456,7 @@
}
// if successful, construct a char array with the locales
- while (fgets (linebuf, sizeof linebuf, file)) {
+ while (fgets (linebuf, int (sizeof linebuf), file)) {
const size_t linelen = strlen (linebuf);
@@ -1150,7 +1149,7 @@
}
char locale [128];
- while (fgets (locale, sizeof (locale), file)) {
+ while (fgets (locale, int (sizeof (locale)), file)) {
// ensure sufficient space in array
if (! (size < capacity)) {
Modified: stdcxx/trunk/tests/src/new.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/new.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/new.cpp (original)
+++ stdcxx/trunk/tests/src/new.cpp Wed Jun 25 10:24:43 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/trunk/tests/src/opt_diags.h
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/opt_diags.h?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/opt_diags.h (original)
+++ stdcxx/trunk/tests/src/opt_diags.h Wed Jun 25 10:24:43 2008
@@ -30,7 +30,7 @@
#define RW_OPT_DIAGS_H_INCLUDED
-#include <testdefs.h>
+#include <rw_testdefs.h>
enum diag_t {
Modified: stdcxx/trunk/tests/src/opt_lines.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/opt_lines.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/opt_lines.cpp (original)
+++ stdcxx/trunk/tests/src/opt_lines.cpp Wed Jun 25 10:24:43 2008
@@ -31,7 +31,7 @@
#include "opt_lines.h"
-#include <cmdopt.h>
+#include <rw_cmdopt.h>
#include <assert.h>
#include <stdio.h>
@@ -187,7 +187,7 @@
parg = end;
if (0 <= first && first < line) {
- _rw_enable_lines (first, line, flags);
+ _rw_enable_lines (int (first), int (line), flags);
first = -1;
}
}
Modified: stdcxx/trunk/tests/src/opt_lines.h
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/opt_lines.h?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/opt_lines.h (original)
+++ stdcxx/trunk/tests/src/opt_lines.h Wed Jun 25 10:24:43 2008
@@ -30,7 +30,7 @@
#define RW_OPT_LINES_H_INCLUDED
-#include <testdefs.h>
+#include <rw_testdefs.h>
extern int
Modified: stdcxx/trunk/tests/src/opt_trace.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/opt_trace.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/opt_trace.cpp (original)
+++ stdcxx/trunk/tests/src/opt_trace.cpp Wed Jun 25 10:24:43 2008
@@ -172,7 +172,7 @@
parg = end;
if (0 <= first && first < severity) {
- for (int i = first; i != severity; ++i)
+ for (long i = first; i != severity; ++i)
diag_set |= 1 << i;
severity = -1;
}
Modified: stdcxx/trunk/tests/src/opt_types.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/opt_types.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/opt_types.cpp (original)
+++ stdcxx/trunk/tests/src/opt_types.cpp Wed Jun 25 10:24:43 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/trunk/tests/src/opt_types.h
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/opt_types.h?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/opt_types.h (original)
+++ stdcxx/trunk/tests/src/opt_types.h Wed Jun 25 10:24:43 2008
@@ -30,7 +30,7 @@
#define RW_OPT_TYPES_H_INCLUDED
-#include <testdefs.h>
+#include <rw_testdefs.h>
int _rw_setopts_types ();
Modified: stdcxx/trunk/tests/src/printf.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/printf.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/printf.cpp (original)
+++ stdcxx/trunk/tests/src/printf.cpp Wed Jun 25 10:24:43 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/trunk/tests/src/process.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/process.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/process.cpp (original)
+++ stdcxx/trunk/tests/src/process.cpp Wed Jun 25 10:24:43 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__
@@ -573,7 +572,7 @@
rw_pid_t ret = 0;
do {
- ret = waitpid (pid, &status, 0);
+ ret = waitpid (pid_t (pid), &status, 0);
if (-1 == ret) {
@@ -636,7 +635,7 @@
if (0 < timeout) {
if (prev_alarm_timeout) {
- const int delta = time(0) - start;
+ const int delta = int (time(0) - start);
if (delta < prev_alarm_timeout)
prev_alarm_timeout -= delta;
@@ -707,14 +706,14 @@
const int* const signals = (-1 == signo) ? signals_ : &signo;
const unsigned sigcount =
- (-1 == signo) ? sizeof (signals_) / sizeof (*signals_) : 1;
+ (-1 == signo) ? unsigned (sizeof (signals_) / sizeof (*signals_)) : 1;
int ret = -1;
for (unsigned i = 0; i < sigcount; ++i) {
// send signal
- ret = kill (pid, signals [i]);
+ ret = kill (pid_t (pid), signals [i]);
if (-1 == ret) {
rw_error (0, __FILE__, __LINE__,
Modified: stdcxx/trunk/tests/src/rand.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/rand.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/rand.cpp (original)
+++ stdcxx/trunk/tests/src/rand.cpp Wed Jun 25 10:24:43 2008
@@ -44,7 +44,7 @@
rw_seed32 (_RWSTD_UINT32_T seed)
{
if (0xffffffffUL == seed)
- seed = clock ();
+ seed = unsigned (clock ());
table32 [TABLE_SIZE - 1] = seed;
Modified: stdcxx/trunk/tests/src/thread.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/thread.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/thread.cpp (original)
+++ stdcxx/trunk/tests/src/thread.cpp Wed Jun 25 10:24:43 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()
@@ -492,7 +493,7 @@
// apply timeout if one was specified
if (0 != timeout) {
_rw_timeout_expired = 0;
- rw_alarm (timeout, _rw_timeout_handler);
+ rw_alarm (unsigned (timeout), _rw_timeout_handler);
}
// small buffer for thread ids when invoked with (thr_id == 0)
Modified: stdcxx/trunk/tests/src/valcmp.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/valcmp.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/valcmp.cpp (original)
+++ stdcxx/trunk/tests/src/valcmp.cpp Wed Jun 25 10:24:43 2008
@@ -27,7 +27,7 @@
// expand _TEST_EXPORT macros
#define _RWSTD_TEST_SRC
-#include <valcmp.h>
+#include <rw_valcmp.h>
#include <stdio.h> // for fprintf, stderr
#include <stdlib.h> // for abort
Modified: stdcxx/trunk/tests/src/value.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/value.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/value.cpp (original)
+++ stdcxx/trunk/tests/src/value.cpp Wed Jun 25 10:24:43 2008
@@ -740,7 +740,7 @@
else if (isdigit (*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)
nelems = arg;
@@ -774,7 +774,7 @@
}
else if (isdigit (*fmt)) {
char* end = 0;
- cursor = strtol (fmt, &end, 10);
+ cursor = int (strtol (fmt, &end, 10));
fmt = end;
}
Modified: stdcxx/trunk/tests/strings/21.cctype.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.cctype.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.cctype.cpp (original)
+++ stdcxx/trunk/tests/strings/21.cctype.cpp Wed Jun 25 10:24:43 2008
@@ -28,7 +28,8 @@
**************************************************************************/
#include <cctype>
-#include <driver.h>
+
+#include <rw_driver.h>
/**************************************************************************/
Modified: stdcxx/trunk/tests/strings/21.cwchar.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.cwchar.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.cwchar.cpp (original)
+++ stdcxx/trunk/tests/strings/21.cwchar.cpp Wed Jun 25 10:24:43 2008
@@ -88,8 +88,9 @@
/**************************************************************************/
#include <cwchar>
-#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(), ...
/**************************************************************************/
@@ -991,7 +992,8 @@
// included here to avoid namespace pollution
#include <cstdarg> // for va_list
#include <cstdio> // for FILE, fopen()
-#include <file.h> // for DEV_NUL
+
+#include <rw_file.h> // for DEV_NUL
#include <rw_printf.h> // for rw_stdout
namespace std {
Modified: stdcxx/trunk/tests/strings/21.cwctype.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.cwctype.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.cwctype.cpp (original)
+++ stdcxx/trunk/tests/strings/21.cwctype.cpp Wed Jun 25 10:24:43 2008
@@ -28,7 +28,8 @@
**************************************************************************/
#include <cwctype>
-#include <driver.h>
+
+#include <rw_driver.h>
/**************************************************************************/
@@ -82,6 +83,7 @@
"iswlower",
#else
"",
+#endif
#ifdef iswprint
# undef iswprint
@@ -118,8 +120,6 @@
"",
#endif
-#endif
-
#ifdef tolower
# undef tolower
"tolower",
Modified: stdcxx/trunk/tests/strings/21.string.access.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.access.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.access.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.access.cpp Wed Jun 25 10:24:43 2008
@@ -30,8 +30,8 @@
#include <cstdlib> // for free(), size_t
#include <stdexcept> // for out_of_range
-#include <21.strings.h> // for StringMembers
-#include <driver.h> // for rw_test()
+#include <rw_strings.h> // for StringMembers
+#include <rw_driver.h> // for rw_test()
#include <rw_allocator.h> // for UserAlloc
#include <rw_char.h> // for rw_expand()
Modified: stdcxx/trunk/tests/strings/21.string.append.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.append.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.append.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.append.cpp Wed Jun 25 10:24:43 2008
@@ -28,9 +28,9 @@
#include <stdexcept> // for out_of_range, length_error
#include <cstddef> // for size_t
-#include <21.strings.h> // for StringMembers
-#include <alg_test.h> // for InputIter
-#include <driver.h> // for rw_test()
+#include <rw_strings.h> // for StringMembers
+#include <rw_alg_test.h> // for InputIter
+#include <rw_driver.h> // for rw_test()
#include <rw_allocator.h> // for UserAlloc
#include <rw_char.h> // for rw_expand()
#include <rw_new.h> // for bad_alloc, replacement operator new
Modified: stdcxx/trunk/tests/strings/21.string.assign.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.assign.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.assign.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.assign.cpp Wed Jun 25 10:24:43 2008
@@ -28,9 +28,9 @@
#include <cstddef> // for size_t
#include <stdexcept> // for out_of_range, length_error
-#include <21.strings.h> // for StringMembers
-#include <alg_test.h> // for InputIter
-#include <driver.h> // for rw_test()
+#include <rw_strings.h> // for StringMembers
+#include <rw_alg_test.h> // for InputIter
+#include <rw_driver.h> // for rw_test()
#include <rw_allocator.h> // for UserAlloc
#include <rw_char.h> // for rw_expand()
#include <rw_new.h> // for bad_alloc, replacement operator new
Modified: stdcxx/trunk/tests/strings/21.string.capacity.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.capacity.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.capacity.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.capacity.cpp Wed Jun 25 10:24:43 2008
@@ -30,8 +30,8 @@
#include <cstddef> // for ptrdiff_t, size_t
#include <stdexcept> // for out_of_range
-#include <21.strings.h> // for StringMembers
-#include <driver.h> // for rw_test()
+#include <rw_strings.h> // for StringMembers
+#include <rw_driver.h> // for rw_test()
#include <rw_allocator.h> // for UserAlloc
#include <rw_char.h> // for rw_expand()
#include <rw_new.h> // for bad_alloc, replacement operator new
Modified: stdcxx/trunk/tests/strings/21.string.compare.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.compare.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.compare.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.compare.cpp Wed Jun 25 10:24:43 2008
@@ -30,8 +30,8 @@
#include <cstddef> // for size_t
#include <stdexcept> // for out_of_range, length_error
-#include <21.strings.h> // for StringMembers
-#include <driver.h> // for rw_assert()
+#include <rw_strings.h> // for StringMembers
+#include <rw_driver.h> // for rw_assert()
#include <rw_allocator.h> // for UserAlloc
#include <rw_char.h> // for rw_expand()
Modified: stdcxx/trunk/tests/strings/21.string.cons.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.cons.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.cons.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.cons.cpp Wed Jun 25 10:24:43 2008
@@ -28,9 +28,9 @@
#include <stdexcept> // for out_of_range, length_error
#include <cstddef> // for size_t
-#include <21.strings.h>
-#include <alg_test.h> // for InputIter
-#include <driver.h> // for rw_test()
+#include <rw_strings.h>
+#include <rw_alg_test.h> // for InputIter
+#include <rw_driver.h> // for rw_test()
#include <rw_allocator.h> // for UserAlloc
#include <rw_char.h> // for rw_expand()
#include <rw_new.h> // for bad_alloc, replacement operator new
Modified: stdcxx/trunk/tests/strings/21.string.cons.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.cons.mt.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.cons.mt.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.cons.mt.cpp Wed Jun 25 10:24:43 2008
@@ -31,9 +31,9 @@
#include <cstddef> // for size_t
-#include <driver.h> // for rw_test()
+#include <rw_driver.h> // for rw_test()
#include <rw_thread.h> // for rw_thread_pool(), ...
-#include <valcmp.h> // for rw_strncmp()
+#include <rw_valcmp.h> // for rw_strncmp()
/**************************************************************************/
Modified: stdcxx/trunk/tests/strings/21.string.copy.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.copy.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.copy.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.copy.cpp Wed Jun 25 10:24:43 2008
@@ -30,8 +30,8 @@
#include <cstddef> // size_t
#include <stdexcept> // for out_of_range
-#include <21.strings.h> // for StringMembers
-#include <driver.h> // for rw_assert()
+#include <rw_strings.h> // for StringMembers
+#include <rw_driver.h> // for rw_assert()
#include <rw_allocator.h> // for UserAlloc
#include <rw_char.h> // for rw_expand()
Modified: stdcxx/trunk/tests/strings/21.string.erase.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.erase.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.erase.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.erase.cpp Wed Jun 25 10:24:43 2008
@@ -30,8 +30,8 @@
#include <cstddef> // for ptrdiff_t, size_t
#include <stdexcept> // for out_of_range
-#include <21.strings.h> // for StringMembers
-#include <driver.h> // for rw_test()
+#include <rw_strings.h> // for StringMembers
+#include <rw_driver.h> // for rw_test()
#include <rw_allocator.h> // for UserAlloc
#include <rw_char.h> // for rw_expand()
#include <rw_new.h> // for bad_alloc, replacement operator new
Modified: stdcxx/trunk/tests/strings/21.string.exceptions.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.exceptions.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.exceptions.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.exceptions.cpp Wed Jun 25 10:24:43 2008
@@ -31,7 +31,7 @@
#include <stdexcept>
#include <string>
-#include <driver.h>
+#include <rw_driver.h>
// uses setjmp() and longjmp() to verify correct function if exception
// exception support is disabled
Modified: stdcxx/trunk/tests/strings/21.string.find.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.find.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.find.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.find.cpp Wed Jun 25 10:24:43 2008
@@ -30,8 +30,8 @@
#include <cstddef> // size_t
#include <exception> // for exception
-#include <21.strings.h> // for StringMembers
-#include <driver.h> // for rw_assert()
+#include <rw_strings.h> // for StringMembers
+#include <rw_driver.h> // for rw_assert()
#include <rw_allocator.h> // for UserAlloc
#include <rw_char.h> // for rw_expand()
Modified: stdcxx/trunk/tests/strings/21.string.find.first.not.of.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.find.first.not.of.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.find.first.not.of.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.find.first.not.of.cpp Wed Jun 25 10:24:43 2008
@@ -29,8 +29,8 @@
#include <cstdlib> // for free(), size_t
#include <stdexcept> // for length_error
-#include <21.strings.h> // for StringMembers
-#include <driver.h> // for rw_test()
+#include <rw_strings.h> // for StringMembers
+#include <rw_driver.h> // for rw_test()
#include <rw_allocator.h> // for UserAlloc
#include <rw_char.h> // for rw_expand()
Modified: stdcxx/trunk/tests/strings/21.string.find.first.of.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.find.first.of.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.find.first.of.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.find.first.of.cpp Wed Jun 25 10:24:43 2008
@@ -31,8 +31,8 @@
#include <cstdlib> // for free(), size_t
#include <stdexcept> // for length_error
-#include <21.strings.h> // for StringMembers
-#include <driver.h> // for rw_test()
+#include <rw_strings.h> // for StringMembers
+#include <rw_driver.h> // for rw_test()
#include <rw_allocator.h> // for UserAlloc
#include <rw_char.h> // for rw_expand()
Modified: stdcxx/trunk/tests/strings/21.string.find.last.not.of.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.find.last.not.of.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.find.last.not.of.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.find.last.not.of.cpp Wed Jun 25 10:24:43 2008
@@ -31,8 +31,8 @@
#include <cstdlib> // for free(), size_t
#include <stdexcept> // for length_error
-#include <21.strings.h> // for StringMembers
-#include <driver.h> // for rw_test()
+#include <rw_strings.h> // for StringMembers
+#include <rw_driver.h> // for rw_test()
#include <rw_allocator.h> // for UserAlloc
#include <rw_char.h> // for rw_expand()
Modified: stdcxx/trunk/tests/strings/21.string.find.last.of.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.find.last.of.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.find.last.of.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.find.last.of.cpp Wed Jun 25 10:24:43 2008
@@ -30,8 +30,8 @@
#include <cstddef> // for size_t
#include <stdexcept> // for length_error
-#include <21.strings.h> // for StringIds
-#include <driver.h> // for rw_test()
+#include <rw_strings.h> // for StringIds
+#include <rw_driver.h> // for rw_test()
#include <rw_allocator.h> // for UserAlloc
#include <rw_char.h> // for rw_expand()
Modified: stdcxx/trunk/tests/strings/21.string.insert.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.insert.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.insert.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.insert.cpp Wed Jun 25 10:24:43 2008
@@ -28,9 +28,9 @@
#include <stdexcept> // for out_of_range, length_error
#include <cstddef> // for size_t
-#include <21.strings.h> // for StringIds
-#include <alg_test.h> // for InputIter
-#include <driver.h> // for rw_test()
+#include <rw_strings.h> // for StringIds
+#include <rw_alg_test.h> // for InputIter
+#include <rw_driver.h> // for rw_test()
#include <rw_allocator.h> // for UserAlloc
#include <rw_char.h> // for rw_expand()
#include <rw_new.h> // for bad_alloc, replacement operator new
Modified: stdcxx/trunk/tests/strings/21.string.io.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.io.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.io.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.io.cpp Wed Jun 25 10:24:43 2008
@@ -31,8 +31,8 @@
#include <ostream> // for ostream
#include <locale> // for locale
-#include <21.strings.h> // for StringMembers
-#include <driver.h> // for rw_test()
+#include <rw_strings.h> // for StringMembers
+#include <rw_driver.h> // for rw_test()
#include <rw_allocator.h> // for UserAlloc
#include <rw_char.h> // for rw_expand()
#include <rw_ctype.h> // for UserCtype
@@ -994,14 +994,15 @@
else if (0 == tcase.bthrow) {
// set on which call of which method to throw
sbuf.throw_when_ [sbuf.memfun_inx (
- test_inserter ? Overflow : Underflow) ] = throw_on [throw_inx];
+ test_inserter ? Overflow : Underflow) ] =
+ int (throw_on [throw_inx]);
sbuf.throw_when_ [sbuf.memfun_inx (Xsgetn)] =
- throw_count [0];
+ int (throw_count [0]);
sbuf.throw_when_ [sbuf.memfun_inx (Sync)] =
- throw_count [1];
+ int (throw_count [1]);
sbuf.throw_when_ [sbuf.memfun_inx (Xsputn)] =
- throw_count [2];
+ int (throw_count [2]);
}
else {
// exceptions disabled for this test case
Modified: stdcxx/trunk/tests/strings/21.string.iterators.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.iterators.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.iterators.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.iterators.cpp Wed Jun 25 10:24:43 2008
@@ -30,8 +30,8 @@
#include <stdexcept> // for out_of_range, length_error
#include <cstddef> // for size_t
-#include <21.strings.h> // for StringMembers
-#include <driver.h> // for rw_test()
+#include <rw_strings.h> // for StringMembers
+#include <rw_driver.h> // for rw_test()
#include <rw_allocator.h> // for UserAlloc
#include <rw_char.h> // for rw_expand()
#include <rw_new.h> // for bad_alloc, replacement operator new
Modified: stdcxx/trunk/tests/strings/21.string.op.plus.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.op.plus.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.op.plus.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.op.plus.cpp Wed Jun 25 10:24:43 2008
@@ -31,9 +31,9 @@
#include <cstddef> // for size_t
-#include <21.strings.h> // for StringMembers
-#include <alg_test.h> // for InputIter
-#include <driver.h> // for rw_test()
+#include <rw_strings.h> // for StringMembers
+#include <rw_alg_test.h> // for InputIter
+#include <rw_driver.h> // for rw_test()
#include <rw_allocator.h> // for UserAlloc
#include <rw_char.h> // for rw_expand()
#include <rw_new.h> // for bad_alloc, replacement operator new
Modified: stdcxx/trunk/tests/strings/21.string.op.plus.equal.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.op.plus.equal.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.op.plus.equal.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.op.plus.equal.cpp Wed Jun 25 10:24:43 2008
@@ -31,9 +31,9 @@
#include <cstddef> // for size_t
-#include <21.strings.h> // for StringIds
-#include <alg_test.h> // for InputIter
-#include <driver.h> // for rw_test()
+#include <rw_strings.h> // for StringIds
+#include <rw_alg_test.h> // for InputIter
+#include <rw_driver.h> // for rw_test()
#include <rw_allocator.h> // for UserAlloc
#include <rw_char.h> // for rw_expand()
#include <rw_new.h> // for bad_alloc, replacement operator new
Modified: stdcxx/trunk/tests/strings/21.string.operators.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.operators.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.operators.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.operators.cpp Wed Jun 25 10:24:43 2008
@@ -32,8 +32,8 @@
#include <cstddef> // for size_t
-#include <21.strings.h> // for StringMembers
-#include <driver.h> // for rw_test()
+#include <rw_strings.h> // for StringMembers
+#include <rw_driver.h> // for rw_test()
#include <rw_allocator.h> // for UserAlloc
#include <rw_char.h> // for rw_expand()
#include <rw_new.h> // for bad_alloc, replacement operator new
Modified: stdcxx/trunk/tests/strings/21.string.push_back.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.push_back.mt.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.push_back.mt.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.push_back.mt.cpp Wed Jun 25 10:24:43 2008
@@ -30,9 +30,9 @@
#include <string> // for string
#include <cstddef> // for size_t
-#include <driver.h> // for rw_test()
+#include <rw_driver.h> // for rw_test()
#include <rw_thread.h> // for rw_thread_pool(), ...
-#include <valcmp.h> // for rw_strncmp()
+#include <rw_valcmp.h> // for rw_strncmp()
/**************************************************************************/
Modified: stdcxx/trunk/tests/strings/21.string.replace.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.replace.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.replace.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.replace.cpp Wed Jun 25 10:24:43 2008
@@ -30,9 +30,9 @@
#include <stdexcept> // for out_of_range, length_error
#include <cstddef> // for ptrdiff_t, size_t
-#include <21.strings.h>
-#include <alg_test.h> // for InputIter
-#include <driver.h> // for rw_test()
+#include <rw_strings.h>
+#include <rw_alg_test.h> // for InputIter
+#include <rw_driver.h> // for rw_test()
#include <rw_allocator.h> // for UserAlloc
#include <rw_new.h> // for bad_alloc, replacement operator new
Modified: stdcxx/trunk/tests/strings/21.string.rfind.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.rfind.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.rfind.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.rfind.cpp Wed Jun 25 10:24:43 2008
@@ -30,8 +30,8 @@
#include <cstdlib> // for free(), size_t
#include <exception> // for exception
-#include <21.strings.h> // for StringIds
-#include <driver.h> // for rw_test()
+#include <rw_strings.h> // for StringIds
+#include <rw_driver.h> // for rw_test()
#include <rw_allocator.h> // for UserAlloc
#include <rw_char.h> // for rw_expand()
Modified: stdcxx/trunk/tests/strings/21.string.substr.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.substr.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.substr.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.substr.cpp Wed Jun 25 10:24:43 2008
@@ -30,8 +30,8 @@
#include <cstddef> // for size_t
#include <stdexcept> // for out_of_range
-#include <21.strings.h> // for StringIds
-#include <driver.h> // for rw_test()
+#include <rw_strings.h> // for StringIds
+#include <rw_driver.h> // for rw_test()
#include <rw_allocator.h> // for UserAlloc
#include <rw_char.h> // for rw_expand()
Modified: stdcxx/trunk/tests/strings/21.string.swap.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/strings/21.string.swap.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/strings/21.string.swap.cpp (original)
+++ stdcxx/trunk/tests/strings/21.string.swap.cpp Wed Jun 25 10:24:43 2008
@@ -30,8 +30,8 @@
#include <cstddef> // size_t
#include <exception> // for exception
-#include <21.strings.h> // for StringIds
-#include <driver.h> // for rw_assert()
+#include <rw_strings.h> // for StringIds
+#include <rw_driver.h> // for rw_assert()
#include <rw_allocator.h> // foir UserAlloc
#include <rw_char.h> // for rw_expand()
#include <rw_new.h> // for bad_alloc, replacement operator new
Modified: stdcxx/trunk/tests/support/18.csetjmp.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/support/18.csetjmp.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/support/18.csetjmp.cpp (original)
+++ stdcxx/trunk/tests/support/18.csetjmp.cpp Wed Jun 25 10:24:43 2008
@@ -27,7 +27,8 @@
**************************************************************************/
#include <csetjmp>
-#include <driver.h>
+
+#include <rw_driver.h>
/**************************************************************************/
Modified: stdcxx/trunk/tests/support/18.cstdint.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/support/18.cstdint.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/support/18.cstdint.cpp (original)
+++ stdcxx/trunk/tests/support/18.cstdint.cpp Wed Jun 25 10:24:43 2008
@@ -68,7 +68,7 @@
};
-#include <driver.h>
+#include <rw_driver.h>
#ifndef _RWSTD_NO_EXT_CXX_0X
Modified: stdcxx/trunk/tests/support/18.exception.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/support/18.exception.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/support/18.exception.cpp (original)
+++ stdcxx/trunk/tests/support/18.exception.cpp Wed Jun 25 10:24:43 2008
@@ -48,7 +48,7 @@
# include <sys/resource.h> // for setrlimit()
#endif // _RWSTD_NO_SETRLIMIT
-#include <driver.h>
+#include <rw_driver.h>
#ifdef _RWSTD_OS_LINUX
Modified: stdcxx/trunk/tests/support/18.limits.cvqual.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/support/18.limits.cvqual.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/support/18.limits.cvqual.cpp (original)
+++ stdcxx/trunk/tests/support/18.limits.cvqual.cpp Wed Jun 25 10:24:43 2008
@@ -31,7 +31,8 @@
**************************************************************************/
#include <limits>
-#include <driver.h>
+
+#include <rw_driver.h>
/**************************************************************************/
Modified: stdcxx/trunk/tests/support/18.limits.traps.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/support/18.limits.traps.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/support/18.limits.traps.cpp (original)
+++ stdcxx/trunk/tests/support/18.limits.traps.cpp Wed Jun 25 10:24:43 2008
@@ -30,9 +30,9 @@
#include <csignal> // for SIGFPE, signal
-#include <any.h> // for rw_any_t
-#include <cmdopt.h> // for rw_enabled()
-#include <driver.h> // for rw_test(), ...
+#include <rw_any.h> // for rw_any_t
+#include <rw_cmdopt.h> // for rw_enabled()
+#include <rw_driver.h> // for rw_test(), ...
/**************************************************************************/
Modified: stdcxx/trunk/tests/support/18.numeric.special.float.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/support/18.numeric.special.float.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/support/18.numeric.special.float.cpp (original)
+++ stdcxx/trunk/tests/support/18.numeric.special.float.cpp Wed Jun 25 10:24:43 2008
@@ -51,7 +51,7 @@
# include <ieeefp.h> // for fpclass, isnan
#endif // _RWSTD_NO_IEEEFP_H
-#include <driver.h>
+#include <rw_driver.h>
// use FLT_ROUNDS if available, otherwise (e.g., when <ieeefp.h> must
// be #included to bring the macro in), fall back on our own macro
Modified: stdcxx/trunk/tests/support/18.numeric.special.int.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/support/18.numeric.special.int.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/support/18.numeric.special.int.cpp (original)
+++ stdcxx/trunk/tests/support/18.numeric.special.int.cpp Wed Jun 25 10:24:43 2008
@@ -31,7 +31,7 @@
#include <climits> // for {CHAR,SHRT,INT,LONG}_{MIN,MAX}, etc.
#include <cstdio> // for sprintf()
-#include <driver.h>
+#include <rw_driver.h>
template <class T>
Modified: stdcxx/trunk/tests/support/18.setjmp.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/support/18.setjmp.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/support/18.setjmp.cpp (original)
+++ stdcxx/trunk/tests/support/18.setjmp.cpp Wed Jun 25 10:24:43 2008
@@ -27,7 +27,8 @@
**************************************************************************/
#include <setjmp.h>
-#include <driver.h>
+
+#include <rw_driver.h>
/**************************************************************************/
Modified: stdcxx/trunk/tests/support/18.support.dynamic.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/support/18.support.dynamic.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/support/18.support.dynamic.cpp (original)
+++ stdcxx/trunk/tests/support/18.support.dynamic.cpp Wed Jun 25 10:24:43 2008
@@ -28,7 +28,8 @@
#include <new>
#include <memory>
-#include <driver.h>
+
+#include <rw_driver.h>
#include <rw/_defs.h>
#include <rw/_error.h>
Modified: stdcxx/trunk/tests/support/18.support.rtti.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/support/18.support.rtti.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/support/18.support.rtti.cpp (original)
+++ stdcxx/trunk/tests/support/18.support.rtti.cpp Wed Jun 25 10:24:43 2008
@@ -47,8 +47,9 @@
#include <typeinfo>
-#include <driver.h>
-#include <valcmp.h>
+
+#include <rw_driver.h>
+#include <rw_valcmp.h>
// polymorphic classes (10.3, p1) used in tests below
struct B { virtual ~B () { } };
@@ -96,6 +97,13 @@
_RWSTD_UNUSED (p_name);
}
+#if defined (__IBMCPP__) && !defined (__RTTI_TYPE_INFO__)
+
+ rw_warn (0, 0, __LINE__,
+ "not testing type_info; rtti is disabled");
+
+#else // !__IBMCPP__ || __RTTI_TYPE_INFO__
+
if (1) {
// exercise 18.5.1, class type_info functionality
D1 d1;
@@ -178,6 +186,8 @@
d1_name, d2_name);
}
+#endif // !__IBMCPP__ || __RTTI_TYPE_INFO__
+
if (1) {
// exercise 18.5.2, class bad_cast interface
Modified: stdcxx/trunk/tests/support/atomic_add.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/support/atomic_add.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/support/atomic_add.cpp (original)
+++ stdcxx/trunk/tests/support/atomic_add.cpp Wed Jun 25 10:24:43 2008
@@ -32,9 +32,9 @@
#include <rw/_mutex.h>
-#include <any.h>
-#include <cmdopt.h>
-#include <driver.h>
+#include <rw_any.h>
+#include <rw_cmdopt.h>
+#include <rw_driver.h>
#include <rw_thread.h> // for rw_thread_create()
/**************************************************************************/
Modified: stdcxx/trunk/tests/support/atomic_xchg.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/support/atomic_xchg.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/support/atomic_xchg.cpp (original)
+++ stdcxx/trunk/tests/support/atomic_xchg.cpp Wed Jun 25 10:24:43 2008
@@ -32,9 +32,9 @@
#include <rw/_mutex.h>
-#include <any.h>
-#include <cmdopt.h>
-#include <driver.h>
+#include <rw_any.h>
+#include <rw_cmdopt.h>
+#include <rw_driver.h>
#include <rw_thread.h> // for rw_thread_create()
/**************************************************************************/
Modified: stdcxx/trunk/tests/utilities/20.auto.ptr.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/utilities/20.auto.ptr.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/utilities/20.auto.ptr.cpp (original)
+++ stdcxx/trunk/tests/utilities/20.auto.ptr.cpp Wed Jun 25 10:24:43 2008
@@ -88,8 +88,8 @@
/**************************************************************************/
-#include <cmdopt.h> // for rw_enabled()
-#include <driver.h> // for rw_assert(), rw_test(), ...
+#include <rw_cmdopt.h> // for rw_enabled()
+#include <rw_driver.h> // for rw_assert(), rw_test(), ...
/**************************************************************************/
Modified: stdcxx/trunk/tests/utilities/20.function.objects.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/utilities/20.function.objects.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/utilities/20.function.objects.cpp (original)
+++ stdcxx/trunk/tests/utilities/20.function.objects.cpp Wed Jun 25 10:24:43 2008
@@ -27,7 +27,8 @@
**************************************************************************/
#include <functional>
-#include <driver.h>
+
+#include <rw_driver.h>
#if defined (__HP_aCC) && _RWSTD_HP_aCC_MAJOR < 6
Modified: stdcxx/trunk/tests/utilities/20.meta.help.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/utilities/20.meta.help.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/utilities/20.meta.help.cpp (original)
+++ stdcxx/trunk/tests/utilities/20.meta.help.cpp Wed Jun 25 10:24:43 2008
@@ -29,7 +29,7 @@
#include <type_traits>
-#include <driver.h>
+#include <rw_driver.h>
// compile out all test code if extensions disabled
#ifndef _RWSTD_NO_EXT_CXX_0X
Modified: stdcxx/trunk/tests/utilities/20.operators.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/utilities/20.operators.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/utilities/20.operators.cpp (original)
+++ stdcxx/trunk/tests/utilities/20.operators.cpp Wed Jun 25 10:24:43 2008
@@ -58,7 +58,7 @@
#include <utility>
#include <cstddef> // for std::size_t
-#include <driver.h>
+#include <rw_driver.h>
/**************************************************************************/
@@ -169,7 +169,7 @@
template <class T>
struct RandomNumberGenerator
{
- T operator() (int) const {
+ T operator() (T) const {
return T ();
}
};
@@ -397,7 +397,7 @@
typedef RandomAccessIterator I;
- RandomNumberGenerator<T> rndgen;
+ RandomNumberGenerator<typename I::difference_type> rndgen;
std::random_shuffle (I (), I ());
std::random_shuffle (I (), I (), rndgen);
Modified: stdcxx/trunk/tests/utilities/20.pairs.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/utilities/20.pairs.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/utilities/20.pairs.cpp (original)
+++ stdcxx/trunk/tests/utilities/20.pairs.cpp Wed Jun 25 10:24:43 2008
@@ -28,9 +28,9 @@
#include <utility>
-#include <alg_test.h>
+#include <rw_alg_test.h>
#include <rw_value.h> // for UserClass
-#include <driver.h>
+#include <rw_driver.h>
/**************************************************************************/
Modified: stdcxx/trunk/tests/utilities/20.smartptr.shared.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/utilities/20.smartptr.shared.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/utilities/20.smartptr.shared.cpp (original)
+++ stdcxx/trunk/tests/utilities/20.smartptr.shared.cpp Wed Jun 25 10:24:43 2008
@@ -27,7 +27,7 @@
*
**************************************************************************/
-#include <driver.h>
+#include <rw_driver.h>
// compile out all test code if extensions disabled
#ifndef _RWSTD_NO_EXT_CXX_0X
Modified: stdcxx/trunk/tests/utilities/20.smartptr.weak.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/utilities/20.smartptr.weak.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/utilities/20.smartptr.weak.cpp (original)
+++ stdcxx/trunk/tests/utilities/20.smartptr.weak.cpp Wed Jun 25 10:24:43 2008
@@ -27,7 +27,7 @@
*
**************************************************************************/
-#include <driver.h>
+#include <rw_driver.h>
// compile out all test code if extensions disabled
#ifndef _RWSTD_NO_EXT_CXX_0X
Modified: stdcxx/trunk/tests/utilities/20.specialized.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/utilities/20.specialized.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/utilities/20.specialized.cpp (original)
+++ stdcxx/trunk/tests/utilities/20.specialized.cpp Wed Jun 25 10:24:43 2008
@@ -27,8 +27,9 @@
**************************************************************************/
#include <memory>
-#include <alg_test.h>
-#include <driver.h>
+
+#include <rw_alg_test.h>
+#include <rw_driver.h>
/**************************************************************************/
Modified: stdcxx/trunk/tests/utilities/20.temp.buffer.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/utilities/20.temp.buffer.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/utilities/20.temp.buffer.cpp (original)
+++ stdcxx/trunk/tests/utilities/20.temp.buffer.cpp Wed Jun 25 10:24:43 2008
@@ -40,7 +40,7 @@
#include <rw_new.h>
#include <rw_printf.h>
-#include <driver.h>
+#include <rw_driver.h>
#ifndef _RWSTD_NO_SETRLIMIT
// #undef works around SunPro bug #568
Modified: stdcxx/trunk/tests/utilities/20.temp.buffer.mt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/utilities/20.temp.buffer.mt.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/tests/utilities/20.temp.buffer.mt.cpp (original)
+++ stdcxx/trunk/tests/utilities/20.temp.buffer.mt.cpp Wed Jun 25 10:24:43 2008
@@ -36,7 +36,7 @@
#include <cstdio> // for printf()
#include <cstring> // for memset()
-#include <driver.h> // for rw_test(), ...
+#include <rw_driver.h> // for rw_test(), ...
#include <rw_thread.h> // for rw_thread_create(), ...
/**************************************************************************/
Modified: stdcxx/trunk/util/aliases.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/util/aliases.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/util/aliases.cpp (original)
+++ stdcxx/trunk/util/aliases.cpp Wed Jun 25 10:24:43 2008
@@ -615,7 +615,7 @@
*last_name = '\0';
// if successful, construct a char array with the locales
- while (std::fgets (cmd, sizeof cmd, f)) {
+ while (std::fgets (cmd, int (sizeof cmd), f)) {
cmd [std::strlen (cmd) - 1] = '\0';
// if our buffer is full then dynamically allocate a new one
Modified: stdcxx/trunk/util/charmap.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/util/charmap.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/util/charmap.cpp (original)
+++ stdcxx/trunk/util/charmap.cpp Wed Jun 25 10:24:43 2008
@@ -510,7 +510,7 @@
// NOTE: this will not detect errors in the sequence, since the program
// will continue until it finds a valid character
do {
- int last_elm = encoding.size () - 1;
+ int last_elm = int (encoding.size ()) - 1;
while (last_elm >= 0) {
@@ -559,8 +559,8 @@
// convert the last character in the multibyte character to a numeric
// value representing the last byte of the sequence
- unsigned long last_byte =
- scanner_.convert_escape (encoding.c_str () + pos, &end);
+ unsigned last_byte =
+ unsigned (scanner_.convert_escape (encoding.c_str () + pos, &end));
// POSIX requires that the incremented value be non-NUL
if (UCHAR_MAX <= last_byte || *end)
Modified: stdcxx/trunk/util/cmdopt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/util/cmdopt.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/util/cmdopt.cpp (original)
+++ stdcxx/trunk/util/cmdopt.cpp Wed Jun 25 10:24:43 2008
@@ -53,26 +53,20 @@
#include "cmdopt.h"
const char* exe_name; /**< Alias for process argv [0]. */
-#if !defined (_WIN32) && !defined (_WIN64)
+
+#ifndef _WIN32
+
const char escape_code = '\\';
const char default_path_sep = '/';
const char suffix_sep = '.';
const size_t exe_suffix_len = 0;
-#if defined (_SC_CLK_TCK)
-const float TICKS_PER_SEC = sysconf (_SC_CLK_TCK);
-#elif defined (CLK_TCK)
-const float TICKS_PER_SEC = CLK_TCK;
-#elif defined (CLOCKS_PER_SEC)
-const float TICKS_PER_SEC = CLOCKS_PER_SEC;
-#else
-# error Unable to determine number of clock ticks in a second.
-#endif
-#else
+
+#else /* Win32 */
+
const char escape_code = '^';
const char default_path_sep = '\\';
const char suffix_sep = '.';
const size_t exe_suffix_len = 4; /* strlen(".exe") == 4 */
-const float TICKS_PER_SEC = CLOCKS_PER_SEC;
# ifndef _WIN32_WINNT
# define _WIN32_WINNT 0x0500
@@ -521,7 +515,7 @@
bad_value (optname, optarg);
errno = 0;
- defaults->timeout = strtol (optarg, &end, 10);
+ defaults->timeout = unsigned (strtol (optarg, &end, 10));
if (*end || errno)
bad_value (optname, optarg);
}
@@ -581,7 +575,7 @@
errno = 0;
const long code = strtol (optarg, &end, 10);
if ('\0' == *end && !errno)
- exit (code);
+ exit (int (code));
}
}
else if ( sizeof opt_help - 1 == arglen
@@ -603,7 +597,7 @@
errno = 0;
const long nsec = strtol (optarg, &end, 10);
if ('\0' == *end && 0 <= nsec && !errno) {
- rw_sleep (nsec);
+ rw_sleep (int (nsec));
break;
}
}
Modified: stdcxx/trunk/util/cmdopt.h
URL: http://svn.apache.org/viewvc/stdcxx/trunk/util/cmdopt.h?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/util/cmdopt.h (original)
+++ stdcxx/trunk/util/cmdopt.h Wed Jun 25 10:24:43 2008
@@ -34,7 +34,7 @@
extern const char default_path_sep; /**< Primary path seperator */
extern const char suffix_sep; /**< File suffix seperator. */
extern const size_t exe_suffix_len; /**< Length of executable suffix. */
-extern const float TICKS_PER_SEC; /**< Number of clock ticks in a second. */
+
/**
Parses command line arguments for switches and options.
Modified: stdcxx/trunk/util/codecvt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/util/codecvt.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/util/codecvt.cpp (original)
+++ stdcxx/trunk/util/codecvt.cpp Wed Jun 25 10:24:43 2008
@@ -163,7 +163,7 @@
off_map->insert (std::make_pair (it->first, off));
- off += it->first.size () + 1;
+ off += unsigned (it->first.size ()) + 1;
std::string utf = utf8_encode (it->second);
@@ -337,7 +337,7 @@
std::list<std::string>::const_iterator sit =
it->second.begin ();
for (; sit != it->second.end (); ++sit) {
- data_offset += sit->size () + 1;
+ data_offset += unsigned (sit->size ()) + 1;
}
++data_offset;
}
@@ -401,7 +401,7 @@
table.offset_table [i] = UINT_MAX;
// insert it into the map
- unsigned int tmp = xlit_table_map_.size ();
+ unsigned int tmp = unsigned (xlit_table_map_.size ());
xlit_table_map_.insert (std::make_pair(tmp, table));
// store its index at correct position in current table
@@ -468,29 +468,31 @@
_RW::__rw_codecvt_t codecvt_out;
std::memset (&codecvt_out, 0, sizeof codecvt_out);
+#define UINT(x) _RWSTD_STATIC_CAST(unsigned, x)
+
// calculate byte offsets within the structure
codecvt_out.n_to_w_tab_off = 0;
- codecvt_out.w_to_n_tab_off = codecvt_out.n_to_w_tab_off
- + mbchar_offs.size () * (UCHAR_MAX + 1) * sizeof (unsigned);
+ codecvt_out.w_to_n_tab_off = UINT (codecvt_out.n_to_w_tab_off
+ + mbchar_offs.size () * (UCHAR_MAX + 1) * sizeof (unsigned));
- codecvt_out.utf8_to_ext_tab_off = codecvt_out.w_to_n_tab_off
- + wchar_offs.size () * (UCHAR_MAX + 1) * sizeof (unsigned);
+ codecvt_out.utf8_to_ext_tab_off = UINT (codecvt_out.w_to_n_tab_off
+ + wchar_offs.size () * (UCHAR_MAX + 1) * sizeof (unsigned));
// insert the transliteration tables here
- codecvt_out.xliteration_off = codecvt_out.utf8_to_ext_tab_off
- + uchar_offs.size () * (UCHAR_MAX + 1) * sizeof (unsigned);
+ codecvt_out.xliteration_off = UINT (codecvt_out.utf8_to_ext_tab_off
+ + uchar_offs.size () * (UCHAR_MAX + 1) * sizeof (unsigned));
- codecvt_out.wchar_off = codecvt_out.xliteration_off
- + xlit_table_map_.size () * (UCHAR_MAX + 1) * sizeof (unsigned);
+ codecvt_out.wchar_off = UINT (codecvt_out.xliteration_off
+ + xlit_table_map_.size () * (UCHAR_MAX + 1) * sizeof (unsigned));
- codecvt_out.codeset_off = codecvt_out.wchar_off
- + charmap_.get_mb_cmap ().size () * 2 * sizeof (wchar_t);
+ codecvt_out.codeset_off = UINT (codecvt_out.wchar_off
+ + charmap_.get_mb_cmap ().size () * 2 * sizeof (wchar_t));
- codecvt_out.charmap_off = codecvt_out.codeset_off
- + charmap_.get_code_set_name ().size () + 1 /* NUL */;
+ codecvt_out.charmap_off = UINT (codecvt_out.codeset_off
+ + charmap_.get_code_set_name ().size () + 1 /* NUL */);
- const std::size_t mb_offset = codecvt_out.charmap_off
- + charmap_.get_charmap_name ().size () + 1 /* NUL */;
+ const std::size_t mb_offset = UINT (codecvt_out.charmap_off
+ + charmap_.get_charmap_name ().size () + 1 /* NUL */);
// compute the size of narrow strings map which added to
// mb_offset will give the start of the transliteration data
@@ -514,7 +516,7 @@
if (xit->second.offset_table [i] & 0x80000000)
continue;
// add the offset for xliteration data
- xit->second.offset_table [i] += xlit_data_offset;
+ xit->second.offset_table [i] += UINT (xlit_data_offset);
}
}
@@ -565,7 +567,7 @@
unsigned off = it->second->off [i];
if (!(off & 0x80000000))
- off += mb_offset;
+ off += UINT (mb_offset);
out.write ((const char*)&off, sizeof off);
}
@@ -590,7 +592,7 @@
unsigned off = it->second->off [i];
if (!(off & 0x80000000))
- off += mb_offset;
+ off += UINT (mb_offset);
out.write ((const char*)&off, sizeof off);
}
Modified: stdcxx/trunk/util/collate.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/util/collate.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/util/collate.cpp (original)
+++ stdcxx/trunk/util/collate.cpp Wed Jun 25 10:24:43 2008
@@ -75,7 +75,7 @@
Weights_t* weights = new Weights_t[collate_out_.num_weights];
- std::size_t i = 0;
+ int i = 0;
for (i = 0; i < collate_out_.num_weights && w_it != entry.second.end ();
++i, ++w_it){
get_weight (*w_it, weights, i);
@@ -1179,7 +1179,8 @@
// check to see of the largest_ce needs to be changed
if (ce_mit->second.ce_wstr.size() + 1
> collate_out_.largest_ce)
- collate_out_.largest_ce = ce_mit->second.ce_wstr.size();
+ collate_out_.largest_ce =
+ unsigned (ce_mit->second.ce_wstr.size());
ce_strs.insert (it->first);
}
@@ -1204,12 +1205,10 @@
std::ofstream out (dir_name.c_str(), std::ios::binary);
out.exceptions (std::ios::failbit | std::ios::badbit);
- unsigned int i;
-
// calculate the size of an individual weight element
collate_out_.elm_size = collate_out_.num_weights
- * collate_out_.longest_weight * sizeof (unsigned int) +
- sizeof (unsigned int);
+ * collate_out_.longest_weight * unsigned (sizeof (unsigned int)) +
+ unsigned (sizeof (unsigned int));
// the first section of the collate database is the collating
// element information
@@ -1219,7 +1218,8 @@
for (n_ce_offs_it = n_ce_offs_.begin();
n_ce_offs_it != n_ce_offs_.end (); ++n_ce_offs_it) {
collate_out_.w_ce_tab_off += (n_ce_offs_it->second.last_offset
- - n_ce_offs_it->second.first_offset + 1)* sizeof (int);
+ - n_ce_offs_it->second.first_offset + 1)
+ * unsigned (sizeof (int));
}
// next comes the weight information
@@ -1228,12 +1228,13 @@
for (w_ce_offs_it = w_ce_offs_.begin();
w_ce_offs_it != w_ce_offs_.end(); ++w_ce_offs_it) {
collate_out_.weight_tab_off += (w_ce_offs_it->second.last_offset
- - w_ce_offs_it->second.first_offset + 1)* sizeof (int);
+ - w_ce_offs_it->second.first_offset + 1)
+ * unsigned (sizeof (int));
}
coll_map_iter coll_map_pos;
- collate_out_.num_elms = off_mapr_.size();
+ collate_out_.num_elms = unsigned (off_mapr_.size());
if (collate_out_.undefined_optimization)
++collate_out_.num_elms;
@@ -1249,7 +1250,7 @@
char_offs_it != char_offs_.end(); ++char_offs_it) {
char_offs_size += (UCHAR_MAX + 1
- char_offs_it->second.first_offset)
- * sizeof (unsigned int);
+ * unsigned (sizeof (unsigned int));
}
collate_out_.w_char_tab_off = collate_out_.n_char_tab_off
@@ -1263,7 +1264,7 @@
w_to_n_coll_it != w_to_n_coll_.end(); ++w_to_n_coll_it) {
w_to_n_size += (UCHAR_MAX + 1
- w_to_n_coll_it->second.first_offset)
- * sizeof (unsigned int);
+ * unsigned (sizeof (unsigned int));
}
collate_out_.n_char_off_tab_off = collate_out_.w_char_tab_off
@@ -1271,53 +1272,54 @@
// now calculate the offset for the wide character offset table
collate_out_.w_char_off_tab_off = collate_out_.n_char_off_tab_off
- + char_offs_.size() * sizeof (unsigned int);
+ + unsigned (char_offs_.size() * sizeof (unsigned int));
// calculate the offset for the narrow collating element offset table
collate_out_.n_ce_off_tab_off = collate_out_.w_char_off_tab_off
- + w_to_n_coll_.size() * sizeof (unsigned int);
+ + unsigned (w_to_n_coll_.size() * sizeof (unsigned int));
// calculate the offset for the wide collating element offset table
collate_out_.w_ce_off_tab_off = collate_out_.n_ce_off_tab_off
- + n_ce_offs_.size() * sizeof (unsigned int);
+ + unsigned (n_ce_offs_.size() * sizeof (unsigned int));
// now calculate the offset of the first character information
collate_out_.n_char_first_char_off = collate_out_.w_ce_off_tab_off
- + w_ce_offs_.size() * sizeof (unsigned int);
+ + unsigned (w_ce_offs_.size() * sizeof (unsigned int));
// now calculate the offset of the wide table first char info
collate_out_.w_char_first_char_off = collate_out_.n_char_first_char_off
- + char_offs_.size() * sizeof (unsigned char);
+ + unsigned (char_offs_.size() * sizeof (unsigned char));
// now calculate the offset of the narrow ce first character info
collate_out_.n_ce_first_char_off = collate_out_.w_char_first_char_off
- + w_to_n_coll_.size() * sizeof (unsigned char);
+ + unsigned (w_to_n_coll_.size() * sizeof (unsigned char));
// now calculate the offset of the wide ce first character info
collate_out_.w_ce_first_char_off = collate_out_.n_ce_first_char_off
- + n_ce_offs_.size() * sizeof (unsigned char);
+ + unsigned (n_ce_offs_.size() * sizeof (unsigned char));
// now calculate the offset of the narrow ce last character info
collate_out_.n_ce_last_char_off = collate_out_.w_ce_first_char_off
- + w_ce_offs_.size() * sizeof (unsigned char);
+ + unsigned (w_ce_offs_.size() * sizeof (unsigned char));
// now calculate the offset of the wide ce last character info
collate_out_.w_ce_last_char_off = collate_out_.n_ce_last_char_off
- + n_ce_offs_.size() * sizeof (unsigned char);
+ + unsigned (n_ce_offs_.size() * sizeof (unsigned char));
// now calculate the offset of the codeset name
collate_out_.codeset_off = collate_out_.w_ce_last_char_off
- + w_ce_offs_.size() * sizeof (unsigned char);
+ + unsigned (w_ce_offs_.size() * sizeof (unsigned char));
// finally calculate the offset of the charmap name
collate_out_.charmap_off = collate_out_.codeset_off
- + charmap_.get_code_set_name().size() + 1;
+ + unsigned (charmap_.get_code_set_name().size()) + 1;
// print out the collate struct
out.write ((char*)&collate_out_, sizeof(collate_out_));
+ unsigned int i;
for (n_ce_offs_it = n_ce_offs_.begin();
n_ce_offs_it != n_ce_offs_.end(); ++n_ce_offs_it) {
for (i = (unsigned int)n_ce_offs_it->second.first_offset;
@@ -2096,14 +2098,14 @@
while (weight_num < collate_out_.num_weights) {
- std::size_t c;
+ unsigned c;
for (c = 0; *next_val && (!next_wt || next_val < next_wt); ++c) {
const char* end = 0;
weights [weight_num].weight [c] =
- scanner_.convert_escape (next_val, &end, true);
+ unsigned (scanner_.convert_escape (next_val, &end, true));
assert (0 != end);
@@ -2196,7 +2198,7 @@
const char* end = 0;
weights [weight_num].weight [k++] =
- scanner_.convert_escape (beg, &end, true);
+ unsigned (scanner_.convert_escape (beg, &end, true));
assert (0 != end);
Modified: stdcxx/trunk/util/ctype.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/util/ctype.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/util/ctype.cpp (original)
+++ stdcxx/trunk/util/ctype.cpp Wed Jun 25 10:24:43 2008
@@ -845,18 +845,18 @@
// calculate the offsets for the wchar_t arrays
ctype_out_.wtoupper_off = 0;
- ctype_out_.wtolower_off = ctype_out_.wtoupper_off
- + upper_.size() * sizeof (_RW::__rw_upper_elm);
- ctype_out_.wmask_off = ctype_out_.wtolower_off
- + lower_.size() * sizeof (_RW::__rw_lower_elm);
- ctype_out_.wmask_s = mask_.size();
+ ctype_out_.wtolower_off = unsigned (ctype_out_.wtoupper_off
+ + upper_.size() * sizeof (_RW::__rw_upper_elm));
+ ctype_out_.wmask_off = unsigned (ctype_out_.wtolower_off
+ + lower_.size() * sizeof (_RW::__rw_lower_elm));
+ ctype_out_.wmask_s = unsigned (mask_.size());
// calculate the offsets for the codeset name string and character
// map name string
- ctype_out_.codeset_off = ctype_out_.wmask_off
- + mask_.size() * sizeof (_RW::__rw_mask_elm);
- ctype_out_.charmap_off = ctype_out_.codeset_off
- + charmap_.get_code_set_name().size() + 1;
+ ctype_out_.codeset_off = unsigned (ctype_out_.wmask_off
+ + mask_.size() * sizeof (_RW::__rw_mask_elm));
+ ctype_out_.charmap_off = unsigned (ctype_out_.codeset_off
+ + charmap_.get_code_set_name().size() + 1);
ctype_out_.mb_cur_max = charmap_.get_mb_cur_max();
std::size_t i;
Modified: stdcxx/trunk/util/display.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/util/display.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/util/display.cpp (original)
+++ stdcxx/trunk/util/display.cpp Wed Jun 25 10:24:43 2008
@@ -34,6 +34,34 @@
#include "display.h"
#include "target.h" /* for target_status */
+#include <time.h> /* for CLK_TCK, CLOCKS_PER_SEC */
+
+#ifndef _WIN32
+# include <unistd.h> /* for _SC_CLK_TCK, sysconf() */
+#endif
+
+#if defined (_SC_CLK_TCK)
+
+/* dynamically determine the number of clock ticks per second */
+static const float TICKS_PER_SEC = float (sysconf (_SC_CLK_TCK));
+
+#elif defined CLOCKS_PER_SEC
+
+/* use the POSIX (and MSVC 6.0) CLOCKS_PER_SEC constant */
+static const float TICKS_PER_SEC = CLOCKS_PER_SEC;
+
+#elif defined CLK_TCK
+
+/* use CLK_TCK if it's defined (e.g., pre-MSVC 6.0) */
+static const float TICKS_PER_SEC = CLK_TCK;
+
+#else
+
+/* if all else fails, assume the standard 1 million ticks per second */
+static const float TICKS_PER_SEC = 1000000UL;
+
+#endif
+
/**
ProcessStatus enum lookup table for 'short' (6 character) strings.
Modified: stdcxx/trunk/util/exec.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/util/exec.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/util/exec.cpp (original)
+++ stdcxx/trunk/util/exec.cpp Wed Jun 25 10:24:43 2008
@@ -371,7 +371,7 @@
if (isdigit (signame [0])) {
char *junk;
- int trans = strtol (signame, &junk, 10);
+ int trans = int (strtol (signame, &junk, 10));
if (0 == *junk && 0 == errno)
return trans;
Modified: stdcxx/trunk/util/locale.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/util/locale.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/util/locale.cpp (original)
+++ stdcxx/trunk/util/locale.cpp Wed Jun 25 10:24:43 2008
@@ -1184,7 +1184,7 @@
const std::size_t count = ctype_st->wtoupper_s ();
- nchars += count;
+ nchars += int (count);
// print out each pair in the toupper table.
// the wide char table is used because it contains all characters
@@ -1236,7 +1236,7 @@
const std::size_t count = ctype_st->wtolower_s ();
- nchars += count;
+ nchars += int (count);
for (std::size_t j = 0; j < count; ++j) {
out += '(';
@@ -2569,7 +2569,7 @@
unsigned last_wchar [2] = { 0, 0 };
// print out all multibyte characters in this map
- for (std::size_t i = 0; i != UCHAR_MAX + 1U; ++i) {
+ for (unsigned i = 0; i != UCHAR_MAX + 1U; ++i) {
if (tab [i] & 0x80000000) {
Modified: stdcxx/trunk/util/messages.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/util/messages.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/util/messages.cpp (original)
+++ stdcxx/trunk/util/messages.cpp Wed Jun 25 10:24:43 2008
@@ -140,19 +140,19 @@
// now calculate the offsets for the wide string representations
messages_out_.yesexpr_off[1] = 0;
- messages_out_.noexpr_off[1] = messages_out_.yesexpr_off[1]
- + (messages_st_.wyesexpr.size() + 1) * sizeof (wchar_t) ;
+ messages_out_.noexpr_off[1] = unsigned (messages_out_.yesexpr_off[1]
+ + (messages_st_.wyesexpr.size() + 1) * sizeof (wchar_t));
// now calculate the offsets for the narrow string representations
- messages_out_.yesexpr_off[0] = messages_out_.noexpr_off[1]
- + (messages_st_.wnoexpr.size() + 1) * sizeof (wchar_t);
- messages_out_.noexpr_off[0] = messages_out_.yesexpr_off[0]
- + (messages_st_.yesexpr.size() + 1) * sizeof (char);
+ messages_out_.yesexpr_off[0] = unsigned (messages_out_.noexpr_off[1]
+ + (messages_st_.wnoexpr.size() + 1) * sizeof (wchar_t));
+ messages_out_.noexpr_off[0] = unsigned (messages_out_.yesexpr_off[0]
+ + (messages_st_.yesexpr.size() + 1) * sizeof (char));
- messages_out_.codeset_off = messages_out_.noexpr_off[0]
- + (messages_st_.noexpr.size() + 1) * sizeof (char);
- messages_out_.charmap_off = messages_out_.codeset_off
- + (charmap_.get_code_set_name().size() + 1) * sizeof (char);
+ messages_out_.codeset_off = unsigned (messages_out_.noexpr_off[0]
+ + (messages_st_.noexpr.size() + 1) * sizeof (char));
+ messages_out_.charmap_off = unsigned (messages_out_.codeset_off
+ + (charmap_.get_code_set_name().size() + 1) * sizeof (char));
// first write out the messages structure
out.write ((char*)&messages_out_, sizeof(messages_out_));
Modified: stdcxx/trunk/util/monetary.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/util/monetary.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/util/monetary.cpp (original)
+++ stdcxx/trunk/util/monetary.cpp Wed Jun 25 10:24:43 2008
@@ -414,24 +414,24 @@
punct.decimal_point_off [1] = 0;
punct.thousands_sep_off [1] =
- punct.decimal_point_off [1]
- + (mon_st_.wmon_decimal_point.size () + 1) * sizeof (wchar_t);
+ unsigned (punct.decimal_point_off [1]
+ + (mon_st_.wmon_decimal_point.size () + 1) * sizeof (wchar_t));
punct.decimal_point_off [0] =
- punct.thousands_sep_off [1]
- + (mon_st_.wmon_thousands_sep.size () + 1) * sizeof (wchar_t);
+ unsigned (punct.thousands_sep_off [1]
+ + (mon_st_.wmon_thousands_sep.size () + 1) * sizeof (wchar_t));
punct.thousands_sep_off [0] =
- punct.decimal_point_off [0]
- + mon_st_.mon_decimal_point.size () + 1;
+ unsigned (punct.decimal_point_off [0]
+ + mon_st_.mon_decimal_point.size () + 1);
punct.grouping_off =
- punct.thousands_sep_off [0]
- + mon_st_.mon_thousands_sep.size () + 1;
+ unsigned (punct.thousands_sep_off [0]
+ + mon_st_.mon_thousands_sep.size () + 1);
punct.punct_ext_off =
- punct.grouping_off
- + mon_st_.mon_grouping.size () + 1;
+ unsigned (punct.grouping_off
+ + mon_st_.mon_grouping.size () + 1);
// compute the alignment requirement of any offset member
const std::size_t align = sizeof punct.punct_ext_off;
@@ -442,47 +442,45 @@
// compute the amount of padding between the two structs
const std::size_t pad = misalign ? align - misalign : 0;
- punct.punct_ext_off += pad;
+ punct.punct_ext_off += unsigned (pad);
mon_out_.curr_symbol_off [1][1] = 0;
mon_out_.curr_symbol_off [0][1] =
- mon_out_.curr_symbol_off [1][1]
- + (mon_st_.wint_curr_symbol.size () + 1) * sizeof (wchar_t);
+ unsigned (mon_out_.curr_symbol_off [1][1]
+ + (mon_st_.wint_curr_symbol.size () + 1) * sizeof (wchar_t));
mon_out_.positive_sign_off [1] =
- mon_out_.curr_symbol_off [0][1]
- + (mon_st_.wcurrency_symbol.size () + 1) * sizeof (wchar_t);
+ unsigned (mon_out_.curr_symbol_off [0][1]
+ + (mon_st_.wcurrency_symbol.size () + 1) * sizeof (wchar_t));
mon_out_.negative_sign_off [1] =
- mon_out_.positive_sign_off [1]
- + (mon_st_.wpositive_sign.size () + 1) * sizeof (wchar_t);
+ unsigned (mon_out_.positive_sign_off [1]
+ + (mon_st_.wpositive_sign.size () + 1) * sizeof (wchar_t));
// calculate all the narrow character string offsets
mon_out_.curr_symbol_off [1][0] =
- mon_out_.negative_sign_off [1]
- + (mon_st_.wnegative_sign.size () + 1) * sizeof (wchar_t);
+ unsigned (mon_out_.negative_sign_off [1]
+ + (mon_st_.wnegative_sign.size () + 1) * sizeof (wchar_t));
mon_out_.curr_symbol_off [0][0] =
- mon_out_.curr_symbol_off [1][0]
- + mon_st_.int_curr_symbol.size () + 1;
+ unsigned (mon_out_.curr_symbol_off [1][0]
+ + mon_st_.int_curr_symbol.size () + 1);
mon_out_.positive_sign_off [0] =
- mon_out_.curr_symbol_off [0][0]
- + mon_st_.currency_symbol.size() + 1;
+ unsigned (mon_out_.curr_symbol_off [0][0]
+ + mon_st_.currency_symbol.size() + 1);
mon_out_.negative_sign_off [0] =
- mon_out_.positive_sign_off [0]
- + mon_st_.positive_sign.size () + 1;
+ unsigned (mon_out_.positive_sign_off [0]
+ + mon_st_.positive_sign.size () + 1);
- mon_out_.codeset_off =
- mon_out_.negative_sign_off [0]
- + mon_st_.negative_sign.size () + 1;
-
- mon_out_.charmap_off =
- mon_out_.codeset_off
- + charmap_.get_code_set_name ().size () + 1;
+ mon_out_.codeset_off = unsigned (mon_out_.negative_sign_off [0]
+ + mon_st_.negative_sign.size () + 1);
+
+ mon_out_.charmap_off = unsigned (mon_out_.codeset_off
+ + charmap_.get_code_set_name ().size () + 1);
issue_diag (I_WRITE, false, 0,
"%s layout:\n"
Modified: stdcxx/trunk/util/numeric.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/util/numeric.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/util/numeric.cpp (original)
+++ stdcxx/trunk/util/numeric.cpp Wed Jun 25 10:24:43 2008
@@ -163,24 +163,24 @@
num_punct_out_.decimal_point_off [1] = 0;
num_punct_out_.thousands_sep_off [1] =
- num_punct_out_.decimal_point_off [1]
- + (num_st_.wdecimal_point.size () + 1) * sizeof (wchar_t);
+ unsigned (num_punct_out_.decimal_point_off [1]
+ + (num_st_.wdecimal_point.size () + 1) * sizeof (wchar_t));
num_punct_out_.decimal_point_off [0] =
- num_punct_out_.thousands_sep_off [1]
- + (num_st_.wthousands_sep.size() + 1) * sizeof (wchar_t);
+ unsigned (num_punct_out_.thousands_sep_off [1]
+ + (num_st_.wthousands_sep.size() + 1) * sizeof (wchar_t));
num_punct_out_.thousands_sep_off [0] =
- num_punct_out_.decimal_point_off [0]
- + num_st_.decimal_point.size () + 1;
+ unsigned (num_punct_out_.decimal_point_off [0]
+ + num_st_.decimal_point.size () + 1);
num_punct_out_.grouping_off =
- num_punct_out_.thousands_sep_off [0]
- + num_st_.thousands_sep.size () + 1;
+ unsigned (num_punct_out_.thousands_sep_off [0]
+ + num_st_.thousands_sep.size () + 1);
num_punct_out_.punct_ext_off =
- num_punct_out_.grouping_off
- + num_st_.grouping.size () + 1;
+ unsigned (num_punct_out_.grouping_off
+ + num_st_.grouping.size () + 1);
// compute the alignment requirement of any offset member
const std::size_t align = sizeof num_punct_out_.punct_ext_off;
@@ -191,31 +191,31 @@
// compute the amount of padding between the two structs
const std::size_t pad = misalign ? align - misalign : 0;
- num_punct_out_.punct_ext_off += pad;
+ num_punct_out_.punct_ext_off += unsigned (pad);
// calculate the offsets of members of the numeric extension struct
num_out_.truename_off [1] = 0;
num_out_.falsename_off [1] =
- num_out_.truename_off [1]
- + (num_st_.wtruename.size() + 1) * sizeof (wchar_t);
+ unsigned (num_out_.truename_off [1]
+ + (num_st_.wtruename.size() + 1) * sizeof (wchar_t));
num_out_.truename_off [0] =
- num_out_.falsename_off [1]
- + (num_st_.wfalsename.size() + 1) * sizeof (wchar_t);
+ unsigned (num_out_.falsename_off [1]
+ + (num_st_.wfalsename.size() + 1) * sizeof (wchar_t));
num_out_.falsename_off [0] =
- num_out_.truename_off [0]
- + num_st_.truename.size() + 1;
+ unsigned (num_out_.truename_off [0]
+ + num_st_.truename.size() + 1);
num_out_.codeset_off =
- num_out_.falsename_off [0]
- + num_st_.falsename.size() + 1;
+ unsigned (num_out_.falsename_off [0]
+ + num_st_.falsename.size() + 1);
num_out_.charmap_off =
- num_out_.codeset_off
- + charmap_.get_code_set_name().size() + 1;
+ unsigned (num_out_.codeset_off
+ + charmap_.get_code_set_name().size() + 1);
issue_diag (I_WRITE, false, 0,
"%s layout:\n"
Modified: stdcxx/trunk/util/path.h
URL: http://svn.apache.org/viewvc/stdcxx/trunk/util/path.h?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/util/path.h (original)
+++ stdcxx/trunk/util/path.h Wed Jun 25 10:24:43 2008
@@ -2,7 +2,7 @@
*
* path.h
*
- * $Id:$
+ * $Id$
*
***************************************************************************
*
Modified: stdcxx/trunk/util/runall.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/util/runall.cpp?rev=671608&r1=671607&r2=671608&view=diff
==============================================================================
--- stdcxx/trunk/util/runall.cpp (original)
+++ stdcxx/trunk/util/runall.cpp Wed Jun 25 10:24:43 2008
@@ -573,7 +573,7 @@
while (!feof (lst)) {
char buf [PATH_MAX];
- target = fgets (buf, sizeof (buf), lst);
+ target = fgets (buf, int (sizeof buf), lst);
if (ferror (lst)) {
warn ("Error reading %s: %s\n", lst_name, strerror (errno));