X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fdebugstream.h;h=63744ef4c5014c87bf003dc192211a31ec180db7;hb=848c89564fce9c4bfec79b915746dc6bc47abc3d;hp=6b7334477b9c1ecb2f2c7481bc90272c89f22d4d;hpb=d66e61a93c4ddc346772b6843ceb00a572255e54;p=lyx.git

diff --git a/src/support/debugstream.h b/src/support/debugstream.h
index 6b7334477b..63744ef4c5 100644
--- a/src/support/debugstream.h
+++ b/src/support/debugstream.h
@@ -14,7 +14,21 @@
 
 #include <iostream>
 
-#include <boost/test/detail/nullstream.hpp>
+#include <boost/version.hpp>
+
+
+//namespace lyx {
+
+#if BOOST_VERSION < 103300
+#  include <boost/test/detail/nullstream.hpp>
+#else
+#  include <boost/test/utils/nullstream.hpp>
+#endif
+
+#ifdef DEBUG
+# define TEMPORARY_DEBUG_MACRO DEBUG
+# undef DEBUG
+#endif
 
 struct debug_trait {
 	enum type {
@@ -35,6 +49,11 @@ struct debug_trait {
 	}
 };
 
+#ifdef TEMPORARY_DEBUG_MACRO
+# define DEBUG TEMPORARY_DEBUG_MACRO
+# undef TEMPORARY_DEBUG_MACRO
+#endif
+
 
 template <class dtrait,
 	  class charT = char,
@@ -45,12 +64,14 @@ public:
 	typedef typename debug::type Type;
 
 	basic_debugstream()
-		: std::basic_ostream<charT, traits>(0), dt(debug::NONE)
+		: std::basic_ostream<charT, traits>(0), dt(debug::NONE),
+		  realbuf_(0), enabled_(true)
 	{}
 
 	/// Constructor, sets the debug level to t.
 	explicit basic_debugstream(std::basic_streambuf<charT, traits> * buf)
-		: std::basic_ostream<charT, traits>(buf), dt(debug::NONE)
+		: std::basic_ostream<charT, traits>(buf), dt(debug::NONE),
+		  realbuf_(0), enabled_(true)
 	{}
 
 	/// Sets the debug level to t.
@@ -80,13 +101,37 @@ public:
 			return *this;
 		return nullstream;
 	}
+	/// Disable the stream completely
+	void disable()
+	{
+		if (enabled_) {
+			realbuf_ = this->rdbuf();
+			rdbuf(nullstream.rdbuf());
+			enabled_ = false;
+		}
+	}
+	/// Enable the stream after a possible call of disable()
+	void enable()
+	{
+		if (!enabled_) {
+			this->rdbuf(realbuf_);
+			enabled_ = true;
+		}
+	}
 private:
 	/// The current debug level
 	Type dt;
 	/// The no-op stream.
 	boost::basic_onullstream<charT, traits> nullstream;
+	/// The buffer of the real stream
+	std::streambuf * realbuf_;
+	/// Is the stream enabled?
+	bool enabled_;
 };
 
 typedef basic_debugstream<debug_trait> debugstream;
 
+
+//} // namespace lyx
+
 #endif