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, 54 insertions, 55 deletions

diff --git a/src/cppunit/StringTools.cpp b/src/cppunit/StringTools.cpp
index 7dc50ea..46abd4a 100644
--- a/src/cppunit/StringTools.cpp
+++ b/src/cppunit/StringTools.cpp
@@ -2,79 +2,78 @@
 #include <algorithm>
 
 
-namespace CppUnit
-{
+CPPUNIT_NS_BEGIN
+
 
-namespace StringTools
+std::string 
+StringTools::toString( int value )
 {
+  OStringStream stream;
+  stream << value;
+  return stream.str();
+}
 
-  std::string toString( int value )
-  {
-    OStringStream stream;
-    stream << value;
-    return stream.str();
-  }
 
-  std::string toString( double value )
-  {
-    OStringStream stream;
-    stream << value;
-    return stream.str();
-  }
+std::string 
+StringTools::toString( double value )
+{
+  OStringStream stream;
+  stream << value;
+  return stream.str();
+}
 
 
-  Strings split( const std::string &text, 
-                 char separator )
+StringTools::Strings
+StringTools::split( const std::string &text, 
+                    char separator )
+{
+  Strings splittedText;
+
+  std::string::const_iterator itStart = text.begin();
+  while ( !text.empty() )
   {
-    Strings splittedText;
+    std::string::const_iterator itSeparator = std::find( itStart, 
+                                                         text.end(), 
+                                                         separator );
+    splittedText.push_back( text.substr( itStart - text.begin(),
+                                         itSeparator - itStart ) );
+    if ( itSeparator == text.end() )
+      break;
+    itStart = itSeparator +1;
+  }
 
-    std::string::const_iterator itStart = text.begin();
-    while ( !text.empty() )
-    {
-      std::string::const_iterator itSeparator = std::find( itStart, 
-                                                           text.end(), 
-                                                           separator );
-      splittedText.push_back( text.substr( itStart - text.begin(),
-                                           itSeparator - itStart ) );
-      if ( itSeparator == text.end() )
-        break;
-      itStart = itSeparator +1;
-    }
+  return splittedText;
+}
 
-    return splittedText;
-  }
 
+std::string 
+StringTools::wrap( const std::string &text,
+                   int wrapColumn )
+{
+  const char lineBreak = '\n';
+  Strings lines = split( text, lineBreak );
 
-  std::string wrap( const std::string &text,
-                    int wrapColumn )
+  std::string wrapped;
+  for ( Strings::const_iterator it = lines.begin(); it != lines.end(); ++it )
   {
-    const char lineBreak = '\n';
-    Strings lines = split( text, lineBreak );
+    if ( it != lines.begin() )
+      wrapped += lineBreak;
 
-    std::string wrapped;
-    for ( Strings::const_iterator it = lines.begin(); it != lines.end(); ++it )
+    const std::string &line = *it;
+    int index =0;
+    while ( index < line.length() )
     {
-      if ( it != lines.begin() )
+      std::string lineSlice( line.substr( index, wrapColumn ) );
+      wrapped += lineSlice;
+      index += wrapColumn;
+      if ( index < line.length() )
         wrapped += lineBreak;
-
-      const std::string &line = *it;
-      int index =0;
-      while ( index < line.length() )
-      {
-        std::string lineSlice( line.substr( index, wrapColumn ) );
-        wrapped += lineSlice;
-        index += wrapColumn;
-        if ( index < line.length() )
-          wrapped += lineBreak;
-      }
     }
-
-    return wrapped;
   }
 
-
-} // namespace StringTools
+  return wrapped;
+}
 
 
-} //  namespace CppUnit
+CPPUNIT_NS_END