From 6a44ccb58b81771cc8438af20e5bf44de3d8c932 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Fri, 22 Jan 2016 15:03:53 +0100 Subject: Backout changeset 690bc950f70c61075d396671e63480bbd64bb297 --- unsupported/Eigen/CXX11/src/TensorSymmetry/DynamicSymmetry.h | 4 ++-- unsupported/Eigen/CXX11/src/TensorSymmetry/StaticSymmetry.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'unsupported/Eigen/CXX11/src/TensorSymmetry') diff --git a/unsupported/Eigen/CXX11/src/TensorSymmetry/DynamicSymmetry.h b/unsupported/Eigen/CXX11/src/TensorSymmetry/DynamicSymmetry.h index 1b9fe2779..bc4f2025f 100644 --- a/unsupported/Eigen/CXX11/src/TensorSymmetry/DynamicSymmetry.h +++ b/unsupported/Eigen/CXX11/src/TensorSymmetry/DynamicSymmetry.h @@ -55,7 +55,7 @@ class DynamicSGroup inline internal::tensor_symmetry_value_setter operator()(Tensor_& tensor, typename Tensor_::Index firstIndex, IndexTypes... otherIndices) const { static_assert(sizeof...(otherIndices) + 1 == Tensor_::NumIndices, "Number of indices used to access a tensor coefficient must be equal to the rank of the tensor."); - return operator()(tensor, std::array{firstIndex, otherIndices...}); + return operator()(tensor, std::array{{firstIndex, otherIndices...}}); } template @@ -90,7 +90,7 @@ class DynamicSGroup template inline std::array h_permute(std::size_t which, const std::array& idx, internal::numeric_list) const { - return std::array{ idx[n >= m_numIndices ? n : m_elements[which].representation[n]]... }; + return std::array{{ idx[n >= m_numIndices ? n : m_elements[which].representation[n]]... }}; } template diff --git a/unsupported/Eigen/CXX11/src/TensorSymmetry/StaticSymmetry.h b/unsupported/Eigen/CXX11/src/TensorSymmetry/StaticSymmetry.h index 255c344b4..942293bd7 100644 --- a/unsupported/Eigen/CXX11/src/TensorSymmetry/StaticSymmetry.h +++ b/unsupported/Eigen/CXX11/src/TensorSymmetry/StaticSymmetry.h @@ -217,7 +217,7 @@ class StaticSGroup inline internal::tensor_symmetry_value_setter> operator()(Tensor_& tensor, typename Tensor_::Index firstIndex, IndexTypes... otherIndices) const { static_assert(sizeof...(otherIndices) + 1 == Tensor_::NumIndices, "Number of indices used to access a tensor coefficient must be equal to the rank of the tensor."); - return operator()(tensor, std::array{firstIndex, otherIndices...}); + return operator()(tensor, std::array{{firstIndex, otherIndices...}}); } template -- cgit v1.2.3