the freespacing patch from Kayvan, draw the math empty delim with onoffdash, asure...

[lyx.git] / src / support / DebugStream.C

diff --git a/src/support/DebugStream.C b/src/support/DebugStream.C
index f403d8011eea58dc21966d585b8ee6f3e3d4d8ac..e61056509e8e0c6f700643cead7ac4f7b868d60a 100644 (file)
--- a/src/support/DebugStream.C
+++ b/src/support/DebugStream.C
@@ -15,6 +15,7 @@
 // Since the current C++ lib in egcs does not have a standard implementation
 // of basic_streambuf and basic_filebuf we don't have to include this
 // header.
+//#define MODERN_STL_STREAMS
 #ifdef MODERN_STL_STREAMS
 #include <fstream>
 #endif
@@ -36,18 +37,30 @@ ostream & operator<<(ostream & o, Debug::type t)
 */
 class nullbuf : public streambuf {
 protected:
+#ifndef MODERN_STL_STREAMS
+       typedef char char_type;
+       typedef int int_type;
        ///
        virtual int sync() { return 0; }
+#endif
        /// 
-       virtual streamsize xsputn(char const *, streamsize n) {
+       virtual streamsize xsputn(char_type const *, streamsize n) {
                // fakes a purge of the buffer by returning n
                return n;
        }
+#ifdef MODERN_STL_STREAMS
        ///
-       virtual int overflow(int c = EOF) {
+       virtual int_type overflow(int_type c = traits_type::eof()) {
+               // fakes success by returning c
+               return c == traits_type::eof() ? ' ' : c;
+       }
+#else
+       ///
+       virtual int_type overflow(int_type c = EOF) {
                // fakes success by returning c
                return c == EOF ? ' ' : c;
        }
+#endif
 };
 
 /** A streambuf that sends the output to two different streambufs. These
@@ -59,36 +72,41 @@ public:
        teebuf(streambuf * b1, streambuf * b2)
                : streambuf(), sb1(b1), sb2(b2) {}
 protected:
+#ifdef MODERN_STL_STREAMS
        ///
        virtual int sync() {
-#ifdef MODERN_STL_STREAMS
                sb2->pubsync();
                return sb1->pubsync();
-#else
-               sb2->sync();
-               return sb1->sync();
-#endif
        }
        ///
-       virtual streamsize xsputn(char const * p, streamsize n) {
-#ifdef MODERN_STL_STREAMS
+       virtual streamsize xsputn(char_type const * p, streamsize n) {
                sb2->sputn(p, n);
                return sb1->sputn(p, n);
-#else
-               sb2->xsputn(p, n);
-               return sb1->xsputn(p, n);
-#endif
        }
        ///
-       virtual int overflow(int c = EOF) {
-#ifdef MODERN_STL_STREAMS
+       virtual int_type overflow(int_type c = traits_type::eof()) {
                sb2->sputc(c);
                return sb1->sputc(c);
+       }
 #else
+       typedef char char_type;
+       typedef int int_type;
+       ///
+       virtual int sync() {
+               sb2->sync();
+               return sb1->sync();
+       }
+       ///
+       virtual streamsize xsputn(char_type const * p, streamsize n) {
+               sb2->xsputn(p, n);
+               return sb1->xsputn(p, n);
+       }
+       ///
+       virtual int_type overflow(int_type c = EOF) {
                sb2->overflow(c);
                return sb1->overflow(c);
-#endif
        }
+#endif
 private:
        ///
        streambuf * sb1;
@@ -103,41 +121,48 @@ public:
        debugbuf(streambuf * b)
                : streambuf(), sb(b) {}
 protected:
+#ifdef MODERN_STL_STREAMS
        ///
        virtual int sync() {
-#ifdef MODERN_STL_STREAMS
                return sb->pubsync();
-#else
-               return sb->sync();
-#endif
        }
        ///
-       virtual streamsize xsputn(char const * p, streamsize n) {
-#ifdef MODERN_STL_STREAMS
+       virtual streamsize xsputn(char_type const * p, streamsize n) {
                return sb->sputn(p, n);
-#else
-               return sb->xsputn(p, n);
-#endif
        }
        ///
-       virtual int overflow(int c = EOF) {
-#ifdef MODERN_STL_STREAMS
+       virtual int_type overflow(int_type c = traits_type::eof()) {
                return sb->sputc(c);
+       }
 #else
+       typedef char char_type;
+       typedef int int_type;
+       ///
+       virtual int sync() {
+               return sb->sync();
+       }
+       ///
+       virtual streamsize xsputn(char_type const * p, streamsize n) {
+               return sb->xsputn(p, n);
+       }
+       ///
+       virtual int_type overflow(int_type c = EOF) {
                return sb->overflow(c);
-#endif
        }
+#endif
 private:
        ///
        streambuf * sb;
 };
 
+
 /// So that public parts of DebugStream does not need to know about filebuf
 struct DebugStream::debugstream_internal {
        /// Used when logging to file.
        filebuf fbuf;
 };
 
+
 /// Constructor, sets the debug level to t.
 DebugStream::DebugStream(Debug::type t)
        : ostream(new debugbuf(cerr.rdbuf())),
@@ -160,10 +185,10 @@ DebugStream::~DebugStream()
 {
        delete nullstream.rdbuf(0); // Without this we leak
        delete rdbuf(0);            // Without this we leak
-       if (internal)
-               delete internal;
+       delete internal;
 }
 
+
 /// Sets the debugstreams' logfile to f.
 void DebugStream::logFile(char const * f)
 {