MacOSX compile fix.

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

diff --git a/src/support/debugstream.h b/src/support/debugstream.h
index 6b7334477b9c1ecb2f2c7481bc90272c89f22d4d..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,