Changeset 26c242

Timestamp:

Oct 18, 2011, 3:40:40 PM (14 years ago)

Author:

Frederik Heber <heber@…>

Children:

aead7d

Parents:

cc78ae

git-author:

Frederik Heber <heber@…> (09/21/11 08:59:31)

git-committer:

Frederik Heber <heber@…> (10/18/11 15:40:40)

Message:

FIX: Embraced troublesome includes in MemDebug.hpp with ifdefs.

• This includes them only when they are present.
• Note that (this is to fix compile problems with LinearAlgebra).
  • Thread depends on optional and shared.
  • bind was missing.

File:

• src/Helpers/MemDebug.hpp (modified) (1 diff)

src/Helpers/MemDebug.hpp

@@ -54 +54 @@
 // to be loaded before the define
 #include <string>
+#if defined HAVE_BOOST_OPTIONAL_HPP || defined HAVE_BOOST_THREAD_HPP
 #include <boost/optional.hpp>
+#endif
+#if defined HAVE_BOOST_SHARED_PTR_HPP || defined HAVE_BOOST_THREAD_HPP
 #include <boost/shared_ptr.hpp>
+#endif
+#ifdef HAVE_BOOST_BIND_HPP
+#include <boost/bind.hpp>
+#endif
+#if defined HAVE_BOOST_FUNCTION_HPP || defined HAVE_BOOST_THREAD_HPP
 #include <boost/function.hpp>
+#endif
+#ifdef HAVE_BOOST_ARCHIVE_TEXT_OARCHIVE_HPP
 // serialization has bug with overloaded new, see https://svn.boost.org/trac/boost/ticket/3400
 #include <boost/serialization/access.hpp>
+#endif
+#if defined HAVE_VALARRAY || defined HAVE_BOOST_ARCHIVE_TEXT_OARCHIVE_HPP
 // valarray uses specific new as well
 #include <valarray>
+#endif