MacOSX compile fix.

[lyx.git] / src / support / debugstream.h

diff --git a/src/support/debugstream.h b/src/support/debugstream.h
index b4f32cba7739d469f33e51124a437d3d924c07f5..9b01f2702f12c8bf6c717c1f005fb59270e57a45 100644 (file)
--- a/src/support/debugstream.h
+++ b/src/support/debugstream.h
@@ -14,7 +14,18 @@
 
 #include <iostream>
 
-#include <boost/test/detail/nullstream.hpp>
+#include <boost/version.hpp>
+
+#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 +46,11 @@ struct debug_trait {
        }
 };
 
+#ifdef TEMPORARY_DEBUG_MACRO
+# define DEBUG TEMPORARY_DEBUG_MACRO
+# undef TEMPORARY_DEBUG_MACRO
+#endif
+
 
 template <class dtrait,
          class charT = char,
@@ -44,6 +60,10 @@ public:
        typedef dtrait debug;
        typedef typename debug::type Type;
 
+       basic_debugstream()
+               : std::basic_ostream<charT, traits>(0), dt(debug::NONE)
+       {}
+
        /// 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)