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, 4 insertions, 5 deletions

diff --git a/src/cppunit/AdditionalMessage.cpp b/src/cppunit/AdditionalMessage.cpp
index 49f73c7..9f3da13 100644
--- a/src/cppunit/AdditionalMessage.cpp
+++ b/src/cppunit/AdditionalMessage.cpp
@@ -1,8 +1,7 @@
 #include <cppunit/AdditionalMessage.h>
 
 
-namespace CppUnit
-{
+CPPUNIT_NS_BEGIN
 
 
 AdditionalMessage::AdditionalMessage()
@@ -24,14 +23,14 @@ AdditionalMessage::AdditionalMessage( const char *detail1 )
 }
 
 
-AdditionalMessage::AdditionalMessage( const CppUnit::Message &other )
+AdditionalMessage::AdditionalMessage( const Message &other )
     : SuperClass( other )
 {
 }
 
 
 AdditionalMessage &
-AdditionalMessage::operator =( const CppUnit::Message &other )
+AdditionalMessage::operator =( const Message &other )
 {
   SuperClass::operator =( other );
 
@@ -39,4 +38,4 @@ AdditionalMessage::operator =( const CppUnit::Message &other )
 }
 
 
-} // namespace CppUnit
+CPPUNIT_NS_END