Use the correct nullstream.hpp.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13301 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index c9634c15e416d40dee5f9888a034ef0a3c51661e..c6512a8bf9fe23cf2850d97ac996e3b15d5d7827 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-05  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+       * pch.h:
+       * support/pch.h:
+       * support/debugstream.h: Use the correct nullstream.
+
 2006-02-26  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
        * text3.C (mathDispatch): fix math inset creation from string (bug 2315)

diff --git a/src/pch.h b/src/pch.h
index cac89198fa2104843adc411d21e2d68f6d2e569d..b2c41405aa142c631467dc60db90bb9f86ce90f5 100644 (file)
--- a/src/pch.h
+++ b/src/pch.h
@@ -17,7 +17,14 @@
 #include <boost/signals/connection.hpp>
 #include <boost/signal.hpp>
 #include <boost/signals/trackable.hpp>
-#include <boost/test/detail/nullstream.hpp>
+#include <boost/version.hpp>
+
+#if BOOST_VERSION < 103301
+# include <boost/test/detail/nullstream.hpp>
+#else
+# include <boost/test/utils/nullstream.hpp>
+#endif
+
 #include <boost/tokenizer.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/utility.hpp>

diff --git a/src/support/debugstream.h b/src/support/debugstream.h
index c41d4d94b175988c6c2dfff91fe5e68ca6e45fe4..47ab04aa8d8c66adec8ad545b592c2f380c97879 100644 (file)
--- a/src/support/debugstream.h
+++ b/src/support/debugstream.h
@@ -14,7 +14,13 @@
 
 #include <iostream>
 
-#include <boost/test/detail/nullstream.hpp>
+#include <boost/version.hpp>
+
+#if BOOST_VERSION < 103301
+#  include <boost/test/detail/nullstream.hpp>
+#else
+#  include <boost/test/utils/nullstream.hpp>
+#endif
 
 #ifdef DEBUG
 # define TEMPORARY_DEBUG_MACRO DEBUG

diff --git a/src/support/pch.h b/src/support/pch.h
index df68682721f3b6bce938a03827407c7f850d8d33..6b2f9b7f648e666038106b8e6b5aa0ce856fdd4e 100644 (file)
--- a/src/support/pch.h
+++ b/src/support/pch.h
@@ -10,7 +10,14 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/signal.hpp>
 #include <boost/signals/trackable.hpp>
-#include <boost/test/detail/nullstream.hpp>
+#include <boost/version.hpp>
+
+#if BOOST_VERSION < 103301
+# include <boost/test/detail/nullstream.hpp>
+#else
+# include <boost/test/utils/nullstream.hpp>
+#endif
+
 #include <boost/tokenizer.hpp>
 #include <boost/utility.hpp>