[Mockpp-commits] mockpp/mockpp ExpectationMap.h,1.23,1.24 Makefile.am,1.73,1.74 VerifyingTestCase.cpp,1.22,1.23 mockpp.h,1.46,1.47

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

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

Modified Files:
	ExpectationMap.h Makefile.am VerifyingTestCase.cpp mockpp.h 
Log Message:
fixed compiler warnings

Index: mockpp.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- mockpp.h	24 Mar 2005 18:54:10 -0000	1.46
+++ mockpp.h	24 Mar 2005 21:43:06 -0000	1.47
@@ -148,10 +148,11 @@
   */
 
 /** @def MOCKPP_UNUSED
-  * Simple macro to suppress warnings about unused variables.
+  * Simple macro to suppress warnings about unused variables if possible.
   */
-
-#define MOCKPP_UNUSED(x) x
+#ifndef MOCKPP_UNUSED
+#define MOCKPP_UNUSED(x)
+#endif
 
 //! mockpp::Exception is derived from std::exception
 #define MOCKPP_USE_STD_EXCEPTION

Index: VerifyingTestCase.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/VerifyingTestCase.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- VerifyingTestCase.cpp	27 Feb 2005 11:48:14 -0000	1.22
+++ VerifyingTestCase.cpp	24 Mar 2005 21:43:06 -0000	1.23
@@ -74,8 +74,8 @@
 {
   if (numVerifiables() == 0)
   {
-    String s = MOCKPP_PCHAR("VerifyingTestCase \"%1\" has no sub-objects to verify.\n"
-                            "Did you forget to register?");
+    String s = MOCKPP_PCHAR("VerifyingTestCase \"%1\" has no sub-objects to verify.\n")
+               MOCKPP_PCHAR("Did you forget to register?");
     s << getVerifiableName();
     throw AssertionFailedError (__LINE__, __FILE__, s);
   }

Index: Makefile.am
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/Makefile.am,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- Makefile.am	22 Mar 2005 22:03:21 -0000	1.73
+++ Makefile.am	24 Mar 2005 21:43:06 -0000	1.74
@@ -145,6 +145,9 @@
 	echo "/* Define if you have the std::wcscmp type. */" >>$@
 	echo "#define HAVE_WCSCMP" >>$@
 	echo "" >>$@
+	echo "/* Define to supress compiler warnings about unused variables. */" >>$@
+	echo "#define MOCKPP_UNUSED(x) x" >>$@
+	echo "" >>$@
 	-test $@ -ef $(srcdir) || cp $@ $(srcdir)
 
 mockpp_config-cygwin.h:
@@ -219,6 +222,9 @@
 	echo "/* Define if you have the std::wcscmp type. */" >>$@
 	echo "#define HAVE_WCSCMP" >>$@
 	echo "" >>$@
+	echo "/* Define to supress compiler warnings about unused variables. */" >>$@
+	echo "#define MOCKPP_UNUSED(x) x" >>$@
+	echo "" >>$@
 	-test $@ -ef $(srcdir) || cp $@ $(srcdir)
 
 mockpp_config-msvc_60_70.h:
@@ -259,6 +265,9 @@
 	echo "/* Define if you have the std::wcscmp type. */" >>$@
 	echo "#define HAVE_WCSCMP" >>$@
 	echo "" >>$@
+	echo "/* Define to supress compiler warnings about unused variables. */" >>$@
+	echo "#define MOCKPP_UNUSED(x) x" >>$@
+	echo "" >>$@
 	-test $@ -ef $(srcdir) || cp $@ $(srcdir)
 
 i18n_files = $(srcdir)/*.cpp $(srcdir)/*.h $(srcdir)/compat/*.h $(srcdir)/compat/*.cpp $(srcdir)/util/*.h $(srcdir)/util/*.cpp

Index: ExpectationMap.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/ExpectationMap.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ExpectationMap.h	24 Mar 2005 20:51:28 -0000	1.23
+++ ExpectationMap.h	24 Mar 2005 21:43:06 -0000	1.24
@@ -54,7 +54,7 @@
     * @param name    human readable description about the expectation
     * @param parent  parent verifiable
     */
-    ExpectationMap(const String &name, Verifiable *parent = 0)
+    ExpectationMap(const String &name, VerifiableList *parent = 0)
       :  ExpectationSet<Key>(name, parent)
     {
     }