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 31f6bc50e7a2f5c560d484354dbf3970d470745d..45d39d3f4037e1a9bc549cee60e3e3abeacb179f 100644 (file)
--- a/include/deal.II/lac/vector.templates.h
+++ b/include/deal.II/lac/vector.templates.h
@@ -1472,6 +1472,14 @@ Vector<Number>::lp_norm (const real_type p) const
 }
 
 
+template <>
+typename Vector<int>::real_type
+Vector<int>::lp_norm (const real_type) const
+{
+  Assert(false, ExcMessage("No lp norm for integer vectors"));
+  return -1;
+}
+
 
 template <typename Number>
 typename Vector<Number>::real_type

diff --git a/source/base/config.cc b/source/base/config.cc
index 82e01557593a21eae795091eba7c69e45cc0d8bf..265c04035cbb25340cc2617462ec00dcc020e708 100644 (file)
--- 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