From: Guido Kanschat Date: Thu, 2 Jul 2015 21:03:24 +0000 (+0200) Subject: Fix the problems on Mac with isnan and pow X-Git-Tag: v8.3.0-rc1~66^2~2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=194dde1a1b18d8f3bf1b241b858bcc76c0c08a7f;p=dealii.git Fix the problems on Mac with isnan and pow --- diff --git a/include/deal.II/lac/vector.templates.h b/include/deal.II/lac/vector.templates.h index 31f6bc50e7..45d39d3f40 100644 --- a/include/deal.II/lac/vector.templates.h +++ b/include/deal.II/lac/vector.templates.h @@ -1472,6 +1472,14 @@ Vector::lp_norm (const real_type p) const } +template <> +typename Vector::real_type +Vector::lp_norm (const real_type) const +{ + Assert(false, ExcMessage("No lp norm for integer vectors")); + return -1; +} + template typename Vector::real_type diff --git a/source/base/config.cc b/source/base/config.cc index 82e0155759..265c04035c 100644 --- a/source/base/config.cc +++ b/source/base/config.cc @@ -25,7 +25,7 @@ namespace numbers bool is_finite (const double x) { #ifdef DEAL_II_HAVE_ISFINITE - return !isnan(x) && std::isfinite (x); + return !std::isnan(x) && std::isfinite (x); #else // Check against infinities. Note // that if x is a NaN, then both