From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Thu, 7 Jun 2018 22:38:36 +0000 (+0200)
Subject: Make n_array_elements static const again
X-Git-Tag: v9.1.0-rc1~1061^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b4177b43e8ccde7d0e8ade62d7df09a55b0dc1f;p=dealii.git

Make n_array_elements static const again
---

diff --git a/include/deal.II/base/vectorization.h b/include/deal.II/base/vectorization.h
index 576bd5e968..58cda94b1f 100644
--- a/include/deal.II/base/vectorization.h
+++ b/include/deal.II/base/vectorization.h
@@ -162,7 +162,7 @@ public:
   /**
    * This gives the number of vectors collected in this class.
    */
-  static constexpr unsigned int n_array_elements = 1;
+  static const unsigned int n_array_elements = 1;
 
   // POD means that there should be no user-defined constructors, destructors
   // and copy functions (the standard is somewhat relaxed in C++2011, though).
@@ -568,7 +568,7 @@ public:
   /**
    * This gives the number of vectors collected in this class.
    */
-  static constexpr unsigned int n_array_elements = 8;
+  static const unsigned int n_array_elements = 8;
 
   /**
    * This function can be used to set all data fields to a given scalar.
@@ -970,7 +970,7 @@ public:
   /**
    * This gives the number of vectors collected in this class.
    */
-  static constexpr unsigned int n_array_elements = 16;
+  static const unsigned int n_array_elements = 16;
 
   /**
    * This function can be used to set all data fields to a given scalar.
@@ -1405,7 +1405,7 @@ public:
   /**
    * This gives the number of vectors collected in this class.
    */
-  static constexpr unsigned int n_array_elements = 4;
+  static const unsigned int n_array_elements = 4;
 
   /**
    * This function can be used to set all data fields to a given scalar.
@@ -1784,7 +1784,7 @@ public:
   /**
    * This gives the number of vectors collected in this class.
    */
-  static constexpr unsigned int n_array_elements = 8;
+  static const unsigned int n_array_elements = 8;
 
   /**
    * This function can be used to set all data fields to a given scalar.
@@ -2194,7 +2194,7 @@ public:
   /**
    * This gives the number of vectors collected in this class.
    */
-  static constexpr unsigned int n_array_elements = 2;
+  static const unsigned int n_array_elements = 2;
 
   /**
    * This function can be used to set all data fields to a given scalar.
@@ -2532,7 +2532,7 @@ public:
   /**
    * This gives the number of vectors collected in this class.
    */
-  static constexpr unsigned int n_array_elements = 4;
+  static const unsigned int n_array_elements = 4;
 
   /**
    * This function can be used to set all data fields to a given scalar.
diff --git a/source/base/vectorization.cc b/source/base/vectorization.cc
index 28c5e98299..5876d07d2d 100644
--- a/source/base/vectorization.cc
+++ b/source/base/vectorization.cc
@@ -17,7 +17,7 @@
 
 DEAL_II_NAMESPACE_OPEN
 
-constexpr unsigned int VectorizedArray<double>::n_array_elements;
-constexpr unsigned int VectorizedArray<float>::n_array_elements;
+const unsigned int VectorizedArray<double>::n_array_elements;
+const unsigned int VectorizedArray<float>::n_array_elements;
 
 DEAL_II_NAMESPACE_CLOSE