From: Daniel Arndt Date: Wed, 13 Jun 2018 08:13:03 +0000 (+0200) Subject: Mark variables as constexpr X-Git-Tag: v9.1.0-rc1~1046^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F6749%2Fhead;p=dealii.git Mark variables as constexpr --- diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h index a4762c56ba..bd7152da8c 100644 --- a/include/deal.II/matrix_free/fe_evaluation.h +++ b/include/deal.II/matrix_free/fe_evaluation.h @@ -6924,7 +6924,7 @@ FEFaceEvaluation::evaluate( if (!(evaluate_values + evaluate_gradients)) return; - const unsigned int static_dofs_per_face = + constexpr unsigned int static_dofs_per_face = fe_degree > -1 ? Utilities::pow(fe_degree + 1, dim - 1) : numbers::invalid_unsigned_int; const unsigned int dofs_per_face = @@ -7043,7 +7043,7 @@ FEFaceEvaluation:: if (this->face_orientation) adjust_for_face_orientation(true, integrate_values, integrate_gradients); - const unsigned int static_dofs_per_face = + constexpr unsigned int static_dofs_per_face = fe_degree > -1 ? Utilities::pow(fe_degree + 1, dim - 1) : numbers::invalid_unsigned_int; const unsigned int dofs_per_face = @@ -7125,7 +7125,7 @@ FEFaceEvaluation:: { const unsigned int side = this->face_no % 2; - const unsigned int static_dofs_per_face = + constexpr unsigned int static_dofs_per_face = fe_degree > -1 ? Utilities::pow(fe_degree + 1, dim - 1) : numbers::invalid_unsigned_int; const unsigned int dofs_per_face =