From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Sun, 15 Apr 2018 10:02:11 +0000 (+0200)
Subject: Fix compiling with clang-6
X-Git-Tag: v9.0.0-rc1~175^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c1ad1e1619a1659d7844bdfb3b5073cbc5cfb48;p=dealii.git

Fix compiling with clang-6
---

diff --git a/include/deal.II/base/symmetric_tensor.h b/include/deal.II/base/symmetric_tensor.h
index 08b857a1d2..d9611b895b 100644
--- a/include/deal.II/base/symmetric_tensor.h
+++ b/include/deal.II/base/symmetric_tensor.h
@@ -3140,7 +3140,7 @@ enum struct SymmetricTensorEigenvectorMethod
  * @author Joachim Kopp, Jean-Paul Pelteret, 2017
  */
 template <int dim, typename Number>
-std::array<std::pair<Number, Tensor<1,dim,Number> >,dim>
+std::array<std::pair<Number, Tensor<1,dim,Number> >,std::integral_constant<int, dim>::value>
 eigenvectors (const SymmetricTensor<2,dim,Number>         &T,
               const SymmetricTensorEigenvectorMethod       method = SymmetricTensorEigenvectorMethod::ql_implicit_shifts);
 
diff --git a/include/deal.II/base/symmetric_tensor.templates.h b/include/deal.II/base/symmetric_tensor.templates.h
index 0f5cc7c282..8d29d728a7 100644
--- a/include/deal.II/base/symmetric_tensor.templates.h
+++ b/include/deal.II/base/symmetric_tensor.templates.h
@@ -802,7 +802,7 @@ namespace internal
 
 
 template <int dim, typename Number>
-std::array<std::pair<Number, Tensor<1,dim,Number> >,dim>
+std::array<std::pair<Number, Tensor<1,dim,Number> >,std::integral_constant<int, dim>::value>
 eigenvectors (const SymmetricTensor<2,dim,Number>         &T,
               const SymmetricTensorEigenvectorMethod       method)
 {
diff --git a/source/base/symmetric_tensor.inst.in b/source/base/symmetric_tensor.inst.in
index 7e7963fe7d..b45f856b9d 100644
--- a/source/base/symmetric_tensor.inst.in
+++ b/source/base/symmetric_tensor.inst.in
@@ -27,7 +27,7 @@ for (deal_II_dimension : DIMENSIONS; number : REAL_SCALARS)
     eigenvalues (const SymmetricTensor<2,deal_II_dimension,number> &);
 
     template
-    std::array<std::pair<number, Tensor<1,deal_II_dimension,number> >,deal_II_dimension>
+    std::array<std::pair<number,Tensor<1,deal_II_dimension,number> >,std::integral_constant<int, deal_II_dimension>::value>
     eigenvectors (const SymmetricTensor<2,deal_II_dimension,number> &,
                   const SymmetricTensorEigenvectorMethod);
 }
@@ -45,7 +45,7 @@ for (deal_II_dimension : DIMENSIONS; number : DIFFERENTIABLE_ADOLC_REAL_SCALARS)
     eigenvalues (const SymmetricTensor<2,deal_II_dimension,number> &);
 
     template
-    std::array<std::pair<number, Tensor<1,deal_II_dimension,number> >,deal_II_dimension>
+    std::array<std::pair<number,Tensor<1,deal_II_dimension,number> >,std::integral_constant<int, deal_II_dimension>::value>
     eigenvectors (const SymmetricTensor<2,deal_II_dimension,number> &,
                   const SymmetricTensorEigenvectorMethod);
 }
@@ -63,7 +63,7 @@ for (deal_II_dimension : DIMENSIONS; number : DIFFERENTIABLE_TRILINOS_SACADO_REA
     eigenvalues (const SymmetricTensor<2,deal_II_dimension,number> &);
 
     template
-    std::array<std::pair<number, Tensor<1,deal_II_dimension,number> >,deal_II_dimension>
+    std::array<std::pair<number,Tensor<1,deal_II_dimension,number> >,std::integral_constant<int, deal_II_dimension>::value>
     eigenvectors (const SymmetricTensor<2,deal_II_dimension,number> &,
                   const SymmetricTensorEigenvectorMethod);
 }