From 8f67e02ee2dad8bea772cc30117677ecac72530b Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Thu, 16 May 2013 10:18:19 +0200 Subject: [PATCH] Fix non const data() member in Array and Matrix wrappers. (transplanted from b5e5b6aa575cc6eb14576a7ad76cb47cee20b2f3 ) --- Eigen/src/Core/ArrayWrapper.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Eigen/src/Core/ArrayWrapper.h b/Eigen/src/Core/ArrayWrapper.h index 65ffd64ca..9ee395cc9 100644 --- a/Eigen/src/Core/ArrayWrapper.h +++ b/Eigen/src/Core/ArrayWrapper.h @@ -55,7 +55,7 @@ class ArrayWrapper : public ArrayBase > inline Index outerStride() const { return m_expression.outerStride(); } inline Index innerStride() const { return m_expression.innerStride(); } - inline ScalarWithConstIfNotLvalue* data() { return m_expression.data(); } + inline ScalarWithConstIfNotLvalue* data() { return m_expression.const_cast_derived().data(); } inline const Scalar* data() const { return m_expression.data(); } inline CoeffReturnType coeff(Index row, Index col) const @@ -175,7 +175,7 @@ class MatrixWrapper : public MatrixBase > inline Index outerStride() const { return m_expression.outerStride(); } inline Index innerStride() const { return m_expression.innerStride(); } - inline ScalarWithConstIfNotLvalue* data() { return m_expression.data(); } + inline ScalarWithConstIfNotLvalue* data() { return m_expression.const_cast_derived().data(); } inline const Scalar* data() const { return m_expression.data(); } inline CoeffReturnType coeff(Index row, Index col) const