[Mockpp-commits] mockpp/mockpp/bugs/boost test.cpp,1.2,1.3 tuple.cpp,1.1,1.2
Brought to you by:
ewald-arnold
From: Ewald A. <ewa...@us...> - 2006-03-15 21:34:39
|
Update of /cvsroot/mockpp/mockpp/mockpp/bugs/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv763/mockpp/bugs/boost Modified Files: test.cpp tuple.cpp Log Message: optionally disable mockpp namespace Index: tuple.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/bugs/boost/tuple.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- tuple.cpp 31 Jul 2005 11:19:23 -0000 1.1 +++ tuple.cpp 15 Mar 2006 21:34:01 -0000 1.2 @@ -26,7 +26,7 @@ virtual int bar ( const tuple_t& ){} }; - class mock : public mockpp::VisitableMockObject, + class mock : public MOCKPP_NS::VisitableMockObject, public Foo { mock (): Index: test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/bugs/boost/test.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- test.cpp 31 Jul 2005 14:21:50 -0000 1.2 +++ test.cpp 15 Mar 2006 21:34:01 -0000 1.3 @@ -11,7 +11,7 @@ typedef variant<int, string> var_t; - mockpp::String& operator<<(mockpp::String& s, const var_t& t) + MOCKPP_NS::String& operator<<(MOCKPP_NS::String& s, const var_t& t) { s << MOCKPP_PCHAR("var_t"); return s; @@ -23,7 +23,7 @@ virtual int bar ( const var_t& ){} }; - class mock : public mockpp::VisitableMockObject, + class mock : public MOCKPP_NS::VisitableMockObject, public Foo { public: |