Author: sebor
Date: Thu Mar 8 12:08:42 2007
New Revision: 516166
URL: http://svn.apache.org/viewvc?view=rev&rev=516166
Log:
2007-03-07 Martin Sebor <[EMAIL PROTECTED]>
* locale.cpp (_RWSTD_USE_CONFIG): Removed references to macro.
* driver.cpp (_RWSTD_USE_CONFIG): Ditto.
* _config-gcc.h (_RWSTD_USE_CONFIG): Ditto.
* _config-xlc.h (_RWSTD_USE_CONFIG): Ditto.
* _config-xlc.h (_RWSTD_USE_CONFIG): Ditto.
* configure.wsf (_RWSTD_USE_CONFIG): Ditto.
* projects.js (_RWSTD_USE_CONFIG): Ditto.
* README (_RWSTD_USE_CONFIG): Ditto.
Modified:
incubator/stdcxx/trunk/etc/config/README
incubator/stdcxx/trunk/etc/config/windows/configure.wsf
incubator/stdcxx/trunk/etc/config/windows/projects.js
incubator/stdcxx/trunk/include/rw/_config-gcc.h
incubator/stdcxx/trunk/include/rw/_config-xlc.h
incubator/stdcxx/trunk/include/rw/_config.h
incubator/stdcxx/trunk/tests/src/driver.cpp
incubator/stdcxx/trunk/tests/src/locale.cpp
Modified: incubator/stdcxx/trunk/etc/config/README
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/README?view=diff&rev=516166&r1=516165&r2=516166
==============================================================================
--- incubator/stdcxx/trunk/etc/config/README (original)
+++ incubator/stdcxx/trunk/etc/config/README Thu Mar 8 12:08:42 2007
@@ -530,13 +530,14 @@
When using the installed library be sure to define any macros also
defined on the command line when building the library. These are:
- _RWSTD_USE_CONFIG, and _RWSTDDEBUG; when using compilers that do not
- provide an option to enable thread safety or to select a thread
- library, the following macros may also have to be defined:
- _RWSTD_POSIX_THREADS, _RWSTD_SOLARIS_THREADS, _RWSTD_DCE_THREADS,
- and _RWSTDDEBUG. Failing to do so, or failing to specify the same
- compiler options that affect the binary compatibility of the library
- leads to undefined behavior of the produced executables.
+ _RWSTDDEBUG to enable debugging support in the library; when using
+ compilers that do not provide an option to enable thread safety or
+ to select a thread library, the following macros may also have to be
+ defined: _RWSTD_POSIX_THREADS, _RWSTD_SOLARIS_THREADS,
+ _RWSTD_DCE_THREADS, and _RWSTDDEBUG. Failing to do so, or failing
+ to specify the same compiler options that affect the binary
+ compatibility of the library leads to undefined behavior of the
+ produced executables.
7 Test Suite Build Instructions
Modified: incubator/stdcxx/trunk/etc/config/windows/configure.wsf
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/configure.wsf?view=diff&rev=516166&r1=516165&r2=516166
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/configure.wsf (original)
+++ incubator/stdcxx/trunk/etc/config/windows/configure.wsf Thu Mar 8 12:08:42
2007
@@ -220,7 +220,7 @@
CPPFLAGS += joinArray(new Array(stageDir, includeDir), "/I");
- var defines = new Array("_RWSTD_USE_CONFIG");
+ var defines = new Array ("");
if (confInfo.dll)
defines.push("_RWSHARED");
Modified: incubator/stdcxx/trunk/etc/config/windows/projects.js
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/projects.js?view=diff&rev=516166&r1=516165&r2=516166
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/projects.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/projects.js Thu Mar 8 12:08:42
2007
@@ -23,7 +23,7 @@
//
//////////////////////////////////////////////////////////////////////
-var commonDefines = "_RWSTD_USE_CONFIG;debug?_RWSTDDEBUG;dll?_RWSHARED";
+var commonDefines = "debug?_RWSTDDEBUG;dll?_RWSHARED";
var commonIncludes = "$(SolutionDir)%CONFIG%\\include";
var stdlibIncludes = "%SRCDIR%\\include;%SRCDIR%\\include\\ansi;" +
commonIncludes;
var rwtestIncludes = "%SRCDIR%\\tests\\include;" + stdlibIncludes;
@@ -130,7 +130,7 @@
new FilterDef(headerFilterName, headerFilterUuid, headerFilterExts,
eFileTypeCppHeader, true).
addFiles("%SRCDIR%\\util",
new Array("cmdopt.h", "display.h", "exec.h", "output.h",
"target.h", "util.h")));
- execDef.Defines = "_RWSTD_USE_CONFIG";
+ execDef.Defines = "";
execDef.Includes = commonIncludes;
execDef.OutDir = "$(SolutionDir)%CONFIG%\\bin";
execDef.Libs = commonLibs;
Modified: incubator/stdcxx/trunk/include/rw/_config-gcc.h
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/rw/_config-gcc.h?view=diff&rev=516166&r1=516165&r2=516166
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_config-gcc.h (original)
+++ incubator/stdcxx/trunk/include/rw/_config-gcc.h Thu Mar 8 12:08:42 2007
@@ -114,9 +114,7 @@
// use new C++ libc headers
#undef _RWSTD_NO_NEW_HEADER
-#ifdef _RWSTD_USE_CONFIG
-# undef _RWSTD_NO_LIBC_IN_STD
-#endif
+#undef _RWSTD_NO_LIBC_IN_STD
#undef _RWSTD_NO_DEPRECATED_LIBC_IN_STD
Modified: incubator/stdcxx/trunk/include/rw/_config-xlc.h
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/rw/_config-xlc.h?view=diff&rev=516166&r1=516165&r2=516166
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_config-xlc.h (original)
+++ incubator/stdcxx/trunk/include/rw/_config-xlc.h Thu Mar 8 12:08:42 2007
@@ -112,43 +112,22 @@
#endif // __TEMPINC__
-#ifdef _RWSTD_USE_CONFIG
// avoid using autodetected libc headers
-# undef _RWSTD_ANSI_C_ASSERT_H
-# undef _RWSTD_ANSI_C_CTYPE_H
-# undef _RWSTD_ANSI_C_ERRNO_H
-# undef _RWSTD_ANSI_C_FLOAT_H
-# undef _RWSTD_ANSI_C_ISO646_H
-# undef _RWSTD_ANSI_C_LIMITS_H
-# undef _RWSTD_ANSI_C_LOCALE_H
-# undef _RWSTD_ANSI_C_MATH_H
-# undef _RWSTD_ANSI_C_SETJMP_H
-# undef _RWSTD_ANSI_C_SIGNAL_H
-# undef _RWSTD_ANSI_C_STDARG_H
-# undef _RWSTD_ANSI_C_STDDEF_H
-# undef _RWSTD_ANSI_C_STDIO_H
-# undef _RWSTD_ANSI_C_STDLIB_H
-# undef _RWSTD_ANSI_C_STRING_H
-# undef _RWSTD_ANSI_C_TIME_H
-# undef _RWSTD_ANSI_C_WCHAR_H
-# undef _RWSTD_ANSI_C_WCTYPE_H
-#else
- // RCB is too dumb to autodetect these
-
-# ifndef _RWSTD_NO_COLLAPSE_STATIC_LOCALS
-# define _RWSTD_NO_COLLAPSE_STATIC_LOCALS
-# endif
-
-# ifndef _RWSTD_NO_COLLAPSE_TEMPLATE_LOCALS
-# define _RWSTD_NO_COLLAPSE_TEMPLATE_LOCALS
-# endif
-
-# ifndef _RWSTD_NO_EXTERN_FUNCTION_TEMPLATE
-# define _RWSTD_NO_EXTERN_FUNCTION_TEMPLATE
-# endif
-
-# ifndef _RWSTD_NO_EXTERN_TEMPLATE_BEFORE_DEFINITION
-# define _RWSTD_NO_EXTERN_TEMPLATE_BEFORE_DEFINITION
-# endif
-
-#endif // _RWSTD_USE_CONFIG
+#undef _RWSTD_ANSI_C_ASSERT_H
+#undef _RWSTD_ANSI_C_CTYPE_H
+#undef _RWSTD_ANSI_C_ERRNO_H
+#undef _RWSTD_ANSI_C_FLOAT_H
+#undef _RWSTD_ANSI_C_ISO646_H
+#undef _RWSTD_ANSI_C_LIMITS_H
+#undef _RWSTD_ANSI_C_LOCALE_H
+#undef _RWSTD_ANSI_C_MATH_H
+#undef _RWSTD_ANSI_C_SETJMP_H
+#undef _RWSTD_ANSI_C_SIGNAL_H
+#undef _RWSTD_ANSI_C_STDARG_H
+#undef _RWSTD_ANSI_C_STDDEF_H
+#undef _RWSTD_ANSI_C_STDIO_H
+#undef _RWSTD_ANSI_C_STDLIB_H
+#undef _RWSTD_ANSI_C_STRING_H
+#undef _RWSTD_ANSI_C_TIME_H
+#undef _RWSTD_ANSI_C_WCHAR_H
+#undef _RWSTD_ANSI_C_WCTYPE_H
Modified: incubator/stdcxx/trunk/include/rw/_config.h
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/rw/_config.h?view=diff&rev=516166&r1=516165&r2=516166
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_config.h (original)
+++ incubator/stdcxx/trunk/include/rw/_config.h Thu Mar 8 12:08:42 2007
@@ -32,11 +32,8 @@
#ifndef _RWSTD_RW_CONFIG_H_INCLUDED
#define _RWSTD_RW_CONFIG_H_INCLUDED
-#ifdef _RWSTD_USE_CONFIG
-# include <config.h>
-#else
-# include <rw/config/rwconfig_std.h>
-#endif // _RWSTD_USE_CONFIG
+// include generated configuration header
+#include <config.h>
/*** library version numbers and ids **************************************/
Modified: incubator/stdcxx/trunk/tests/src/driver.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/src/driver.cpp?view=diff&rev=516166&r1=516165&r2=516166
==============================================================================
--- incubator/stdcxx/trunk/tests/src/driver.cpp (original)
+++ incubator/stdcxx/trunk/tests/src/driver.cpp Thu Mar 8 12:08:42 2007
@@ -336,14 +336,8 @@
static jmp_buf test_env;
-#ifdef _RWSTD_USE_CONFIG
// set to 1 after the driver has been initialized
static int _rw_driver_init = 0;
-#else // if !defined (_RWSTD_USE_CONFIG)
-// FIXME: remove this as soon as all tests have been ported
-// from RWTest to this driver
-_TEST_EXPORT int _rw_driver_init = 0;
-#endif // _RWSTD_USE_CONFIG
// set to 1 after the driver has finished running
static int _rw_driver_done = 0;
@@ -977,16 +971,6 @@
return 1;
}
-#ifndef _RWSTD_USE_CONFIG
-
- // enable RWTest-format compatibility mode
- _rw_opt_compat (1, 0);
-
- // disable output to stdout
- _rw_opt_no_stdout (1, 0);
-
-#endif // _RWSTD_USE_CONFIG
-
_rw_setopts_compat ();
_rw_setopts_types ();
Modified: incubator/stdcxx/trunk/tests/src/locale.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/src/locale.cpp?view=diff&rev=516166&r1=516165&r2=516166
==============================================================================
--- incubator/stdcxx/trunk/tests/src/locale.cpp (original)
+++ incubator/stdcxx/trunk/tests/src/locale.cpp Thu Mar 8 12:08:42 2007
@@ -104,13 +104,8 @@
#endif
// relative paths to the etc/nls directory and its subdirectories
-#if defined (_RWSTD_USE_CONFIG)
-# define RELPATH "etc" SLASH "nls"
-# define TESTS_ETC_PATH "tests" SLASH "etc"
-#else
-# define RELPATH "etc" SLASH "stdlib" SLASH "nls"
-# define TESTS_ETC_PATH "tests" SLASH "stdlib" SLASH "etc"
-#endif // _RWSTD_USE_CONFIG
+#define RELPATH "etc" SLASH "nls"
+#define TESTS_ETC_PATH "tests" SLASH "etc"
/**************************************************************************/
