From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Mon, 11 Mar 2019 17:56:31 +0000 (+0100)
Subject: Fix warnings in Convert::to_pattern()
X-Git-Tag: v9.1.0-rc1~294^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7797%2Fhead;p=dealii.git

Fix warnings in Convert::to_pattern()
---

diff --git a/include/deal.II/base/patterns.h b/include/deal.II/base/patterns.h
index 3a8617fc91..bbb5b50adf 100644
--- a/include/deal.II/base/patterns.h
+++ b/include/deal.II/base/patterns.h
@@ -1493,22 +1493,38 @@ namespace Patterns
     struct Convert<T,
                    typename std::enable_if<std::is_arithmetic<T>::value>::type>
     {
-      static std::unique_ptr<Patterns::PatternBase>
-      to_pattern()
+      template <typename Dummy = T>
+      static
+        typename std::enable_if<std::is_same<Dummy, T>::value &&
+                                  std::is_same<T, bool>::value,
+                                std::unique_ptr<Patterns::PatternBase>>::type
+        to_pattern()
       {
-        if (std::is_same<T, bool>::value)
-          return std_cxx14::make_unique<Patterns::Bool>();
-        else if (std::is_integral<T>::value)
-          return std_cxx14::make_unique<Patterns::Integer>(
-            static_cast<int>(std::numeric_limits<T>::lowest()),
-            static_cast<int>(std::numeric_limits<T>::max()));
-        else if (std::is_floating_point<T>::value)
-          return std_cxx14::make_unique<Patterns::Double>(
-            std::numeric_limits<T>::lowest(), std::numeric_limits<T>::max());
-
-        Assert(false, ExcNotImplemented());
-        // the following line should never be invoked
-        return nullptr;
+        return std_cxx14::make_unique<Patterns::Bool>();
+      }
+
+      template <typename Dummy = T>
+      static
+        typename std::enable_if<std::is_same<Dummy, T>::value &&
+                                  !std::is_same<T, bool>::value &&
+                                  std::is_integral<T>::value,
+                                std::unique_ptr<Patterns::PatternBase>>::type
+        to_pattern()
+      {
+        return std_cxx14::make_unique<Patterns::Integer>(
+          std::numeric_limits<T>::lowest(), std::numeric_limits<T>::max());
+      }
+
+      template <typename Dummy = T>
+      static
+        typename std::enable_if<std::is_same<Dummy, T>::value &&
+                                  !std::is_same<T, bool>::value &&
+                                  std::is_floating_point<T>::value,
+                                std::unique_ptr<Patterns::PatternBase>>::type
+        to_pattern()
+      {
+        return std_cxx14::make_unique<Patterns::Double>(
+          std::numeric_limits<T>::lowest(), std::numeric_limits<T>::max());
       }
 
       static std::string