From 10c39014e897d43e118e2ddd4f2c90b7de7ec517 Mon Sep 17 00:00:00 2001 From: Baptiste Lepilleur Date: Fri, 12 Jul 2002 04:59:58 +0000 Subject: Include/cppunit/config/Portability. include/cppunit/config/Portability.h: If the compiler does not support namespace (CPPUNIT_HAVE_NAMESPACES=0), define CPPUNIT_NO_STD_NAMESPACE and CPPUNIT_NO_NAMESPACE. If CPPUNIT_NO_STD_NAMESPACE is defined, then CppUnit assumes that STL are in the global namespace. If CPPUNIT_NO_NAMESPACE is defined, then CppUnit classes are placed in the global namespace instead of the CppUnit namespace. * include/cppunit/config/config-bcb5.h: * include/cppunit/config/config-msvc6.h: added definition of macro CPPUNIT_HAVE_NAMESPACES. * include/cppunit/tools/StringTools.h: use CPPUNIT_WRAP_COLUMN as default parameter value for wrap(). * include/cppunit/*/*.h: * src/cppunit/*.cpp: changed all CppUnit namespace declaration to use macros CPPUNIT_NS_BEGIN and CPPUNIT_NS_END. Also, changed reference to CppUnit namespace (essentially in macros) using CPPUNIT_NS macro. --- include/cppunit/config/config-bcb5.h | 11 +++++------ include/cppunit/config/config-mac.h | 1 - include/cppunit/config/config-msvc6.h | 5 +++++ 3 files changed, 10 insertions(+), 7 deletions(-) (limited to 'include/cppunit/config') diff --git a/include/cppunit/config/config-bcb5.h b/include/cppunit/config/config-bcb5.h index 0a6bcd8..d491452 100644 --- a/include/cppunit/config/config-bcb5.h +++ b/include/cppunit/config/config-bcb5.h @@ -6,6 +6,11 @@ /* include/cppunit/config-bcb5.h. Manually adapted from include/cppunit/config-auto.h */ +/* define to 1 if the compiler implements namespaces */ +#ifndef CPPUNIT_HAVE_NAMESPACES +#define CPPUNIT_HAVE_NAMESPACES 1 +#endif + /* define if library uses std::string::compare(string,pos,n) */ #ifndef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST #define CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST 0 @@ -37,12 +42,6 @@ #ifndef CPPUNIT_PACKAGE #define CPPUNIT_PACKAGE "cppunit" #endif - -/* Version number of package */ -#ifndef CPPUNIT_VERSION -#define CPPUNIT_VERSION "1.5.5" -#endif - /* _INCLUDE_CPPUNIT_CONFIG_BCB5_H */ #endif diff --git a/include/cppunit/config/config-mac.h b/include/cppunit/config/config-mac.h index 990163a..4ace906 100644 --- a/include/cppunit/config/config-mac.h +++ b/include/cppunit/config/config-mac.h @@ -8,7 +8,6 @@ know a suitable preprocessor symbol that will distinguish MacOS X from other MacOS versions. Email us if you know the answer. */ - /* define if library uses std::string::compare(string,pos,n) */ #ifdef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST diff --git a/include/cppunit/config/config-msvc6.h b/include/cppunit/config/config-msvc6.h index 7f194db..32a9e26 100644 --- a/include/cppunit/config/config-msvc6.h +++ b/include/cppunit/config/config-msvc6.h @@ -10,6 +10,11 @@ /* include/cppunit/config-msvc6.h. Manually adapted from include/cppunit/config-auto.h */ +/* define to 1 if the compiler implements namespaces */ +#ifndef CPPUNIT_HAVE_NAMESPACES +#define CPPUNIT_HAVE_NAMESPACES 1 +#endif + /* define if library uses std::string::compare(string,pos,n) */ #ifdef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST #undef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST -- cgit v1.2.1