diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-02-10 12:36:26 -0800 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-02-10 12:36:26 -0800 |
| commit | c21e45fbc5b82a2f99113e8b6ab0005ca01a7428 (patch) | |
| tree | da6b8fcb4f8a2024c31753fa739f1087d9d11bcf /unsupported/Eigen/CXX11/src/Tensor/TensorShuffling.h | |
| parent | 057cfd2f02f06650db0634aca6abfbd09da36897 (diff) | |
Fixed a few more compilation warnings
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorShuffling.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorShuffling.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorShuffling.h b/unsupported/Eigen/CXX11/src/Tensor/TensorShuffling.h index 620a63ae7..1012ecd69 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorShuffling.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorShuffling.h @@ -126,7 +126,7 @@ struct TensorEvaluator<const TensorShufflingOp<Shuffle, ArgType>, Device> array<Index, NumDims> inputStrides; - if (Layout == ColMajor) { + if (static_cast<int>(Layout) == static_cast<int>(ColMajor)) { inputStrides[0] = 1; m_outputStrides[0] = 1; for (int i = 1; i < NumDims; ++i) { @@ -180,12 +180,12 @@ struct TensorEvaluator<const TensorShufflingOp<Shuffle, ArgType>, Device> return rslt; } - Scalar* data() const { return NULL; } + EIGEN_DEVICE_FUNC Scalar* data() const { return NULL; } protected: EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Index srcCoeff(Index index) const { Index inputIndex = 0; - if (Layout == ColMajor) { + if (static_cast<int>(Layout) == static_cast<int>(ColMajor)) { for (int i = NumDims - 1; i > 0; --i) { const Index idx = index / m_outputStrides[i]; inputIndex += idx * m_inputStrides[i]; |