mirror of
https://gitlab.com/libeigen/eigen.git
synced 2026-04-10 11:34:33 +08:00
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.
This commit is contained in:
@@ -33,7 +33,7 @@
|
||||
#endif
|
||||
|
||||
#ifndef EIGEN_DEFAULT_MATRIX_STORAGE_ORDER
|
||||
#define EIGEN_DEFAULT_MATRIX_STORAGE_ORDER Indifferent
|
||||
#define EIGEN_DEFAULT_MATRIX_STORAGE_ORDER ColumnMajor
|
||||
#endif
|
||||
|
||||
#undef minor
|
||||
@@ -88,15 +88,14 @@ EIGEN_INHERIT_SCALAR_ASSIGNMENT_OPERATOR(Derived, /=)
|
||||
|
||||
const int Dynamic = -1;
|
||||
|
||||
enum TraversalOrder
|
||||
enum MatrixStorageOrder
|
||||
{
|
||||
ColumnMajor,
|
||||
RowMajor,
|
||||
Indifferent = ColumnMajor
|
||||
RowMajor
|
||||
};
|
||||
|
||||
//forward declarations
|
||||
template<typename _Scalar, int _Rows, int _Cols, TraversalOrder _StorageOrder>
|
||||
template<typename _Scalar, int _Rows, int _Cols, MatrixStorageOrder _StorageOrder>
|
||||
class Matrix;
|
||||
template<typename MatrixType> class MatrixRef;
|
||||
template<typename NewScalar, typename MatrixType> class Cast;
|
||||
@@ -126,7 +125,7 @@ template<typename T> struct ForwardDecl
|
||||
typedef T Ref;
|
||||
};
|
||||
|
||||
template<typename _Scalar, int _Rows, int _Cols, TraversalOrder _StorageOrder>
|
||||
template<typename _Scalar, int _Rows, int _Cols, MatrixStorageOrder _StorageOrder>
|
||||
struct ForwardDecl<Matrix<_Scalar, _Rows, _Cols, _StorageOrder> >
|
||||
{
|
||||
typedef MatrixRef<Matrix<_Scalar, _Rows, _Cols, _StorageOrder> > Ref;
|
||||
|
||||
Reference in New Issue
Block a user