diff --git a/src/Core.h b/src/Core.h index d0e0c05ec..3ab2cf965 100644 --- a/src/Core.h +++ b/src/Core.h @@ -6,7 +6,7 @@ namespace Eigen { #include "Core/Util.h" -#include "Core/Numeric.h" +#include "Core/NumTraits.h" #include "Core/Object.h" #include "Core/CopyHelper.h" #include "Core/MatrixRef.h" diff --git a/src/Core/Block.h b/src/Core/Block.h index a6dc51df1..d705133b5 100644 --- a/src/Core/Block.h +++ b/src/Core/Block.h @@ -76,9 +76,10 @@ template class Block template Block -Object::block(int startRow, int endRow, int startCol, int endCol) +Object::block(int startRow, int endRow, int startCol, int endCol) const { - return Block(static_cast(this)->ref(), startRow, endRow, startCol, endCol); + return Block(static_cast(const_cast(this))->ref(), + startRow, endRow, startCol, endCol); } #endif // EI_BLOCK_H diff --git a/src/Core/Minor.h b/src/Core/Minor.h index 30bba17cc..95d52f293 100644 --- a/src/Core/Minor.h +++ b/src/Core/Minor.h @@ -75,9 +75,9 @@ template class Minor template Minor -Object::minor(int row, int col) +Object::minor(int row, int col) const { - return Minor(static_cast(this)->ref(), row, col); + return Minor(static_cast(const_cast(this))->ref(), row, col); } #endif // EI_MINOR_H diff --git a/src/Core/Numeric.h b/src/Core/NumTraits.h similarity index 100% rename from src/Core/Numeric.h rename to src/Core/NumTraits.h diff --git a/src/Core/Object.h b/src/Core/Object.h index e53b5be49..72928406b 100644 --- a/src/Core/Object.h +++ b/src/Core/Object.h @@ -97,9 +97,9 @@ template class Object Row row(int i) const; Column col(int i) const; - Minor minor(int row, int col); - Block block(int startRow, int endRow, int startCol, int endCol); - Transpose transpose(); + Minor minor(int row, int col) const; + Block block(int startRow, int endRow, int startCol, int endCol) const; + Transpose transpose() const; Conjugate conjugate() const; Transpose > adjoint() const { return conjugate().transpose(); } Scalar trace() const; diff --git a/src/Core/Transpose.h b/src/Core/Transpose.h index 2bc8c7575..b15ad4691 100644 --- a/src/Core/Transpose.h +++ b/src/Core/Transpose.h @@ -66,9 +66,9 @@ template class Transpose template Transpose -Object::transpose() +Object::transpose() const { - return Transpose(static_cast(this)->ref()); + return Transpose(static_cast(const_cast(this))->ref()); } #endif // EI_TRANSPOSE_H