From: David Wells <wellsd2@rpi.edu>
Date: Fri, 23 Feb 2018 20:06:57 +0000 (-0500)
Subject: Mark some more things as constexpr.
X-Git-Tag: v9.0.0-rc1~389^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F5919%2Fhead;p=dealii.git

Mark some more things as constexpr.
---

diff --git a/include/deal.II/matrix_free/cuda_fe_evaluation.h b/include/deal.II/matrix_free/cuda_fe_evaluation.h
index 27bfb8d513..5cfbd162ac 100644
--- a/include/deal.II/matrix_free/cuda_fe_evaluation.h
+++ b/include/deal.II/matrix_free/cuda_fe_evaluation.h
@@ -74,8 +74,8 @@ namespace CUDAWrappers
     typedef Number                                  value_type;
     typedef Tensor<1,dim,Number>                    gradient_type;
     typedef typename MatrixFree<dim, Number>::Data  data_type;
-    static const unsigned int dimension    =        dim;
-    static const unsigned int n_components =        n_components_;
+    static constexpr unsigned int dimension       = dim;
+    static constexpr unsigned int n_components    = n_components_;
     static constexpr unsigned int n_q_points      = Utilities::pow(n_q_points_1d, dim);
     static constexpr unsigned int tensor_dofs_per_cell = Utilities::pow(fe_degree + 1, dim);
 
diff --git a/include/deal.II/matrix_free/tensor_product_kernels.h b/include/deal.II/matrix_free/tensor_product_kernels.h
index cae328832f..62dc19dc51 100644
--- a/include/deal.II/matrix_free/tensor_product_kernels.h
+++ b/include/deal.II/matrix_free/tensor_product_kernels.h
@@ -487,8 +487,8 @@ namespace internal
   template <int dim, typename Number, typename Number2>
   struct EvaluatorTensorProduct<evaluate_general,dim,0,0,Number,Number2>
   {
-    static const unsigned int n_rows_of_product = numbers::invalid_unsigned_int;
-    static const unsigned int n_columns_of_product = numbers::invalid_unsigned_int;
+    static constexpr unsigned int n_rows_of_product = numbers::invalid_unsigned_int;
+    static constexpr unsigned int n_columns_of_product = numbers::invalid_unsigned_int;
 
     /**
      * Empty constructor. Does nothing. Be careful when using 'values' and