[Mockpp-commits] mockpp/mockpp/framework CxxTestRunner.h,1.7,1.8 VerifyingTestCaller.h,1.6,1.7 VerifyingTestCase.cpp,1.5,1.6 VerifyingTestCase.h,1.6,1.7

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

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

Modified Files:
	CxxTestRunner.h VerifyingTestCaller.h VerifyingTestCase.cpp 
	VerifyingTestCase.h 
Log Message:
more namespace disabling

Index: VerifyingTestCase.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCase.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- VerifyingTestCase.cpp	15 Mar 2006 21:34:05 -0000	1.5
+++ VerifyingTestCase.cpp	5 Apr 2006 17:03:39 -0000	1.6
@@ -57,7 +57,7 @@
 
 
 MOCKPP_EXPORT
-VerifyingTestCase::VerifyingTestCase( const std::string &name)
+VerifyingTestCase::VerifyingTestCase( const MOCKPP_STD_NS::string &name)
   : CppUnit::TestCase(name)
 #ifdef MOCKPP_ALTERNATIVE_STL
   , MockObject(MOCKPP_PCHAR("VerifyingTestCase/")+MOCKPP_GET_STRING(name.c_str()), 0)

Index: VerifyingTestCaller.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCaller.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- VerifyingTestCaller.h	15 Mar 2006 21:34:05 -0000	1.6
+++ VerifyingTestCaller.h	5 Apr 2006 17:03:39 -0000	1.7
@@ -66,7 +66,7 @@
     * \param test the method this VerifyingTestCaller calls in runTest()
     * \param fixture the Fixture to invoke the test method on.
     */
-    VerifyingTestCaller(const std::string &name,
+    VerifyingTestCaller(const MOCKPP_STD_NS::string &name,
                         TestCaseMethod test,
                         VerifyingFixtureType& fixture)
       : ::CppUnit::TestCaller<VerifyingFixtureType>(name, test, fixture)
@@ -82,7 +82,7 @@
     * \param test the method this VerifyingTestCaller calls in runTest()
     * \param fixture the Fixture to invoke the test method on.
     */
-    VerifyingTestCaller(const std::string &name,
+    VerifyingTestCaller(const MOCKPP_STD_NS::string &name,
                         TestCaseMethod test,
                         VerifyingFixtureType* fixture)
 	  : ::CppUnit::TestCaller<VerifyingFixtureType>(name, test, fixture)

Index: VerifyingTestCase.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCase.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- VerifyingTestCase.h	15 Mar 2006 21:34:05 -0000	1.6
+++ VerifyingTestCase.h	5 Apr 2006 17:03:39 -0000	1.7
@@ -67,7 +67,7 @@
   /** Constructs the test case.
     * @param name  test case name
     */
-    VerifyingTestCase( const std::string &name );
+    VerifyingTestCase( const MOCKPP_STD_NS::string &name );
 
   /** Constructs the test case.
     */

Index: CxxTestRunner.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/CxxTestRunner.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- CxxTestRunner.h	19 Mar 2006 11:09:37 -0000	1.7
+++ CxxTestRunner.h	5 Apr 2006 17:03:39 -0000	1.8
@@ -61,7 +61,7 @@
         _TS_CATCH_TYPE( (MOCKPP_NS::Exception &ex),
                         {CXXTEST_NS::tracker().failedTest( MOCKPP_NS::getLatin1(ex.getSrcFile()).c_str(), ex.getSrcLine(), MOCKPP_NS::getLatin1(ex.getMessage()).c_str() ); } )
 
-        _TS_CATCH_TYPE( (std::exception &ex),
+        _TS_CATCH_TYPE( (CXXTEST_STD_NS::exception &ex),
                         {CXXTEST_NS::tracker().failedTest( __FILE__, __LINE__, ex.what() ); } )
 
         _TS_LAST_CATCH( { CXXTEST_NS::tracker().failedTest( __FILE__, __LINE__, "Exception thrown from world" ); } );