diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-09-17 09:40:21 -0700 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-09-17 09:40:21 -0700 |
| commit | 31afdcb4c2954f7b8c01b0f27fb39f607e94feca (patch) | |
| tree | 28041e5c650a802eb1978947340c7c0660749ecc /unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h | |
| parent | 9d993c709b5edf8b7eeabe2de60be9f3b28bf373 (diff) | |
Fix return type for TensorEvaluator<TensorSlicingOp>::data
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h b/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h index dad656313..bdc86e0fa 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h @@ -463,8 +463,8 @@ struct TensorEvaluator<const TensorSlicingOp<StartIndices, Sizes, ArgType>, Devi return m_impl.coeff(inputCoords); } - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE CoeffReturnType* data() const { - CoeffReturnType* result = m_impl.data(); + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Scalar* data() const { + Scalar* result = m_impl.data(); if (result) { Index offset = 0; if (static_cast<int>(Layout) == static_cast<int>(ColMajor)) { |