]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix preprocessor directive 7038/head
authorDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Tue, 7 Aug 2018 08:32:23 +0000 (10:32 +0200)
committerDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Tue, 7 Aug 2018 08:34:58 +0000 (10:34 +0200)
cmake/checks/check_01_cxx_features.cmake
include/deal.II/base/std_cxx17/cmath.h

index 2236748438b0937d9779fb6923adaf56adc308fb..9b44082564726a7bc7f188d44ed71ad255c130c7 100644 (file)
@@ -213,7 +213,6 @@ IF(NOT DEFINED DEAL_II_WITH_CXX17 OR DEAL_II_WITH_CXX17)
 
   IF( DEAL_II_HAVE_CXX17_ATTRIBUTES AND
       DEAL_II_HAVE_CXX17_IF_CONSTEXPR AND
-      DEAL_II_HAVE_CXX17_SPECIAL_MATH_FUNCTIONS AND
       DEAL_II_NON_CONSTEXPR_LAMBDA)
     SET(DEAL_II_HAVE_CXX17 TRUE)
   ELSE()
index 394a2ac814a4f3bd2a092fb856408d72fd3d33f5..2a7106298172488cf327a58c3386694a40111781 100644 (file)
 
 #include <deal.II/base/config.h>
 
-#ifndef DEAL_II_WITH_CXX17
+#ifndef DEAL_II_HAVE_CXX17_SPECIAL_MATH_FUNCTIONS
 #  include <boost/math/special_functions/bessel.hpp>
-#endif // DEAL_II_WITH_CXX17
+#endif // DEAL_II_HAVE_CXX17_SPECIAL_MATH_FUNCTIONS
 
 #include <cmath>
 
 DEAL_II_NAMESPACE_OPEN
 namespace std_cxx17
 {
-#ifdef DEAL_II_HAVE_CXX17_SPECIAL_MATH_FUNCTIONS
+#ifndef DEAL_II_HAVE_CXX17_SPECIAL_MATH_FUNCTIONS
   double (&cyl_bessel_j)(double,
                          double) = boost::math::cyl_bessel_j<double, double>;
   float (&cyl_bessel_jf)(float,
@@ -37,7 +37,7 @@ namespace std_cxx17
   using std::cyl_bessel_j;
   using std::cyl_bessel_jf;
   using std::cyl_bessel_jl;
-#endif
+#endif // DEAL_II_HAVE_CXX17_SPECIAL_MATH_FUNCTIONS
 } // namespace std_cxx17
 DEAL_II_NAMESPACE_CLOSE
 

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.