Move forward declaration of VectorizedArray to more central place

diff --git a/include/deal.II/base/numbers.h b/include/deal.II/base/numbers.h
index 83d65d5c40a124a1ea8037648e7ec06e7d7078c1..84378bd9c81b753660fa58a7e476dd24e22134cc 100644 (file)
--- a/include/deal.II/base/numbers.h
+++ b/include/deal.II/base/numbers.h
@@ -26,6 +26,26 @@
 
 DEAL_II_NAMESPACE_OPEN
 
+// forward declarations to support abs or sqrt operations on VectorizedArray
+template <typename Number> class VectorizedArray;
+template <typename T> struct EnableIfScalar;
+
+DEAL_II_NAMESPACE_CLOSE
+
+namespace std
+{
+  template <typename Number> DEAL_II_ALWAYS_INLINE ::dealii::VectorizedArray<Number>
+  sqrt(const ::dealii::VectorizedArray<Number> &);
+  template <typename Number> DEAL_II_ALWAYS_INLINE ::dealii::VectorizedArray<Number>
+  abs(const ::dealii::VectorizedArray<Number> &);
+  template <typename Number> DEAL_II_ALWAYS_INLINE ::dealii::VectorizedArray<Number>
+  max(const ::dealii::VectorizedArray<Number> &, const ::dealii::VectorizedArray<Number> &);
+  template <typename Number> DEAL_II_ALWAYS_INLINE ::dealii::VectorizedArray<Number>
+  min (const ::dealii::VectorizedArray<Number> &, const ::dealii::VectorizedArray<Number> &);
+}
+
+DEAL_II_NAMESPACE_OPEN
+
 /**
  * Namespace for the declaration of universal constants. Since the
  * availability in <tt>math.h</tt> is not always guaranteed, we put them here.

diff --git a/include/deal.II/base/vectorization.h b/include/deal.II/base/vectorization.h
index 80004246a85c1d0dbf6c39343636c79365c313dd..8597851012e89e8568eced72802c7dc02380d091 100644 (file)
--- a/include/deal.II/base/vectorization.h
+++ b/include/deal.II/base/vectorization.h
@@ -46,26 +46,6 @@
 #endif
 
 
-// forward declarations
-DEAL_II_NAMESPACE_OPEN
-template <typename Number> class VectorizedArray;
-template <typename T> struct EnableIfScalar;
-DEAL_II_NAMESPACE_CLOSE
-
-
-namespace std
-{
-  template <typename Number> DEAL_II_ALWAYS_INLINE ::dealii::VectorizedArray<Number>
-  sqrt(const ::dealii::VectorizedArray<Number> &);
-  template <typename Number> DEAL_II_ALWAYS_INLINE ::dealii::VectorizedArray<Number>
-  abs(const ::dealii::VectorizedArray<Number> &);
-  template <typename Number> DEAL_II_ALWAYS_INLINE ::dealii::VectorizedArray<Number>
-  max(const ::dealii::VectorizedArray<Number> &, const ::dealii::VectorizedArray<Number> &);
-  template <typename Number> DEAL_II_ALWAYS_INLINE ::dealii::VectorizedArray<Number>
-  min (const ::dealii::VectorizedArray<Number> &, const ::dealii::VectorizedArray<Number> &);
-}
-
-
 DEAL_II_NAMESPACE_OPEN