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 <string> 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 <iostream> -> #include <cppunit/Portability/Stream.h>
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.

1 files changed, 9 insertions, 11 deletions

diff --git a/src/cppunit/CompilerOutputter.cpp b/src/cppunit/CompilerOutputter.cpp
index 790481a..ab0f4bb 100644
--- a/src/cppunit/CompilerOutputter.cpp
+++ b/src/cppunit/CompilerOutputter.cpp
@@ -11,7 +11,7 @@ CPPUNIT_NS_BEGIN
 
 
 CompilerOutputter::CompilerOutputter( TestResultCollector *result,
-                                      std::ostream &stream,
+                                      OStream &stream,
                                       const std::string &locationFormat )
     : m_result( result )
     , m_stream( stream )
@@ -35,7 +35,7 @@ CompilerOutputter::setLocationFormat( const std::string &locationFormat )
 
 CompilerOutputter *
 CompilerOutputter::defaultOutputter( TestResultCollector *result,
-                                     std::ostream &stream )
+                                     OStream &stream )
 {
   return new CompilerOutputter( result, stream );
 }
@@ -54,8 +54,7 @@ CompilerOutputter::write()
 void 
 CompilerOutputter::printSuccess()
 {
-  m_stream  << "OK (" << m_result->runTests()  << ")"  
-            <<  std::endl;
+  m_stream  << "OK (" << m_result->runTests()  << ")\n";
 }
 
 
@@ -161,35 +160,34 @@ CompilerOutputter::printFailureType( TestFailure *failure )
 void 
 CompilerOutputter::printFailedTestName( TestFailure *failure )
 {
-  m_stream  <<  std::endl;
-  m_stream  <<  "Test name: "  <<  failure->failedTestName();
+  m_stream  <<  "\nTest name: "  <<  failure->failedTestName();
 }
 
 
 void 
 CompilerOutputter::printFailureMessage( TestFailure *failure )
 {
-  m_stream  <<  std::endl;
+  m_stream  <<  "\n";
   Exception *thrownException = failure->thrownException();
-  m_stream  << thrownException->message().shortDescription()  <<  std::endl;
+  m_stream  << thrownException->message().shortDescription()  <<  "\n";
 
   std::string message = thrownException->message().details();
   if ( m_wrapColumn > 0 )
     message = StringTools::wrap( message, m_wrapColumn );
 
-  m_stream  <<  message  <<  std::endl;
+  m_stream  <<  message  <<  "\n";
 }
 
 
 void 
 CompilerOutputter::printStatistics()
 {
-  m_stream  <<  "Failures !!!"  <<  std::endl;
+  m_stream  <<  "Failures !!!\n";
   m_stream  <<  "Run: "  <<  m_result->runTests()  << "   "
             <<  "Failure total: "  <<  m_result->testFailuresTotal()  << "   "
             <<  "Failures: "  <<  m_result->testFailures()  << "   "
             <<  "Errors: "  <<  m_result->testErrors()
-            <<  std::endl;
+            <<  "\n";
 }