[Mockpp-commits] mockpp/mockpp/compat Formatter.cpp,1.45,1.46 Formatter.h,1.36,1.37

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

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

Modified Files:
	Formatter.cpp Formatter.h 
Log Message:
fixes bcb5, msvc

Index: Formatter.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- Formatter.h	1 Dec 2005 16:14:09 -0000	1.36
+++ Formatter.h	28 Dec 2005 19:43:08 -0000	1.37
@@ -330,8 +330,12 @@
 #ifdef MOCKPP_UNICODE
   return mockpp::getUnicode(oss.str());
 #else
+#ifdef MOCKPP_ALTERNATIVE_STL
+  return oss.str().c_str();
+#else
   return oss.str();
 #endif
+#endif
 }
 
 }

Index: Formatter.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- Formatter.cpp	26 Nov 2005 17:56:44 -0000	1.45
+++ Formatter.cpp	28 Dec 2005 19:43:08 -0000	1.46
@@ -151,8 +151,8 @@
   }
   *fs++ = 'g';
   *fs = '\0';
-#if defined(_MSC_VER)
-  sprintf( buf, format, n );
+#if defined HAVE_SPRINTF_S
+  sprintf_s( buf, format, n );
 #else
   std::sprintf( buf, format, n );
 #endif