[Mockpp-commits] mockpp/mockpp mockpp.h,1.80,1.81

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

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

Modified Files:
	mockpp.h 
Log Message:
cleanup namespace disabling

Index: mockpp.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- mockpp.h	19 Mar 2006 11:09:36 -0000	1.80
+++ mockpp.h	19 Mar 2006 16:26:50 -0000	1.81
@@ -203,13 +203,20 @@
 # 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;
+#endif
+
+//////////////////////////////////////////////////
+//
+
+#ifdef MOCKPP_NO_STD_NS
+# define MOCKPP_STD_NS           /* nothing */
+#else
 # define MOCKPP_STD_NS           std
 #endif