From 212df8f138166ed053d63d6d54e1a1290e395ae5 Mon Sep 17 00:00:00 2001 From: Baptiste Lepilleur Date: Fri, 25 Jun 2004 09:41:28 +0000 Subject: Include/cppunit/Portability. include/cppunit/Portability.h: moved OStringStream alias definition to Portability/Stream.h. User need to define EVC4 to indicate that config-evc4.h should be used. (how to we detect this automatically ?). Notes that this means it might be needed to add #include to some headers since its no longer included by Portability.h. * include/cppunit/Portability/Stream.h: define alias OStringStream, stdCOut(), and OFileStream. If CPPUNIT_NO_STREAM is defined (evc4 config), then provides our own implementation (based on sprintf and fwrite). * include/cppunit/config/config-evc4.h: config file for embedded visual c++ 4. Still need to detect for this platform in Portability.h (currently relying on EVC4 being defined...) * *.[cpp/h]: most source files have been impacted with the following change: #include -> #include std::ostream -> CPPUNIT_NS::OStream std::ofstream -> CPPUNIT_NS::OFileStream std::cout -> CPPUNIT_NS::stdCOut() std::endl -> "\n" Also, code using std::cin as been defined out if CPPUNIT_NO_STREAM was defined. The exact list of impact files can be obtain in CVS using tags: TG_CPPUNIT_NO_STREAM_BEFORE & TG_CPPUNIT_NO_STREAM_AFTER. --- src/cppunit/TextTestResult.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/cppunit/TextTestResult.cpp') diff --git a/src/cppunit/TextTestResult.cpp b/src/cppunit/TextTestResult.cpp index c155745..b498af8 100644 --- a/src/cppunit/TextTestResult.cpp +++ b/src/cppunit/TextTestResult.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include CPPUNIT_NS_BEGIN @@ -19,7 +19,7 @@ void TextTestResult::addFailure( const TestFailure &failure ) { TestResultCollector::addFailure( failure ); - std::cerr << ( failure.isError() ? "E" : "F" ); + stdCOut() << ( failure.isError() ? "E" : "F" ); } @@ -27,20 +27,20 @@ void TextTestResult::startTest( Test *test ) { TestResultCollector::startTest (test); - std::cerr << "."; + stdCOut() << "."; } void -TextTestResult::print( std::ostream& stream ) +TextTestResult::print( OStream &stream ) { TextOutputter outputter( this, stream ); outputter.write(); } -std::ostream & -operator <<( std::ostream &stream, +OStream & +operator <<( OStream &stream, TextTestResult &result ) { result.print (stream); return stream; -- cgit v1.2.1