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/ui/text/TestRunner.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'include/cppunit/ui/text') diff --git a/include/cppunit/ui/text/TestRunner.h b/include/cppunit/ui/text/TestRunner.h index 93c7352..13bb8b0 100644 --- a/include/cppunit/ui/text/TestRunner.h +++ b/include/cppunit/ui/text/TestRunner.h @@ -8,7 +8,8 @@ #include #include -namespace CppUnit { +CPPUNIT_NS_BEGIN + class Outputter; class Test; @@ -62,11 +63,11 @@ namespace TextUi * * \see CompilerOutputter, XmlOutputter, TextOutputter. */ -class CPPUNIT_API TestRunner : public CppUnit::TestRunner +class CPPUNIT_API TestRunner : public CPPUNIT_NS(TestRunner) { public: // Work around VC++ bug (class has same name as parent) - typedef CppUnit::TestRunner SuperClass; + typedef CPPUNIT_NS(TestRunner) SuperClass; TestRunner( Outputter *outputter =NULL ); @@ -95,6 +96,6 @@ protected: } // namespace TextUi -} // namespace CppUnit +CPPUNIT_NS_END #endif // CPPUNIT_UI_TEXT_TESTRUNNER_H -- cgit v1.2.1