[Mockpp-commits] mockpp/3party/cxxtest/cxxtest ErrorPrinter.h,1.2,1.3 Flags.h,1.5,1.6 StdValueTraits.h,1.4,1.5 TestSuite.h,1.4,1.5 ValueTraits.h,1.5,1.6

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/3party/cxxtest/cxxtest

Modified Files:
	ErrorPrinter.h Flags.h StdValueTraits.h TestSuite.h 
	ValueTraits.h 
Log Message:
more namespace disabling

Index: Flags.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/Flags.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Flags.h	17 Mar 2006 08:41:51 -0000	1.5
+++ Flags.h	5 Apr 2006 17:03:35 -0000	1.6
@@ -29,6 +29,15 @@
 //////////////////////////////////////////////////
 //
 
+#ifdef CXXTEST_NO_STD_NS
+# define CXXTEST_STD_NS           /* nothing */
+#else
+# define CXXTEST_STD_NS           std
+#endif
+
+//////////////////////////////////////////////////
+//
+
 #ifdef CXXTEST_NO_NAMESPACE
 # define CXXTEST_ANON_NS_START    /* nothing */
 # define CXXTEST_NS               /* nothing */

Index: TestSuite.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/TestSuite.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- TestSuite.h	19 Mar 2006 11:09:36 -0000	1.4
+++ TestSuite.h	5 Apr 2006 17:03:35 -0000	1.5
@@ -194,7 +194,7 @@
 #       define _TSM_LAST_CATCH(f,l,m) _TS_LAST_CATCH( { (CXXTEST_NS::tracker()).failedTest(f,l,m); } )
 #       ifdef _CXXTEST_HAVE_STD
 #           define ___TSM_CATCH(f,l,m) \
-                    catch(const std::exception &e) { (CXXTEST_NS::tracker()).failedTest(f,l,e.what()); } \
+                    catch(const CXXTEST_STD_NS::exception &e) { (CXXTEST_NS::tracker()).failedTest(f,l,e.what()); } \
                     _TSM_LAST_CATCH(f,l,m)
 #       else // !_CXXTEST_HAVE_STD
 #           define ___TSM_CATCH(f,l,m) _TSM_LAST_CATCH(f,l,m)

Index: ErrorPrinter.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/ErrorPrinter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ErrorPrinter.h	17 Mar 2006 08:41:51 -0000	1.2
+++ ErrorPrinter.h	5 Apr 2006 17:03:35 -0000	1.3
@@ -5,7 +5,7 @@
 // The ErrorPrinter is a simple TestListener that
 // just prints "OK" if everything goes well, otherwise
 // reports the error in the format of compiler messages.
-// The ErrorPrinter uses std::cout
+// The ErrorPrinter uses CXXTEST_STD_NS::cout
 //
 
 #include <cxxtest/Flags.h>

Index: ValueTraits.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/ValueTraits.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ValueTraits.h	19 Mar 2006 11:09:36 -0000	1.5
+++ ValueTraits.h	5 Apr 2006 17:03:35 -0000	1.6
@@ -311,7 +311,7 @@
     public:
         ValueTraits( double t )
         {
-            ( requiredDigitsOnLeft( t ) > MAX_DIGITS_ON_LEFT ) ?
+            ( requiredDigitsOnLeft( t ) > (unsigned) MAX_DIGITS_ON_LEFT ) ?
                 hugeNumber( t ) :
                 normalNumber( t );
         }
@@ -319,7 +319,12 @@
         const char *asString( void ) const { return _asString; }
 
     private:
-        enum { MAX_DIGITS_ON_LEFT = 24, DIGITS_ON_RIGHT = 4, BASE = 10 };
+        enum Digits
+        {
+          MAX_DIGITS_ON_LEFT = 24,
+          DIGITS_ON_RIGHT    = 4,
+          BASE               = 10
+        };
         char _asString[1 + MAX_DIGITS_ON_LEFT + 1 + DIGITS_ON_RIGHT + 1];
 
         static unsigned requiredDigitsOnLeft( double t );

Index: StdValueTraits.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/StdValueTraits.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- StdValueTraits.h	17 Mar 2006 08:41:51 -0000	1.4
+++ StdValueTraits.h	5 Apr 2006 17:03:35 -0000	1.5
@@ -2,7 +2,7 @@
 #define __cxxtest_StdValueTraits_h__
 
 //
-// This file defines ValueTraits for std:: stuff.
+// This file defines ValueTraits for CXXTEST_STD_NS:: stuff.
 // It is #included by <cxxtest/ValueTraits.h> if you
 // define CXXTEST_HAVE_STD
 //
@@ -13,7 +13,7 @@
 #ifdef _CXXTEST_OLD_STD
 #   define CXXTEST_STD(x) x
 #else // !_CXXTEST_OLD_STD
-#   define CXXTEST_STD(x) std::x
+#   define CXXTEST_STD(x) CXXTEST_STD_NS::x
 #endif // _CXXTEST_OLD_STD
 
 #ifndef CXXTEST_USER_VALUE_TRAITS
@@ -22,12 +22,12 @@
     //
     // NOTE: This should have been
     // template<class Char, class Traits, class Allocator>
-    // class ValueTraits< std::basic_string<Char, Traits, Allocator> > {};
+    // class ValueTraits< CXXTEST_STD_NS::basic_string<Char, Traits, Allocator> > {};
     // But MSVC doesn't support it (yet).
     //
 
     //
-    // If we have std::string, we might as well use it
+    // If we have CXXTEST_STD_NS::string, we might as well use it
     //
     class StdTraitsBase
     {
@@ -40,7 +40,7 @@
     };
 
     //
-    // std::string
+    // CXXTEST_STD_NS::string
     //
     CXXTEST_TEMPLATE_INSTANTIATION
     class ValueTraits<const CXXTEST_STL::string> : public StdTraitsBase
@@ -62,7 +62,7 @@
 
 #ifndef _CXXTEST_OLD_STD
     //
-    // std::wstring
+    // CXXTEST_STD_NS::wstring
     //
     CXXTEST_TEMPLATE_INSTANTIATION
     class ValueTraits<const CXXTEST_STL::basic_string<wchar_t> > : public StdTraitsBase
@@ -100,7 +100,7 @@
 
 #ifdef _CXXTEST_PARTIAL_TEMPLATE_SPECIALIZATION
     //
-    // std::pair
+    // CXXTEST_STD_NS::pair
     //
     template<class First, class Second>
     class ValueTraits< CXXTEST_STL::pair<First, Second> > : public StdTraitsBase
@@ -113,7 +113,7 @@
     };
 
     //
-    // std::vector
+    // CXXTEST_STD_NS::vector
     //
     template<class Element>
     class ValueTraits< CXXTEST_STL::vector<Element> > : public StdTraitsBase
@@ -126,7 +126,7 @@
     };
 
     //
-    // std::list
+    // CXXTEST_STD_NS::list
     //
     template<class Element>
     class ValueTraits< CXXTEST_STL::list<Element> > : public StdTraitsBase
@@ -139,7 +139,7 @@
     };
 
     //
-    // std::set
+    // CXXTEST_STD_NS::set
     //
     template<class Element>
     class ValueTraits< CXXTEST_STL::set<Element> > : public StdTraitsBase
@@ -152,7 +152,7 @@
     };
 
     //
-    // std::map
+    // CXXTEST_STD_NS::map
     //
     template<class Key, class Value>
     class ValueTraits< CXXTEST_STL::map<Key, Value> > : public StdTraitsBase
@@ -166,7 +166,7 @@
 
 #ifndef CXXTEST_USE_MINI_STL
     //
-    // std::deque
+    // CXXTEST_STD_NS::deque
     //
     template<class Element>
     class ValueTraits< CXXTEST_STL::deque<Element> > : public StdTraitsBase
@@ -181,7 +181,7 @@
 
 #ifndef CXXTEST_USE_MINI_STL
     //
-    // std::multiset
+    // CXXTEST_STD_NS::multiset
     //
     template<class Element>
     class ValueTraits< CXXTEST_STL::multiset<Element> > : public StdTraitsBase
@@ -195,7 +195,7 @@
 #endif
 
     //
-    // std::multimap
+    // CXXTEST_STD_NS::multimap
     //
     template<class Key, class Value>
     class ValueTraits< CXXTEST_STL::multimap<Key, Value> > : public StdTraitsBase
@@ -208,7 +208,7 @@
     };
 
     //
-    // std::complex
+    // CXXTEST_STD_NS::complex
     //
     template<class Number>
     class ValueTraits< CXXTEST_STD(complex)<Number> > : public StdTraitsBase