[Mockpp-commits] mockpp/mockpp mockpp_config-bcb5.h,1.4,1.5 mockpp_config-msvc_71.h,1.4,1.5 mockpp.h,1.78,1.79

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

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

Modified Files:
	mockpp_config-bcb5.h mockpp_config-msvc_71.h mockpp.h 
Log Message:
optionally disable CxxTest and ministl namespace

Index: mockpp.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.h,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- mockpp.h	15 Mar 2006 21:56:32 -0000	1.78
+++ mockpp.h	17 Mar 2006 08:42:46 -0000	1.79
@@ -166,7 +166,7 @@
 #define MOCKPP_FUNCTION_H  <ministl/function>
 
 // namespace ministl
-#define MOCKPP_STL ministl
+#define MOCKPP_STL       MINISTL_NS
 #define MOCKPP_ALTERNATIVE_STL
 
 #else
@@ -179,7 +179,7 @@
 #define MOCKPP_ALGORITHM_H <algorithm>
 
 // namespace std
-#define MOCKPP_STL std
+#define MOCKPP_STL  MOCKPP_STD_NS
 #undef MOCKPP_ALTERNATIVE_STL
 
 #endif
@@ -203,12 +203,14 @@
 # define MOCKPP_NS_START         /* nothing */
 # define MOCKPP_NS_END           /* nothing */
 # define USING_NAMESPACE_MOCKPP  /* nothing */
+# define MOCKPP_STD_NS           /* nothing */
 #else
 # define MOCKPP_ANON_NS_START    namespace {
 # define MOCKPP_NS               mockpp
 # define MOCKPP_NS_START         namespace mockpp {
 # define MOCKPP_NS_END           }
 # define USING_NAMESPACE_MOCKPP  using namespace mockpp;
+# define MOCKPP_STD_NS           std
 #endif
 
 //////////////////////////////////////////////////
@@ -266,7 +268,7 @@
   */
 
 #ifdef HAVE_LIMITS
-# define MOCKPP_UNLIMITED  (std::numeric_limits<unsigned>::max())
+# define MOCKPP_UNLIMITED  (MOCKPP_STD_NS::numeric_limits<unsigned>::max())
 #else
 # define MOCKPP_UNLIMITED  (UINT_MAX)
 #endif
@@ -542,6 +544,14 @@
 #define MOCKPP_USE_MINI_STL
 #endif
 
+/** @def MOCKPP_NO_NAMESPACE
+  * @ingroup grp_config
+  * Defined if namespace support is not working properly.
+  * In this case \c mockpp resides in the global namespace.
+  * If ministl and CxxTest are used they should also be configured
+  * with \c MINISTL_NO_NAMESPACE and  \c CXXTEST_NO_NAMESPACE .
+  */
+
 /** @def MOCKPP_UNICODE
   * @ingroup grp_config
   * Defined if \c Unicode strings are used.

Index: mockpp_config-bcb5.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp_config-bcb5.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mockpp_config-bcb5.h	12 Mar 2006 08:25:55 -0000	1.4
+++ mockpp_config-bcb5.h	17 Mar 2006 08:42:46 -0000	1.5
@@ -1,6 +1,6 @@
 // #define's for Borland BCB5
 // derived from automatically generated config.h. See Makefile.am.
-/* Generated: 2006-03-06 */
+/* Generated: 2006-03-16 */
 
 #pragma warn -8030 // temporary variables
 
@@ -11,7 +11,7 @@
 #undef DEBUG
 
 /* Version number of package */
-#define MOCKPP_VERSION "1.11.3"
+#define MOCKPP_VERSION "1.11.4"
 
 /* Name of package */
 #define MOCKPP_PACKAGE "mockpp"

Index: mockpp_config-msvc_71.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp_config-msvc_71.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mockpp_config-msvc_71.h	12 Mar 2006 08:25:55 -0000	1.4
+++ mockpp_config-msvc_71.h	17 Mar 2006 08:42:46 -0000	1.5
@@ -1,6 +1,6 @@
 // #define's for MS Visual C++ 7.1 and later (NOT 6.0/7.0)
 // derived from automatically generated config.h. See Makefile.am.
-/* Generated: 2006-03-06 */
+/* Generated: 2006-03-16 */
 
 /* Define to use sprintf_s instead of sprintf. */
 #if _MSC_VER >= 1400
@@ -11,7 +11,7 @@
 #undef DEBUG
 
 /* Version number of package */
-#define MOCKPP_VERSION "1.11.3"
+#define MOCKPP_VERSION "1.11.4"
 
 /* Name of package */
 #define MOCKPP_PACKAGE "mockpp"