From 23fbd5919fed2fa64b7ff5d62093e917b583be4e Mon Sep 17 00:00:00 2001 From: curt Date: Tue, 19 Jan 1999 20:53:34 +0000 Subject: [PATCH] Portability updates by Bernie Bright. --- Debug/logstream.cxx | 7 +++++-- Debug/logstream.hxx | 23 +++++++++++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/Debug/logstream.cxx b/Debug/logstream.cxx index 708bd660..182cafda 100644 --- a/Debug/logstream.cxx +++ b/Debug/logstream.cxx @@ -37,14 +37,14 @@ logbuf::logbuf() logbuf::~logbuf() { if ( sbuf ) - sbuf->sync(); + sync(); } void logbuf::set_sb( streambuf* sb ) { if ( sbuf ) - sbuf->sync(); + sync(); sbuf = sb; } @@ -63,6 +63,9 @@ logstream::setLogLevels( fgDebugClass c, fgDebugPriority p ) } // $Log$ +// Revision 1.2 1999/01/19 20:53:34 curt +// Portability updates by Bernie Bright. +// // Revision 1.1 1998/11/06 21:20:41 curt // Initial revision. // diff --git a/Debug/logstream.hxx b/Debug/logstream.hxx index c9ce10b6..5f93b519 100644 --- a/Debug/logstream.hxx +++ b/Debug/logstream.hxx @@ -33,7 +33,8 @@ #ifdef FG_HAVE_STD_INCLUDES # include -# include +# include +//# include #else # include # include "Include/fg_traits.hxx" @@ -41,6 +42,11 @@ #include "debug_types.h" +FG_USING_STD(streambuf); +FG_USING_STD(ostream); +FG_USING_STD(cerr); +FG_USING_STD(endl); + // // TODO: // @@ -83,7 +89,7 @@ public: protected: - int sync() { return sbuf->sync(); } + inline virtual int sync(); int_type overflow( int ch ); // int xsputn( const char* s, istreamsize n ); @@ -103,6 +109,16 @@ private: void operator= ( const logbuf& ); }; +inline int +logbuf::sync() +{ +#ifdef FG_HAVE_STD_INCLUDES + return sbuf->pubsync(); +#else + return sbuf->sync(); +#endif +} + inline void logbuf::set_log_state( fgDebugClass c, fgDebugPriority p ) { @@ -195,6 +211,9 @@ fglog() #endif // _LOGSTREAM_H // $Log$ +// Revision 1.3 1999/01/19 20:53:35 curt +// Portability updates by Bernie Bright. +// // Revision 1.2 1998/11/07 19:07:02 curt // Enable release builds using the --without-logging option to the configure // script. Also a couple log message cleanups, plus some C to C++ comment