From: Daniel Arndt <arndtd@ornl.gov>
Date: Wed, 21 Aug 2019 13:19:19 +0000 (-0400)
Subject: Only allow floating point types in complex_overloads.h
X-Git-Tag: v9.2.0-rc1~1206^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F8614%2Fhead;p=dealii.git

Only allow floating point types in complex_overloads.h
---

diff --git a/doc/news/changes/incompatibilities/20190821DanielArndt b/doc/news/changes/incompatibilities/20190821DanielArndt
new file mode 100644
index 0000000000..43cf76d39d
--- /dev/null
+++ b/doc/news/changes/incompatibilities/20190821DanielArndt
@@ -0,0 +1,4 @@
+Changed: The complex operator overloads for multiplication and division are
+restricted to floating point types.
+<br>
+(Daniel Arndt, 2019/08/21)
diff --git a/include/deal.II/base/complex_overloads.h b/include/deal.II/base/complex_overloads.h
index 75eaf842ee..7f29b3ea2c 100644
--- a/include/deal.II/base/complex_overloads.h
+++ b/include/deal.II/base/complex_overloads.h
@@ -24,8 +24,6 @@ DEAL_II_NAMESPACE_OPEN
 
 // Forward declarations
 #ifndef DOXYGEN
-template <typename T>
-struct EnableIfScalar;
 template <typename T, typename U>
 struct ProductType;
 #endif
@@ -39,7 +37,9 @@ struct ProductType;
  * @relatesalso ProductType
  */
 template <typename T, typename U>
-inline typename ProductType<std::complex<T>, std::complex<U>>::type
+inline typename std::enable_if<
+  std::is_floating_point<T>::value && std::is_floating_point<U>::value,
+  typename ProductType<std::complex<T>, std::complex<U>>::type>::type
 operator*(const std::complex<T> &left, const std::complex<U> &right)
 {
   using result_type =
@@ -55,7 +55,9 @@ operator*(const std::complex<T> &left, const std::complex<U> &right)
  * @relatesalso ProductType
  */
 template <typename T, typename U>
-inline typename ProductType<std::complex<T>, std::complex<U>>::type
+inline typename std::enable_if<
+  std::is_floating_point<T>::value && std::is_floating_point<U>::value,
+  typename ProductType<std::complex<T>, std::complex<U>>::type>::type
 operator/(const std::complex<T> &left, const std::complex<U> &right)
 {
   using result_type =
@@ -68,12 +70,13 @@ operator/(const std::complex<T> &left, const std::complex<U> &right)
  * floating point type with a different real floating point type. Annoyingly,
  * the standard library does not provide such an operator...
  *
- * @relatesalso EnableIfScalar
  * @relatesalso ProductType
  */
 template <typename T, typename U>
 inline
-  typename ProductType<std::complex<T>, typename EnableIfScalar<U>::type>::type
+  typename std::enable_if<std::is_floating_point<T>::value &&
+                            std::is_floating_point<U>::value,
+                          typename ProductType<std::complex<T>, U>::type>::type
   operator*(const std::complex<T> &left, const U &right)
 {
   using result_type = typename ProductType<std::complex<T>, U>::type;
@@ -85,12 +88,13 @@ inline
  * floating point type with a different real floating point type. Annoyingly,
  * the standard library does not provide such an operator...
  *
- * @relatesalso EnableIfScalar
  * @relatesalso ProductType
  */
 template <typename T, typename U>
 inline
-  typename ProductType<std::complex<T>, typename EnableIfScalar<U>::type>::type
+  typename std::enable_if<std::is_floating_point<T>::value &&
+                            std::is_floating_point<U>::value,
+                          typename ProductType<std::complex<T>, U>::type>::type
   operator/(const std::complex<T> &left, const U &right)
 {
   using result_type = typename ProductType<std::complex<T>, U>::type;
@@ -102,15 +106,17 @@ inline
  * floating point type with a different complex floating point type.
  * Annoyingly, the standard library does not provide such an operator...
  *
- * @relatesalso EnableIfScalar
  * @relatesalso ProductType
  */
 template <typename T, typename U>
-inline
-  typename ProductType<typename EnableIfScalar<T>::type, std::complex<U>>::type
+inline typename
+
+  std::enable_if<std::is_floating_point<T>::value &&
+                   std::is_floating_point<U>::value,
+                 typename ProductType<T, std::complex<U>>::type>::type
   operator*(const T &left, const std::complex<U> &right)
 {
-  using result_type = typename ProductType<std::complex<T>, U>::type;
+  using result_type = typename ProductType<T, std::complex<U>>::type;
   return static_cast<result_type>(left) * static_cast<result_type>(right);
 }
 
@@ -119,15 +125,16 @@ inline
  * floating point type with a different complex floating point type.
  * Annoyingly, the standard library does not provide such an operator...
  *
- * @relatesalso EnableIfScalar
  * @relatesalso ProductType
  */
 template <typename T, typename U>
 inline
-  typename ProductType<typename EnableIfScalar<T>::type, std::complex<U>>::type
+  typename std::enable_if<std::is_floating_point<T>::value &&
+                            std::is_floating_point<U>::value,
+                          typename ProductType<T, std::complex<U>>::type>::type
   operator/(const T &left, const std::complex<U> &right)
 {
-  using result_type = typename ProductType<std::complex<T>, U>::type;
+  using result_type = typename ProductType<T, std::complex<U>>::type;
   return static_cast<result_type>(left) / static_cast<result_type>(right);
 }
 #endif /* DEAL_II_HAVE_COMPLEX_OPERATOR_OVERLOADS */