[Mockpp-commits] mockpp/mockpp Makefile.am,1.102,1.103 mockpp.cpp,1.22,1.23 mockpp.h,1.68,1.69

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

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

Modified Files:
	Makefile.am mockpp.cpp mockpp.h 
Log Message:
fixes bcb5, msvc

Index: mockpp.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- mockpp.h	23 Dec 2005 22:03:30 -0000	1.68
+++ mockpp.h	28 Dec 2005 19:43:08 -0000	1.69
@@ -84,7 +84,7 @@
 
 # ifdef _MSC_VER
 // Compilation Warning remover
-// needed to prevent MSVC6 complain about itself :-/
+#  pragma warning (disable:4800)  // conversion int - bool
 #  pragma warning (disable:4786)  // identifier was truncated to 'number' characters in the debug information
 #  pragma warning (disable:4251)  // class 'type' needs to have dll-interface to be used by clients of class 'type2'
 #  pragma warning (disable:4180)  // qualifier applied to function type has no meaning
@@ -153,7 +153,6 @@
 
 #ifdef MOCKPP_USE_MINI_STL
 
-#include <ministl/string>
 #define MOCKPP_STRING_H    <ministl/string>
 #define MOCKPP_VECTOR_H    <ministl/vector>
 #define MOCKPP_MAP_H       <ministl/map>
@@ -167,7 +166,6 @@
 
 #else
 
-#include <string>
 #define MOCKPP_STRING_H    <string>
 #define MOCKPP_VECTOR_H    <vector>
 #define MOCKPP_MAP_H       <map>
@@ -384,6 +382,8 @@
 //////////////////////////////////////////////////
 //
 
+#include MOCKPP_STRING_H
+
 //! Namespace for project  "Mock Objects for C++"
 namespace mockpp {
 

Index: mockpp.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- mockpp.cpp	23 Dec 2005 22:03:30 -0000	1.22
+++ mockpp.cpp	28 Dec 2005 19:43:08 -0000	1.23
@@ -124,6 +124,7 @@
 extern AssertionFailedForwarder_t forwardAssertionFailed;
 
 AssertionFailedForwarder_t
+MOCKPP_EXPORT 
 setAssertionFailedForwarder(AssertionFailedForwarder_t fwd)
 {
   AssertionFailedForwarder_t temp = forwardAssertionFailed;

Index: Makefile.am
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/Makefile.am,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- Makefile.am	28 Dec 2005 09:23:30 -0000	1.102
+++ Makefile.am	28 Dec 2005 19:43:08 -0000	1.103
@@ -116,6 +116,8 @@
 	echo "// derived from automatically generated config.h. See Makefile.am." >>$@
 	TODAY=`date +%Y-%m-%d` ; echo "/* Generated: $$TODAY */" >>$@
 	echo "" >>$@
+	echo "/* Define to use sprintf_s instead of sprintf. */" >>$@
+	echo "#define HAVE_SPRINTF_S"
 	$(SHELL) $(srcdir)/config/gen-config-common.sh $@ $(VERSION) $(PACKAGE)
 	-test $@ -ef $(srcdir) || cp $@ $(srcdir)