diff options
author | 2008-01-06 13:57:29 +0000 | |
---|---|---|
committer | 2008-01-06 13:57:29 +0000 | |
commit | aaf889e72b005110530fb4252fb0858c2ec733de (patch) | |
tree | f8ca237c0f12b738bbd6088cfc7a97b8183f30b3 /Eigen/src/Core/Matrix.h | |
parent | 495eb7053ab7101f714718332399d51b10645b8b (diff) |
remove all the _Order mechanics, now we are always traversing matrices in
column-major order, even if storage is row-major. Benchmark showed that adapting
the traversal order to the storage order brought no benefit.
Also do some cleanup after Gael's big patch.
Diffstat (limited to 'Eigen/src/Core/Matrix.h')
-rw-r--r-- | Eigen/src/Core/Matrix.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Core/Matrix.h b/Eigen/src/Core/Matrix.h index 4fa997269..cde5dcebf 100644 --- a/Eigen/src/Core/Matrix.h +++ b/Eigen/src/Core/Matrix.h @@ -73,7 +73,7 @@ * MatrixStorage also provides the MatrixStorage::resize() public method. */ template<typename _Scalar, int _Rows, int _Cols, - TraversalOrder _StorageOrder = EIGEN_DEFAULT_MATRIX_STORAGE_ORDER> + MatrixStorageOrder _StorageOrder = EIGEN_DEFAULT_MATRIX_STORAGE_ORDER> class Matrix : public MatrixBase<_Scalar, Matrix<_Scalar, _Rows, _Cols, _StorageOrder> >, public MatrixStorage<_Scalar, _Rows, _Cols> { @@ -91,7 +91,7 @@ class Matrix : public MatrixBase<_Scalar, Matrix<_Scalar, _Rows, _Cols, _Storage Scalar* data() { return Storage::m_data; } - static const TraversalOrder Order = _StorageOrder; + static const MatrixStorageOrder Order = _StorageOrder; static const int RowsAtCompileTime = _Rows, ColsAtCompileTime = _Cols; private: |