From: Daniel Arndt Date: Wed, 6 Jun 2018 00:57:47 +0000 (+0200) Subject: Fix instantiations of SymmetricTensor X-Git-Tag: v9.1.0-rc1~1068^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ab2ac6c46299f39deb5e7ef777f926c25b0038f;p=dealii.git Fix instantiations of SymmetricTensor --- diff --git a/include/deal.II/base/symmetric_tensor.h b/include/deal.II/base/symmetric_tensor.h index 6879b34e66..9ac9040c7f 100644 --- a/include/deal.II/base/symmetric_tensor.h +++ b/include/deal.II/base/symmetric_tensor.h @@ -578,7 +578,7 @@ public: * describe a symmetric tensor. In $d$ space dimensions, this number equals * $\frac 12 (d^2+d)$ for symmetric tensors of rank 2. */ - static const unsigned int n_independent_components = + static constexpr unsigned int n_independent_components = internal::SymmetricTensorAccessors::StorageType:: n_independent_components; diff --git a/source/base/symmetric_tensor.cc b/source/base/symmetric_tensor.cc index b526983396..bf74f26e32 100644 --- a/source/base/symmetric_tensor.cc +++ b/source/base/symmetric_tensor.cc @@ -30,7 +30,8 @@ template const unsigned int SymmetricTensor::dimension; template -const unsigned int SymmetricTensor::n_independent_components; +constexpr unsigned int + SymmetricTensor::n_independent_components; // explicit instantiations