diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2016-01-22 15:03:53 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2016-01-22 15:03:53 +0100 |
| commit | 6a44ccb58b81771cc8438af20e5bf44de3d8c932 (patch) | |
| tree | a7d0ad71ff004ba8e75f0f0746bcfab79e6f0891 /unsupported/Eigen/CXX11/src/TensorSymmetry | |
| parent | 06971223efda38924832d86650ee1d4af6984344 (diff) | |
Backout changeset 690bc950f70c61075d396671e63480bbd64bb297
Diffstat (limited to 'unsupported/Eigen/CXX11/src/TensorSymmetry')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/TensorSymmetry/DynamicSymmetry.h | 4 | ||||
| -rw-r--r-- | unsupported/Eigen/CXX11/src/TensorSymmetry/StaticSymmetry.h | 2 |
2 files changed, 3 insertions, 3 deletions
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<Tensor_, DynamicSGroup> 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<typename Tensor_::Index, Tensor_::NumIndices>{firstIndex, otherIndices...}); + return operator()(tensor, std::array<typename Tensor_::Index, Tensor_::NumIndices>{{firstIndex, otherIndices...}}); } template<typename Tensor_> @@ -90,7 +90,7 @@ class DynamicSGroup template<typename Index, std::size_t N, int... n> inline std::array<Index, N> h_permute(std::size_t which, const std::array<Index, N>& idx, internal::numeric_list<int, n...>) const { - return std::array<Index, N>{ idx[n >= m_numIndices ? n : m_elements[which].representation[n]]... }; + return std::array<Index, N>{{ idx[n >= m_numIndices ? n : m_elements[which].representation[n]]... }}; } template<typename Index> 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<Tensor_, StaticSGroup<Gen...>> 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<typename Tensor_::Index, Tensor_::NumIndices>{firstIndex, otherIndices...}); + return operator()(tensor, std::array<typename Tensor_::Index, Tensor_::NumIndices>{{firstIndex, otherIndices...}}); } template<typename Tensor_> |