[Mockpp-commits] mockpp/mockpp Makefile.am,1.77,1.78 VerifyingTestCaller.h,1.8,1.9 mockpp.h,1.50,1.51

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

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

Modified Files:
	Makefile.am VerifyingTestCaller.h mockpp.h 
Log Message:
more efforts to make msvc6 compile

Index: mockpp.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- mockpp.h	2 Apr 2005 20:45:29 -0000	1.50
+++ mockpp.h	3 Apr 2005 18:32:45 -0000	1.51
@@ -104,7 +104,7 @@
 # endif // _MSC_VER
 
 
-#if defined(_MSC_VER)
+#ifdef _MSC_VER
 # if _MSC_VER <= 1300
 #  define _MSC_VER_60_70
 #  include <mockpp/mockpp_config-msvc_60_70.h>

Index: VerifyingTestCaller.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/VerifyingTestCaller.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- VerifyingTestCaller.h	11 Mar 2005 00:24:54 -0000	1.8
+++ VerifyingTestCaller.h	3 Apr 2005 18:32:45 -0000	1.9
@@ -50,7 +50,7 @@
   * @ingroup grp_advanced_mo
   */
 template <typename VerifyingFixtureType, bool DoTheVerify>
-class VerifyingTestCaller : public CppUnit::TestCaller<VerifyingFixtureType>
+class VerifyingTestCaller : public ::CppUnit::TestCaller<VerifyingFixtureType>
 {
   typedef void (VerifyingFixtureType::*TestCaseMethod)();
 
@@ -67,7 +67,7 @@
     VerifyingTestCaller(const std::string &name,
                         TestCaseMethod test,
                         VerifyingFixtureType& fixture)
-      : CppUnit::TestCaller<VerifyingFixtureType>(name, test, fixture)
+      : ::CppUnit::TestCaller<VerifyingFixtureType>(name, test, fixture)
       , testcase(&fixture)
     {
     }
@@ -83,7 +83,7 @@
     VerifyingTestCaller(const std::string &name,
                         TestCaseMethod test,
                         VerifyingFixtureType* fixture)
-      : CppUnit::TestCaller<VerifyingFixtureType>(name, test, fixture)
+	  : ::CppUnit::TestCaller<VerifyingFixtureType>(name, test, fixture)
       , testcase(fixture)
     {
     }
@@ -95,7 +95,7 @@
       testcase->unregisterVerifiables();
       try
       {
-        CppUnit::TestCaller<VerifyingFixtureType>::runTest();
+		::CppUnit::TestCaller<VerifyingFixtureType>::runTest();
         bool doVerify = DoTheVerify;
         if (doVerify)
           testcase->verify();
@@ -170,7 +170,7 @@
   */
 #define MOCKPP_VERIFYING_TEST_EXCEPTION( testMethod, ExceptionType )  \
   CPPUNIT_TEST_SUITE_ADD_TEST(                                        \
-      (new CppUnit::ExceptionTestCaseDecorator< ExceptionType >(      \
+      (new ::CppUnit::ExceptionTestCaseDecorator< ExceptionType >(      \
           new mockpp::VerifyingTestCaller< TestFixtureType, true >(   \
                                context.getTestNameFor( #testMethod ), \
                                &TestFixtureType::testMethod,          \
@@ -187,7 +187,7 @@
   */
 #define MOCKPP_TEST_EXCEPTION( testMethod, ExceptionType )  \
   CPPUNIT_TEST_SUITE_ADD_TEST(                                        \
-      (new CppUnit::ExceptionTestCaseDecorator< ExceptionType >(      \
+      (new ::CppUnit::ExceptionTestCaseDecorator< ExceptionType >(      \
           new mockpp::VerifyingTestCaller< TestFixtureType, false >(  \
                                context.getTestNameFor( #testMethod ), \
                                &TestFixtureType::testMethod,          \

Index: Makefile.am
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/Makefile.am,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- Makefile.am	2 Apr 2005 20:52:08 -0000	1.77
+++ Makefile.am	3 Apr 2005 18:32:43 -0000	1.78
@@ -148,7 +148,7 @@
 	echo "#define HAVE_STD_WCSCMP" >>$@
 	echo "" >>$@
 	echo "/* Define to supress compiler warnings about unused variables. */" >>$@
-	echo "define MOCKPP_UNUSED(x) x;" >>$@
+	echo "#define MOCKPP_UNUSED(x) x;" >>$@
 	echo "" >>$@
 	-test $@ -ef $(srcdir) || cp $@ $(srcdir)
 
@@ -191,7 +191,7 @@
 	echo "#define HAVE_STD_WCSCMP" >>$@
 	echo "" >>$@
 	echo "/* Define to supress compiler warnings about unused variables. */" >>$@
-	echo "define MOCKPP_UNUSED(x) x;" >>$@
+	echo "#define MOCKPP_UNUSED(x) x;" >>$@
 	echo "" >>$@
 	-test $@ -ef $(srcdir) || cp $@ $(srcdir)
 
@@ -237,7 +237,7 @@
 	echo "#undef HAVE_STD_WCSCMP" >>$@
 	echo "" >>$@
 	echo "/* Define to supress compiler warnings about unused variables. */" >>$@
-	echo "define MOCKPP_UNUSED(x) x;" >>$@
+	echo "#define MOCKPP_UNUSED(x) x;" >>$@
 	echo "" >>$@
 	-test $@ -ef $(srcdir) || cp $@ $(srcdir)