[Mockpp-commits] mockpp/mockpp/bugs list_test.cpp,1.1,1.2

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

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

Modified Files:
	list_test.cpp 
Log Message:
optionally disable mockpp namespace

Index: list_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/bugs/list_test.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- list_test.cpp	4 Feb 2006 14:51:07 -0000	1.1
+++ list_test.cpp	15 Mar 2006 21:34:01 -0000	1.2
@@ -6,9 +6,9 @@
         virtual void check( xml::xistream& xis ) = 0;
     };
 
-    typedef mockpp::Invocation1< xml::xistream > Invocation;
+    typedef MOCKPP_NS::Invocation1< xml::xistream > Invocation;
 
-    class xistream_matcher : public mockpp::InvocationMatcher< Invocation >
+    class xistream_matcher : public MOCKPP_NS::InvocationMatcher< Invocation >
     {
     public:
         xistream_matcher( xistream_constraint& constraint )
@@ -61,18 +61,18 @@
         const std::string content_;
     };
 
-    class mock_custom_class : public mockpp::ChainableMockObject
+    class mock_custom_class : public MOCKPP_NS::ChainableMockObject
     {
     public:
         mock_custom_class()
-            : mockpp::ChainableMockObject( "mock_custom_class", 0 )
+            : MOCKPP_NS::ChainableMockObject( "mock_custom_class", 0 )
             , process_mocker             ( "process", this )
         {}
         void process( xml::xistream& xis )
         {
             process_mocker.forward( xis );
         }
-        mockpp::ChainableMockMethod< void, xml::xistream > process_mocker;
+        MOCKPP_NS::ChainableMockMethod< void, xml::xistream > process_mocker;
     };
 }
 
@@ -100,11 +100,11 @@
 
 namespace
 {
-    class mock_custom_class_with_parameters : public mockpp::ChainableMockObject
+    class mock_custom_class_with_parameters : public MOCKPP_NS::ChainableMockObject
     {
     public:
         mock_custom_class_with_parameters()
-            : mockpp::ChainableMockObject( "mock_custom_class", 0 )
+            : MOCKPP_NS::ChainableMockObject( "mock_custom_class", 0 )
             , process_mocker             ( "process", this )
         {}
         void process( xml::xistream& xis, int& p1, const float& p2 )
@@ -113,7 +113,7 @@
             BOOST_CHECK_EQUAL( 12.42f, p2 ); // $$$$ MAT 2006-02-04: forward to the mock instead
             process_mocker.forward( xis );
         }
-        mockpp::ChainableMockMethod< void, xml::xistream > process_mocker;
+        MOCKPP_NS::ChainableMockMethod< void, xml::xistream > process_mocker;
     };
 }