From: Timo Heister Date: Mon, 15 Feb 2016 14:04:52 +0000 (-0500) Subject: BOOST enable_if fix for old versions X-Git-Tag: v8.5.0-rc1~1309^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a75295953ecfd5d8646de3896cd08794187a5ff6;p=dealii.git BOOST enable_if fix for old versions enable_if.hpp used to be in a different directory before 1.56. --- diff --git a/include/deal.II/base/std_cxx11/type_traits.h b/include/deal.II/base/std_cxx11/type_traits.h index 261f67392e..d9692f7de6 100644 --- a/include/deal.II/base/std_cxx11/type_traits.h +++ b/include/deal.II/base/std_cxx11/type_traits.h @@ -38,8 +38,16 @@ DEAL_II_NAMESPACE_CLOSE #else +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include +#include +#if BOOST_VERSION<105600 +#include +#else #include +#endif +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS + DEAL_II_NAMESPACE_OPEN namespace std_cxx11 {