]> https://gitweb.dealii.org/ - dealii.git/commitdiff
BOOST enable_if fix for old versions 2197/head
authorTimo Heister <timo.heister@gmail.com>
Mon, 15 Feb 2016 14:04:52 +0000 (09:04 -0500)
committerTimo Heister <timo.heister@gmail.com>
Mon, 15 Feb 2016 14:04:52 +0000 (09:04 -0500)
enable_if.hpp used to be in a different directory before 1.56.

include/deal.II/base/std_cxx11/type_traits.h

index 261f67392eccb0064bb15bb37e795a5720a09e98..d9692f7de6d77e430188bd55593e511399105a0e 100644 (file)
@@ -38,8 +38,16 @@ DEAL_II_NAMESPACE_CLOSE
 
 #else
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/type_traits.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION<105600
+#include <boost/utility/enable_if.hpp>
+#else
 #include <boost/core/enable_if.hpp>
+#endif
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
+
 DEAL_II_NAMESPACE_OPEN
 namespace std_cxx11
 {

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.