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, 11 insertions, 12 deletions

diff --git a/include/cppunit/tools/StringTools.h b/include/cppunit/tools/StringTools.h
index cc325dc..d08c6e0 100644
--- a/include/cppunit/tools/StringTools.h
+++ b/include/cppunit/tools/StringTools.h
@@ -6,30 +6,29 @@
 #include <vector>
 
 
-namespace CppUnit
-{
+CPPUNIT_NS_BEGIN
+
 
 /*! \brief Tool functions to manipulate string.
  */
-namespace StringTools
+struct StringTools
 {
 
   typedef std::vector<std::string> Strings;
 
-  std::string CPPUNIT_API toString( int value );
-
-  std::string CPPUNIT_API toString( double value );
+  static std::string CPPUNIT_API toString( int value );
 
-  Strings CPPUNIT_API split( const std::string &text, 
-                             char separator );
+  static std::string CPPUNIT_API toString( double value );
 
-  std::string CPPUNIT_API wrap( const std::string &text,
-                                int wrapColumn = 79 );
+  static Strings CPPUNIT_API split( const std::string &text, 
+                                    char separator );
 
-} // namespace StringTools
+  static std::string CPPUNIT_API wrap( const std::string &text,
+                                       int wrapColumn = CPPUNIT_WRAP_COLUMN );
 
+};
 
-} //  namespace CppUnit
 
+CPPUNIT_NS_END
 
 #endif  // CPPUNIT_TOOLS_STRINGTOOLS_H