From 71d797b04a10bb3c968ed0afb0bd88b3f41bea2b Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Sun, 27 Aug 2017 18:32:24 -0400 Subject: [PATCH] fix: remove enum in declaration SymmetricTensorEigenvectorMethod is an enum class. MSVC complains about "a scoped enumeration cannot be redeclared as an unscoped enumeration", which is a bit weird. I do think this fix is correct, though. --- include/deal.II/base/symmetric_tensor.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/deal.II/base/symmetric_tensor.h b/include/deal.II/base/symmetric_tensor.h index d07a529131..99be8718cf 100644 --- a/include/deal.II/base/symmetric_tensor.h +++ b/include/deal.II/base/symmetric_tensor.h @@ -3045,7 +3045,7 @@ enum struct SymmetricTensorEigenvectorMethod template std::array >,1> eigenvectors (const SymmetricTensor<2,1,Number> &T, - const enum SymmetricTensorEigenvectorMethod /*method*/ = SymmetricTensorEigenvectorMethod::ql_implicit_shifts) + const SymmetricTensorEigenvectorMethod /*method*/ = SymmetricTensorEigenvectorMethod::ql_implicit_shifts) { return { {std::make_pair(T[0][0], Tensor<1,1,Number>({1.0}))} }; } @@ -3082,7 +3082,7 @@ eigenvectors (const SymmetricTensor<2,1,Number> &T, template std::array >,dim> eigenvectors (const SymmetricTensor<2,dim,Number> &T, - const enum SymmetricTensorEigenvectorMethod method = SymmetricTensorEigenvectorMethod::ql_implicit_shifts) + const SymmetricTensorEigenvectorMethod method = SymmetricTensorEigenvectorMethod::ql_implicit_shifts) { std::array >,dim> eig_vals_vecs; -- 2.39.5