Update of /cvsroot/mockpp/mockpp/mockpp/examples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/mockpp/examples
Modified Files:
mock_greeter.cpp
Log Message:
more namespace disabling
Index: mock_greeter.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/mock_greeter.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- mock_greeter.cpp 19 Mar 2006 11:09:37 -0000 1.24
+++ mock_greeter.cpp 5 Apr 2006 17:03:38 -0000 1.25
@@ -492,16 +492,16 @@
ret = run_cppunit(argc, argv);
- std::cout << "\n";
+ MOCKPP_STD_NS::cout << "\n";
#else
- std::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Test framework was not available at compile time!\n")).c_str();
- std::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Will use mockpp features only.\n\n")).c_str();
+ MOCKPP_STD_NS::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Test framework was not available at compile time!\n")).c_str();
+ MOCKPP_STD_NS::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Will use mockpp features only.\n\n")).c_str();
#endif
try
{
- std::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Now running some tests with just mockpp features:\n\n")).c_str();
+ MOCKPP_STD_NS::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Now running some tests with just mockpp features:\n\n")).c_str();
Streamer_test st;
st.test_write_ok();
@@ -533,12 +533,12 @@
}
catch(MOCKPP_NS::Exception &ex)
{
- std::cout << "file: " << MOCKPP_NS::getLatin1(ex.getSrcFile()).c_str() << std::endl
- << "line: " << ex.getSrcLine() << std::endl
- << "msg : " << MOCKPP_NS::getLatin1(ex.getMessage()).c_str() << std::endl;
+ MOCKPP_STD_NS::cout << "file: " << MOCKPP_NS::getLatin1(ex.getSrcFile()).c_str() << MOCKPP_STD_NS::endl
+ << "line: " << ex.getSrcLine() << MOCKPP_STD_NS::endl
+ << "msg : " << MOCKPP_NS::getLatin1(ex.getMessage()).c_str() << MOCKPP_STD_NS::endl;
ret = 1;
}
- std::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Finished.\n")).c_str();
+ MOCKPP_STD_NS::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Finished.\n")).c_str();
return ret;
}
|