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/Tensor/TensorMap.h | |
| parent | 06971223efda38924832d86650ee1d4af6984344 (diff) | |
Backout changeset 690bc950f70c61075d396671e63480bbd64bb297
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorMap.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorMap.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorMap.h b/unsupported/Eigen/CXX11/src/Tensor/TensorMap.h index 7233f4c89..6f69da34a 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorMap.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorMap.h @@ -141,10 +141,10 @@ template<typename PlainObjectType, int Options_> class TensorMap : public Tensor { EIGEN_STATIC_ASSERT(sizeof...(otherIndices) + 1 == NumIndices, YOU_MADE_A_PROGRAMMING_MISTAKE) if (PlainObjectType::Options&RowMajor) { - const Index index = m_dimensions.IndexOfRowMajor(array<Index, NumIndices>{firstIndex, otherIndices...}); + const Index index = m_dimensions.IndexOfRowMajor(array<Index, NumIndices>{{firstIndex, otherIndices...}}); return m_data[index]; } else { - const Index index = m_dimensions.IndexOfColMajor(array<Index, NumIndices>{firstIndex, otherIndices...}); + const Index index = m_dimensions.IndexOfColMajor(array<Index, NumIndices>{{firstIndex, otherIndices...}}); return m_data[index]; } } @@ -228,10 +228,10 @@ template<typename PlainObjectType, int Options_> class TensorMap : public Tensor static_assert(sizeof...(otherIndices) + 1 == NumIndices || NumIndices == Dynamic, "Number of indices used to access a tensor coefficient must be equal to the rank of the tensor."); const std::size_t NumDims = sizeof...(otherIndices) + 1; if (PlainObjectType::Options&RowMajor) { - const Index index = m_dimensions.IndexOfRowMajor(array<Index, NumDims>{firstIndex, otherIndices...}); + const Index index = m_dimensions.IndexOfRowMajor(array<Index, NumDims>{{firstIndex, otherIndices...}}); return m_data[index]; } else { - const Index index = m_dimensions.IndexOfColMajor(array<Index, NumDims>{firstIndex, otherIndices...}); + const Index index = m_dimensions.IndexOfColMajor(array<Index, NumDims>{{firstIndex, otherIndices...}}); return m_data[index]; } } |