diff options
| author |  Rasmus Munk Larsen <rmlarsen@google.com> | 2018-09-15 02:35:07 +0000 |
|---|---|---|
| committer | Rasmus Munk Larsen <rmlarsen@google.com> | 2018-09-15 02:35:07 +0000 |
| commit | 30290cdd56e5443d1e22cea7a12f9ed99d2508cf (patch) | |
| tree | 69475cdf7e2372d4e0850efe622cb27202a394db | |
| parent | 601e289d2753fe6be065c8338413e95b2b77a889 (diff) | |
| parent | 71070a1e84538a91e6ecf364f4a23716eeb780bc (diff) | |
Merged in ezhulenev/eigen/moar_eigen_fixes_3 (pull request PR-493)
Const cast scalar pointer in TensorSlicingOp evaluator
Approved-by: Sameer Agarwal <sameeragarwal@google.com>
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h b/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h index 16dc74afe..d19aba3b3 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h @@ -695,7 +695,7 @@ struct TensorEvaluator<const TensorSlicingOp<StartIndices, Sizes, ArgType>, Devi } EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE typename Eigen::internal::traits<XprType>::PointerType data() const { - Scalar* result = m_impl.data(); + Scalar* result = const_cast<Scalar*>(m_impl.data()); if (result) { Index offset = 0; if (static_cast<int>(Layout) == static_cast<int>(ColMajor)) { |