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.

1 files changed, 9 insertions, 8 deletions

diff --git a/include/cppunit/ui/mfc/TestRunner.h b/include/cppunit/ui/mfc/TestRunner.h
index b58ee42..7186bf6 100644
--- a/include/cppunit/ui/mfc/TestRunner.h
+++ b/include/cppunit/ui/mfc/TestRunner.h
@@ -24,8 +24,8 @@
    - export class using AFX_EXT_CLASS
  */
 
-namespace CppUnit
-{
+CPPUNIT_NS_BEGIN
+
   class Test;
   class TestSuite;
 
@@ -61,23 +61,24 @@ public:
 
   void run();
 
-  void addTest( CppUnit::Test *test );
+  void addTest( Test *test );
 
-  void addTests( const std::vector<CppUnit::Test *> &tests );
+  void addTests( const std::vector<Test *> &tests );
 
 protected:
-  CppUnit::Test *getRootTest();
+  Test *getRootTest();
 
-  CppUnit::TestSuite *m_suite;
+  TestSuite *m_suite;
 
-  typedef std::vector<CppUnit::Test *> Tests;
+  typedef std::vector<Test *> Tests;
   Tests m_tests;
 };
 
 
 } // namespace MfcUi
 
-} // namespace CppUnit
+
+CPPUNIT_NS_END
 
 
 #endif  // CPPUNITUI_MFC_TESTRUNNER_H