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. --- include/cppunit/CompilerOutputter.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/cppunit/CompilerOutputter.h') diff --git a/include/cppunit/CompilerOutputter.h b/include/cppunit/CompilerOutputter.h index e5ca0b3..ef8b67d 100644 --- a/include/cppunit/CompilerOutputter.h +++ b/include/cppunit/CompilerOutputter.h @@ -3,7 +3,7 @@ #include #include -#include +#include CPPUNIT_NS_BEGIN @@ -64,7 +64,7 @@ public: * \see setLocationFormat(). */ CompilerOutputter( TestResultCollector *result, - std::ostream &stream, + OStream &stream, const std::string &locationFormat = CPPUNIT_COMPILER_LOCATION_FORMAT ); /// Destructor. @@ -100,7 +100,7 @@ public: * Use CompilerOutputter::CompilerOutputter instead. */ static CompilerOutputter *defaultOutputter( TestResultCollector *result, - std::ostream &stream ); + OStream &stream ); void write(); @@ -134,7 +134,7 @@ private: private: TestResultCollector *m_result; - std::ostream &m_stream; + OStream &m_stream; std::string m_locationFormat; int m_wrapColumn; }; -- cgit v1.2.1