[Mockpp-commits] mockpp/mockpp/tests Formatter_test.cpp,1.33,1.34 VerifyingTestCaller_test.cpp,1.15,1.16

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

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

Modified Files:
	Formatter_test.cpp VerifyingTestCaller_test.cpp 
Log Message:
fixes bcb5, msvc

Index: VerifyingTestCaller_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VerifyingTestCaller_test.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- VerifyingTestCaller_test.cpp	28 Dec 2005 09:23:31 -0000	1.15
+++ VerifyingTestCaller_test.cpp	28 Dec 2005 19:43:08 -0000	1.16
@@ -39,13 +39,19 @@
 # include <memory>
 #endif
 
-#include <mockpp/framework/VerifyingTestCaller.h>
-
 #include <mockpp/compat/Assert.h>
 
+#if defined (MOCKPP_USE_CXXTEST)
+
+#elif defined(MOCKPP_USE_CPPUNIT)
+
+#include <mockpp/framework/VerifyingTestCaller.h>
+
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/TestResult.h>
 
+#endif
+
 
 namespace {
 

Index: Formatter_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Formatter_test.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Formatter_test.cpp	28 Dec 2005 09:23:31 -0000	1.33
+++ Formatter_test.cpp	28 Dec 2005 19:43:08 -0000	1.34
@@ -262,10 +262,10 @@
 
   mockpp::String str = mockpp::number(ul);  // base 10
   char buff[100];
-#if defined(_MSC_VER)
-   sprintf( buff, "%ld", ul );
+#ifdef HAVE_SPRINTF_S
+  sprintf_s(buff, "%ld", ul );
 #else
-   std::sprintf(buff, "%ld", ul );
+  std::sprintf(buff, "%ld", ul );
 #endif
 
 #ifdef MOCKPP_UNICODE
@@ -301,10 +301,10 @@
 
   mockpp::String str = mockpp::number(ul);  // base 10
   char buff[100];
-#if defined(_MSC_VER)
-   sprintf( buff, "%ld", ul );
+#ifdef HAVE_SPRINTF_S
+  sprintf_s(buff, "%ld", ul );
 #else
-   std::sprintf(buff, "%ld", ul );
+  std::sprintf(buff, "%ld", ul );
 #endif
 
 #ifdef MOCKPP_UNICODE
@@ -327,10 +327,10 @@
 
   mockpp::String str = mockpp::number(ul);  // base 10
   char buff[100];
-#if defined(_MSC_VER)
-   sprintf( buff, "%lu", ul );
+#ifdef HAVE_SPRINTF_S
+  sprintf_s(buff, "%ld", ul );
 #else
-   std::sprintf(buff, "%lu", ul );
+  std::sprintf(buff, "%lu", ul );
 #endif
 
 #ifdef MOCKPP_UNICODE