[Mockpp-commits] mockpp/mockpp mockpp.h,1.47,1.48

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

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

Modified Files:
	mockpp.h 
Log Message:
msvc6 fixes

Index: mockpp.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- mockpp.h	24 Mar 2005 21:43:06 -0000	1.47
+++ mockpp.h	25 Mar 2005 18:46:56 -0000	1.48
@@ -84,23 +84,36 @@
 #include <typeinfo>
 
 # ifdef _MSC_VER
-// Compilation Warning remover, used to skip some STL compilation warnings
+// Compilation Warning remover
+// needed to prevent MSVC6 complain about itself :-/
 #  pragma warning (disable:4786)  // this warning occurs when VC6 truncate a debug symbol which is longer than 255 chars.
 #  pragma warning (disable:4251)  // this warning occurs when a class member doesn't have a dll-interface.
 #  pragma warning (disable:4180)
 #  pragma warning (disable:4355)
-#  pragma warning (disable:4512)
-#  pragma warning (disable:4100)
+#  pragma warning (disable:4512)
+#  pragma warning (disable:4511)
+#  pragma warning (disable:4018)
+#  pragma warning (disable:4100)
+#  pragma warning (disable:4663)
+#  pragma warning (disable:4146)
+#  pragma warning (disable:4244)
 # endif // _MSC_VER
-
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-# include <mockpp/mockpp_config-msvc_60_70.h>
-#elif defined(_MSC_VER)
-# include <mockpp/mockpp_config-msvc_71.h>
+
+
+#if defined(_MSC_VER)
+# if _MSC_VER <= 1200
+#  define _MSC_VER_60_70  1
+#  include <mockpp/mockpp_config-msvc_60_70.h>
+# else defined(_MSC_VER)
+# include <mockpp/mockpp_config-msvc_71.h>
+# endif
+
 #elif defined(__BORLANDC__)
 # include <mockpp/mockpp_config-bcb5.h>
+
 #elif defined(__CYGWIN__)
 # include <mockpp/mockpp_config-cygwin.h>
+
 #else
 # ifdef HAVE_CONFIG_H
 #  include <config.h>
@@ -111,7 +124,7 @@
 
 #include <string>
 
-#ifdef HAVE_LIMITS
+#ifdef HAVE_LIMITS
 # include <limits>     // current
 #else
 # ifdef HAVE_VALUES_H
@@ -121,19 +134,20 @@
 # endif
 #endif
 
+/** @def MOCKPP_UNLIMITED
+  * Value representing an @p unlimited number.
+  */
+
 #ifdef HAVE_LIMITS
 # define MOCKPP_UNLIMITED  (std::numeric_limits<unsigned>::max())
 #else
 # define MOCKPP_UNLIMITED  (UINT_MAX)
 #endif
-/** @def MOCKPP_UNLIMITED
-  * Value representing an @p unlimited number.
-  */
-
+
 #ifdef __BORLANDC__
 # define MOCKPP_FUNC_MACRO  __FUNC__
 #elif defined(_MSC_VER)
-# if _MSC_VER <= 1200
+# if _MSC_VER <= 1200
 #  define MOCKPP_FUNC_MACRO  (std::string(__FILE__)  + "_" + mockpp::getLatin1(mockpp::number((long unsigned)__LINE__))) // needs #include <mockpp/compat/Formatter.h>
 # else
 #  define MOCKPP_FUNC_MACRO  __FUNCSIG__
@@ -183,7 +197,7 @@
 
 # endif
 
-# if defined (_MSC_VER)
+# ifdef _MSC_VER
 // DLL
 // EXPORT
 #  if defined(MOCKPP_MAKING_DLL) || defined(MOCKPP_EXPORTS)