]> https://gitweb.dealii.org/ - dealii.git/commitdiff
fix: remove enum in declaration
authorTimo Heister <timo.heister@gmail.com>
Sun, 27 Aug 2017 22:32:24 +0000 (18:32 -0400)
committerTimo Heister <timo.heister@gmail.com>
Sun, 27 Aug 2017 22:32:24 +0000 (18:32 -0400)
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

index d07a529131392e717b3c0d237e4e278808e72ac3..99be8718cf7f4903e5317b6dddadfb38f74548ff 100644 (file)
@@ -3045,7 +3045,7 @@ enum struct SymmetricTensorEigenvectorMethod
 template <typename Number>
 std::array<std::pair<Number, Tensor<1,1,Number> >,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 <int dim, typename Number>
 std::array<std::pair<Number, Tensor<1,dim,Number> >,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<std::pair<Number, Tensor<1,dim,Number> >,dim> eig_vals_vecs;
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.