aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Eigen/src/Core/Block.h1
-rw-r--r--Eigen/src/Core/Cast.h5
-rw-r--r--Eigen/src/Core/Column.h1
-rw-r--r--Eigen/src/Core/Conjugate.h1
-rw-r--r--Eigen/src/Core/DiagonalCoeffs.h1
-rw-r--r--Eigen/src/Core/DiagonalMatrix.h1
-rw-r--r--Eigen/src/Core/Difference.h1
-rw-r--r--Eigen/src/Core/DynBlock.h1
-rw-r--r--Eigen/src/Core/Identity.h13
-rw-r--r--Eigen/src/Core/Map.h20
-rw-r--r--Eigen/src/Core/Matrix.h4
-rw-r--r--Eigen/src/Core/MatrixBase.h2
-rw-r--r--Eigen/src/Core/MatrixRef.h1
-rw-r--r--Eigen/src/Core/Minor.h1
-rw-r--r--Eigen/src/Core/Ones.h1
-rw-r--r--Eigen/src/Core/OperatorEquals.h37
-rw-r--r--Eigen/src/Core/Opposite.h1
-rw-r--r--Eigen/src/Core/Product.h1
-rw-r--r--Eigen/src/Core/Random.h1
-rw-r--r--Eigen/src/Core/Row.h1
-rw-r--r--Eigen/src/Core/ScalarMultiple.h1
-rw-r--r--Eigen/src/Core/Sum.h1
-rw-r--r--Eigen/src/Core/Transpose.h2
-rw-r--r--Eigen/src/Core/Util.h11
-rw-r--r--Eigen/src/Core/Zero.h1
25 files changed, 36 insertions, 75 deletions
diff --git a/Eigen/src/Core/Block.h b/Eigen/src/Core/Block.h
index 27ef2cb14..032048000 100644
--- a/Eigen/src/Core/Block.h
+++ b/Eigen/src/Core/Block.h
@@ -66,7 +66,6 @@ template<typename MatrixType, int BlockRows, int BlockCols> class Block
EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Block)
- static const TraversalOrder Order = MatrixType::Order;
static const int RowsAtCompileTime = BlockRows,
ColsAtCompileTime = BlockCols;
diff --git a/Eigen/src/Core/Cast.h b/Eigen/src/Core/Cast.h
index 126370487..74f5ce311 100644
--- a/Eigen/src/Core/Cast.h
+++ b/Eigen/src/Core/Cast.h
@@ -57,9 +57,8 @@ template<typename NewScalar, typename MatrixType> class Cast : NoOperatorEquals,
Cast(const MatRef& matrix) : m_matrix(matrix) {}
private:
- static const TraversalOrder _Order = MatrixType::Order;
- static const int _RowsAtCompileTime = MatrixType::RowsAtCompileTime,
- _ColsAtCompileTime = MatrixType::ColsAtCompileTime;
+ static const int RowsAtCompileTime = MatrixType::RowsAtCompileTime,
+ ColsAtCompileTime = MatrixType::ColsAtCompileTime;
const Cast& _ref() const { return *this; }
int _rows() const { return m_matrix.rows(); }
int _cols() const { return m_matrix.cols(); }
diff --git a/Eigen/src/Core/Column.h b/Eigen/src/Core/Column.h
index f32eb94e1..e46769fb1 100644
--- a/Eigen/src/Core/Column.h
+++ b/Eigen/src/Core/Column.h
@@ -62,7 +62,6 @@ template<typename MatrixType> class Column
EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Column)
- static const TraversalOrder Order = ColumnMajor;
static const int RowsAtCompileTime = MatrixType::RowsAtCompileTime,
ColsAtCompileTime = 1;
diff --git a/Eigen/src/Core/Conjugate.h b/Eigen/src/Core/Conjugate.h
index b5450ef91..90add873e 100644
--- a/Eigen/src/Core/Conjugate.h
+++ b/Eigen/src/Core/Conjugate.h
@@ -48,7 +48,6 @@ template<typename MatrixType> class Conjugate : NoOperatorEquals,
Conjugate(const MatRef& matrix) : m_matrix(matrix) {}
- static const TraversalOrder Order = MatrixType::Order;
static const int RowsAtCompileTime = MatrixType::RowsAtCompileTime,
ColsAtCompileTime = MatrixType::ColsAtCompileTime;
diff --git a/Eigen/src/Core/DiagonalCoeffs.h b/Eigen/src/Core/DiagonalCoeffs.h
index 0a570c9fc..d2a0af56c 100644
--- a/Eigen/src/Core/DiagonalCoeffs.h
+++ b/Eigen/src/Core/DiagonalCoeffs.h
@@ -50,7 +50,6 @@ template<typename MatrixType> class DiagonalCoeffs
EIGEN_INHERIT_ASSIGNMENT_OPERATORS(DiagonalCoeffs)
- static const TraversalOrder Order = ColumnMajor;
static const int RowsAtCompileTime = MatrixType::RowsAtCompileTime,
ColsAtCompileTime = 1;
diff --git a/Eigen/src/Core/DiagonalMatrix.h b/Eigen/src/Core/DiagonalMatrix.h
index 99245b750..b54d20829 100644
--- a/Eigen/src/Core/DiagonalMatrix.h
+++ b/Eigen/src/Core/DiagonalMatrix.h
@@ -55,7 +55,6 @@ class DiagonalMatrix : NoOperatorEquals,
&& coeffs.size() > 0);
}
- static const TraversalOrder Order = Indifferent;
static const int RowsAtCompileTime = CoeffsVectorType::Traits::SizeAtCompileTime,
ColsAtCompileTime = CoeffsVectorType::Traits::SizeAtCompileTime;
diff --git a/Eigen/src/Core/Difference.h b/Eigen/src/Core/Difference.h
index 8d2e731ee..1c72a9aa2 100644
--- a/Eigen/src/Core/Difference.h
+++ b/Eigen/src/Core/Difference.h
@@ -41,7 +41,6 @@ template<typename Lhs, typename Rhs> class Difference : NoOperatorEquals,
assert(lhs.rows() == rhs.rows() && lhs.cols() == rhs.cols());
}
- static const TraversalOrder Order = Lhs::Order;
static const int RowsAtCompileTime = Lhs::RowsAtCompileTime,
ColsAtCompileTime = Rhs::ColsAtCompileTime;
diff --git a/Eigen/src/Core/DynBlock.h b/Eigen/src/Core/DynBlock.h
index 4f352293b..b910afcee 100644
--- a/Eigen/src/Core/DynBlock.h
+++ b/Eigen/src/Core/DynBlock.h
@@ -66,7 +66,6 @@ template<typename MatrixType> class DynBlock
EIGEN_INHERIT_ASSIGNMENT_OPERATORS(DynBlock)
- static const TraversalOrder Order = MatrixType::Order;
static const int
RowsAtCompileTime = MatrixType::RowsAtCompileTime == 1 ? 1 : Dynamic,
ColsAtCompileTime = MatrixType::ColsAtCompileTime == 1 ? 1 : Dynamic;
diff --git a/Eigen/src/Core/Identity.h b/Eigen/src/Core/Identity.h
index 21e70be5c..4f8045c1e 100644
--- a/Eigen/src/Core/Identity.h
+++ b/Eigen/src/Core/Identity.h
@@ -33,20 +33,15 @@ template<typename MatrixType> class Identity : NoOperatorEquals,
typedef typename MatrixType::Scalar Scalar;
friend class MatrixBase<Scalar, Identity<MatrixType> >;
+ static const int RowsAtCompileTime = MatrixType::RowsAtCompileTime,
+ ColsAtCompileTime = MatrixType::ColsAtCompileTime;
+
Identity(int rows) : m_rows(rows)
{
- assert(rows > 0 && _RowsAtCompileTime == _ColsAtCompileTime);
+ assert(rows > 0 && RowsAtCompileTime == ColsAtCompileTime);
}
- static const TraversalOrder Order = Indifferent;
- static const int RowsAtCompileTime = MatrixType::RowsAtCompileTime,
- ColsAtCompileTime = MatrixType::ColsAtCompileTime;
-
private:
- static const TraversalOrder _Order = Indifferent;
- static const int _RowsAtCompileTime = MatrixType::RowsAtCompileTime,
- _ColsAtCompileTime = MatrixType::ColsAtCompileTime;
-
const Identity& _ref() const { return *this; }
int _rows() const { return m_rows; }
int _cols() const { return m_rows; }
diff --git a/Eigen/src/Core/Map.h b/Eigen/src/Core/Map.h
index 79a00b92b..999ae283b 100644
--- a/Eigen/src/Core/Map.h
+++ b/Eigen/src/Core/Map.h
@@ -46,9 +46,9 @@ template<typename MatrixType> class Map
typedef typename MatrixType::Scalar Scalar;
friend class MatrixBase<Scalar, Map<MatrixType> >;
- static const TraversalOrder Order = MatrixType::Order;
static const int RowsAtCompileTime = MatrixType::RowsAtCompileTime,
ColsAtCompileTime = MatrixType::ColsAtCompileTime;
+ static const MatrixStorageOrder Order = MatrixType::Order;
private:
const Map& _ref() const { return *this; }
@@ -88,7 +88,7 @@ template<typename MatrixType> class Map
};
/** This is the const version of map(Scalar*,int,int). */
-template<typename _Scalar, int _Rows, int _Cols, TraversalOrder _StorageOrder>
+template<typename _Scalar, int _Rows, int _Cols, MatrixStorageOrder _StorageOrder>
const Map<Matrix<_Scalar, _Rows, _Cols, _StorageOrder> >
Matrix<_Scalar, _Rows, _Cols, _StorageOrder>::map(const Scalar* data, int rows, int cols)
{
@@ -96,7 +96,7 @@ Matrix<_Scalar, _Rows, _Cols, _StorageOrder>::map(const Scalar* data, int rows,
}
/** This is the const version of map(Scalar*,int). */
-template<typename _Scalar, int _Rows, int _Cols, TraversalOrder _StorageOrder>
+template<typename _Scalar, int _Rows, int _Cols, MatrixStorageOrder _StorageOrder>
const Map<Matrix<_Scalar, _Rows, _Cols, _StorageOrder> >
Matrix<_Scalar, _Rows, _Cols, _StorageOrder>::map(const Scalar* data, int size)
{
@@ -108,7 +108,7 @@ Matrix<_Scalar, _Rows, _Cols, _StorageOrder>::map(const Scalar* data, int size)
}
/** This is the const version of map(Scalar*). */
-template<typename _Scalar, int _Rows, int _Cols, TraversalOrder _StorageOrder>
+template<typename _Scalar, int _Rows, int _Cols, MatrixStorageOrder _StorageOrder>
const Map<Matrix<_Scalar, _Rows, _Cols, _StorageOrder> >
Matrix<_Scalar, _Rows, _Cols, _StorageOrder>::map(const Scalar* data)
{
@@ -126,7 +126,7 @@ Matrix<_Scalar, _Rows, _Cols, _StorageOrder>::map(const Scalar* data)
*
* \sa map(const Scalar*, int, int), map(Scalar*, int), map(Scalar*), class Map
*/
-template<typename _Scalar, int _Rows, int _Cols, TraversalOrder _StorageOrder>
+template<typename _Scalar, int _Rows, int _Cols, MatrixStorageOrder _StorageOrder>
Map<Matrix<_Scalar, _Rows, _Cols, _StorageOrder> >
Matrix<_Scalar, _Rows, _Cols, _StorageOrder>::map(Scalar* data, int rows, int cols)
{
@@ -145,7 +145,7 @@ Matrix<_Scalar, _Rows, _Cols, _StorageOrder>::map(Scalar* data, int rows, int co
*
* \sa map(const Scalar*, int), map(Scalar*, int, int), map(Scalar*), class Map
*/
-template<typename _Scalar, int _Rows, int _Cols, TraversalOrder _StorageOrder>
+template<typename _Scalar, int _Rows, int _Cols, MatrixStorageOrder _StorageOrder>
Map<Matrix<_Scalar, _Rows, _Cols, _StorageOrder> >
Matrix<_Scalar, _Rows, _Cols, _StorageOrder>::map(Scalar* data, int size)
{
@@ -165,7 +165,7 @@ Matrix<_Scalar, _Rows, _Cols, _StorageOrder>::map(Scalar* data, int size)
*
* \sa map(const Scalar*), map(Scalar*, int), map(Scalar*, int, int), class Map
*/
-template<typename _Scalar, int _Rows, int _Cols, TraversalOrder _StorageOrder>
+template<typename _Scalar, int _Rows, int _Cols, MatrixStorageOrder _StorageOrder>
Map<Matrix<_Scalar, _Rows, _Cols, _StorageOrder> >
Matrix<_Scalar, _Rows, _Cols, _StorageOrder>::map(Scalar* data)
{
@@ -180,7 +180,7 @@ Matrix<_Scalar, _Rows, _Cols, _StorageOrder>::map(Scalar* data)
*
* \sa Matrix(const Scalar *), Matrix::map(const Scalar *, int, int)
*/
-template<typename _Scalar, int _Rows, int _Cols, TraversalOrder _StorageOrder>
+template<typename _Scalar, int _Rows, int _Cols, MatrixStorageOrder _StorageOrder>
Matrix<_Scalar, _Rows, _Cols, _StorageOrder>
::Matrix(const Scalar *data, int rows, int cols)
: Storage(rows, cols)
@@ -198,7 +198,7 @@ Matrix<_Scalar, _Rows, _Cols, _StorageOrder>
*
* \sa Matrix(const Scalar *), Matrix::map(const Scalar *, int)
*/
-template<typename _Scalar, int _Rows, int _Cols, TraversalOrder _StorageOrder>
+template<typename _Scalar, int _Rows, int _Cols, MatrixStorageOrder _StorageOrder>
Matrix<_Scalar, _Rows, _Cols, _StorageOrder>
::Matrix(const Scalar *data, int size)
: Storage(size)
@@ -216,7 +216,7 @@ Matrix<_Scalar, _Rows, _Cols, _StorageOrder>
* \sa Matrix(const Scalar *, int), Matrix(const Scalar *, int, int),
* Matrix::map(const Scalar *)
*/
-template<typename _Scalar, int _Rows, int _Cols, TraversalOrder _StorageOrder>
+template<typename _Scalar, int _Rows, int _Cols, MatrixStorageOrder _StorageOrder>
Matrix<_Scalar, _Rows, _Cols, _StorageOrder>
::Matrix(const Scalar *data)
: Storage()
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:
diff --git a/Eigen/src/Core/MatrixBase.h b/Eigen/src/Core/MatrixBase.h
index bfcea8cc5..123cbf438 100644
--- a/Eigen/src/Core/MatrixBase.h
+++ b/Eigen/src/Core/MatrixBase.h
@@ -31,8 +31,6 @@
template <typename Derived>
struct DerivedTraits
{
- static const TraversalOrder Order = Derived::Order;
-
/** The number of rows at compile-time. This is just a copy of the value provided
* by the \a Derived type. If a value is not known at compile-time,
* it is set to the \a Dynamic constant.
diff --git a/Eigen/src/Core/MatrixRef.h b/Eigen/src/Core/MatrixRef.h
index 1660a2b01..a2613892e 100644
--- a/Eigen/src/Core/MatrixRef.h
+++ b/Eigen/src/Core/MatrixRef.h
@@ -38,7 +38,6 @@ template<typename MatrixType> class MatrixRef
EIGEN_INHERIT_ASSIGNMENT_OPERATORS(MatrixRef)
- static const TraversalOrder Order = MatrixType::Order;
static const int RowsAtCompileTime = MatrixType::RowsAtCompileTime,
ColsAtCompileTime = MatrixType::ColsAtCompileTime;
diff --git a/Eigen/src/Core/Minor.h b/Eigen/src/Core/Minor.h
index 5de41f169..c26c78e7f 100644
--- a/Eigen/src/Core/Minor.h
+++ b/Eigen/src/Core/Minor.h
@@ -56,7 +56,6 @@ template<typename MatrixType> class Minor
EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Minor)
- static const TraversalOrder Order = MatrixType::Order;
static const int
RowsAtCompileTime = (MatrixType::RowsAtCompileTime != Dynamic) ?
MatrixType::RowsAtCompileTime - 1 : Dynamic,
diff --git a/Eigen/src/Core/Ones.h b/Eigen/src/Core/Ones.h
index ede1c1d4f..b0fa1daf3 100644
--- a/Eigen/src/Core/Ones.h
+++ b/Eigen/src/Core/Ones.h
@@ -39,7 +39,6 @@ template<typename MatrixType> class Ones : NoOperatorEquals,
typedef typename MatrixType::Scalar Scalar;
friend class MatrixBase<Scalar, Ones<MatrixType> >;
- static const TraversalOrder Order = Indifferent;
static const int RowsAtCompileTime = MatrixType::RowsAtCompileTime,
ColsAtCompileTime = MatrixType::ColsAtCompileTime;
diff --git a/Eigen/src/Core/OperatorEquals.h b/Eigen/src/Core/OperatorEquals.h
index eaadb2478..296573953 100644
--- a/Eigen/src/Core/OperatorEquals.h
+++ b/Eigen/src/Core/OperatorEquals.h
@@ -27,25 +27,21 @@
#ifndef EIGEN_OPERATOREQUALS_H
#define EIGEN_OPERATOREQUALS_H
-template<typename Derived1, typename Derived2, int UnrollCount, TraversalOrder Order>
+template<typename Derived1, typename Derived2, int UnrollCount>
struct MatrixOperatorEqualsUnroller
{
- static const int col = (Order == ColumnMajor)
- ? (UnrollCount-1) / Derived1::RowsAtCompileTime
- : (UnrollCount-1) % Derived1::ColsAtCompileTime;
- static const int row = (Order == ColumnMajor)
- ? (UnrollCount-1) % Derived1::RowsAtCompileTime
- : (UnrollCount-1) / Derived1::ColsAtCompileTime;
+ static const int col = (UnrollCount-1) / Derived1::RowsAtCompileTime;
+ static const int row = (UnrollCount-1) % Derived1::RowsAtCompileTime;
static void run(Derived1 &dst, const Derived2 &src)
{
- MatrixOperatorEqualsUnroller<Derived1, Derived2, UnrollCount-1, Order>::run(dst, src);
+ MatrixOperatorEqualsUnroller<Derived1, Derived2, UnrollCount-1>::run(dst, src);
dst.coeffRef(row, col) = src.coeff(row, col);
}
};
-template<typename Derived1, typename Derived2, TraversalOrder Order>
-struct MatrixOperatorEqualsUnroller<Derived1, Derived2, 1, Order>
+template<typename Derived1, typename Derived2>
+struct MatrixOperatorEqualsUnroller<Derived1, Derived2, 1>
{
static void run(Derived1 &dst, const Derived2 &src)
{
@@ -54,14 +50,14 @@ struct MatrixOperatorEqualsUnroller<Derived1, Derived2, 1, Order>
};
// prevent buggy user code from causing an infinite recursion
-template<typename Derived1, typename Derived2, TraversalOrder Order>
-struct MatrixOperatorEqualsUnroller<Derived1, Derived2, 0, Order>
+template<typename Derived1, typename Derived2>
+struct MatrixOperatorEqualsUnroller<Derived1, Derived2, 0>
{
static void run(Derived1 &, const Derived2 &) {}
};
-template<typename Derived1, typename Derived2, TraversalOrder Order>
-struct MatrixOperatorEqualsUnroller<Derived1, Derived2, Dynamic, Order>
+template<typename Derived1, typename Derived2>
+struct MatrixOperatorEqualsUnroller<Derived1, Derived2, Dynamic>
{
static void run(Derived1 &, const Derived2 &) {}
};
@@ -123,19 +119,12 @@ Derived& MatrixBase<Scalar, Derived>
assert(rows() == other.rows() && cols() == other.cols());
if(EIGEN_UNROLLED_LOOPS && Traits::SizeAtCompileTime != Dynamic && Traits::SizeAtCompileTime <= 25)
MatrixOperatorEqualsUnroller
- <Derived, OtherDerived, Traits::SizeAtCompileTime, Traits::Order>::run
+ <Derived, OtherDerived, Traits::SizeAtCompileTime>::run
(*static_cast<Derived*>(this), *static_cast<const OtherDerived*>(&other));
else
- {
- if(Traits::Order == ColumnMajor)
- for(int j = 0; j < cols(); j++)
- for(int i = 0; i < rows(); i++)
- coeffRef(i, j) = other.coeff(i, j);
- else // RowMajor
+ for(int j = 0; j < cols(); j++)
for(int i = 0; i < rows(); i++)
- for(int j = 0; j < cols(); j++)
- coeffRef(i, j) = other.coeff(i, j);
- }
+ coeffRef(i, j) = other.coeff(i, j);
return *static_cast<Derived*>(this);
}
}
diff --git a/Eigen/src/Core/Opposite.h b/Eigen/src/Core/Opposite.h
index 1b1139c9d..ab4ce4c10 100644
--- a/Eigen/src/Core/Opposite.h
+++ b/Eigen/src/Core/Opposite.h
@@ -36,7 +36,6 @@ template<typename MatrixType> class Opposite : NoOperatorEquals,
Opposite(const MatRef& matrix) : m_matrix(matrix) {}
- static const TraversalOrder Order = MatrixType::Order;
static const int RowsAtCompileTime = MatrixType::RowsAtCompileTime,
ColsAtCompileTime = MatrixType::ColsAtCompileTime;
diff --git a/Eigen/src/Core/Product.h b/Eigen/src/Core/Product.h
index 3c790bd84..be573f416 100644
--- a/Eigen/src/Core/Product.h
+++ b/Eigen/src/Core/Product.h
@@ -75,7 +75,6 @@ template<typename Lhs, typename Rhs> class Product : NoOperatorEquals,
assert(lhs.cols() == rhs.rows());
}
- static const TraversalOrder Order = Lhs::Order;
static const int RowsAtCompileTime = Lhs::RowsAtCompileTime,
ColsAtCompileTime = Rhs::ColsAtCompileTime;
diff --git a/Eigen/src/Core/Random.h b/Eigen/src/Core/Random.h
index 164c24e30..cf6d44fb3 100644
--- a/Eigen/src/Core/Random.h
+++ b/Eigen/src/Core/Random.h
@@ -39,7 +39,6 @@ template<typename MatrixType> class Random : NoOperatorEquals,
typedef typename MatrixType::Scalar Scalar;
friend class MatrixBase<Scalar, Random<MatrixType> >;
- static const TraversalOrder Order = Indifferent;
static const int RowsAtCompileTime = MatrixType::RowsAtCompileTime,
ColsAtCompileTime = MatrixType::ColsAtCompileTime;
diff --git a/Eigen/src/Core/Row.h b/Eigen/src/Core/Row.h
index 7ba3a13a0..a10bf8bf5 100644
--- a/Eigen/src/Core/Row.h
+++ b/Eigen/src/Core/Row.h
@@ -68,7 +68,6 @@ template<typename MatrixType> class Row
EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Row)
- static const TraversalOrder Order = RowMajor;
static const int RowsAtCompileTime = 1,
ColsAtCompileTime = MatrixType::ColsAtCompileTime;
diff --git a/Eigen/src/Core/ScalarMultiple.h b/Eigen/src/Core/ScalarMultiple.h
index c60ef5f4a..618fcf4dd 100644
--- a/Eigen/src/Core/ScalarMultiple.h
+++ b/Eigen/src/Core/ScalarMultiple.h
@@ -37,7 +37,6 @@ template<typename FactorType, typename MatrixType> class ScalarMultiple : NoOper
ScalarMultiple(const MatRef& matrix, FactorType factor)
: m_matrix(matrix), m_factor(factor) {}
- static const TraversalOrder Order = MatrixType::Order;
static const int RowsAtCompileTime = MatrixType::RowsAtCompileTime,
ColsAtCompileTime = MatrixType::ColsAtCompileTime;
diff --git a/Eigen/src/Core/Sum.h b/Eigen/src/Core/Sum.h
index a566077dd..365c23810 100644
--- a/Eigen/src/Core/Sum.h
+++ b/Eigen/src/Core/Sum.h
@@ -41,7 +41,6 @@ template<typename Lhs, typename Rhs> class Sum : NoOperatorEquals,
assert(lhs.rows() == rhs.rows() && lhs.cols() == rhs.cols());
}
- static const TraversalOrder Order = Lhs::Order;
static const int RowsAtCompileTime = Lhs::RowsAtCompileTime,
ColsAtCompileTime = Rhs::ColsAtCompileTime;
diff --git a/Eigen/src/Core/Transpose.h b/Eigen/src/Core/Transpose.h
index b6a19c751..b12efde81 100644
--- a/Eigen/src/Core/Transpose.h
+++ b/Eigen/src/Core/Transpose.h
@@ -50,8 +50,6 @@ template<typename MatrixType> class Transpose
EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Transpose)
- static const TraversalOrder Order = (MatrixType::Order == ColumnMajor)
- ? RowMajor : ColumnMajor;
static const int RowsAtCompileTime = MatrixType::ColsAtCompileTime,
ColsAtCompileTime = MatrixType::RowsAtCompileTime;
diff --git a/Eigen/src/Core/Util.h b/Eigen/src/Core/Util.h
index 0202f37c9..0522c3fbf 100644
--- a/Eigen/src/Core/Util.h
+++ b/Eigen/src/Core/Util.h
@@ -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;
diff --git a/Eigen/src/Core/Zero.h b/Eigen/src/Core/Zero.h
index 5dd6b7e7d..72a6bd4df 100644
--- a/Eigen/src/Core/Zero.h
+++ b/Eigen/src/Core/Zero.h
@@ -39,7 +39,6 @@ template<typename MatrixType> class Zero : NoOperatorEquals,
typedef typename MatrixType::Scalar Scalar;
friend class MatrixBase<Scalar, Zero<MatrixType> >;
- static const TraversalOrder Order = Indifferent;
static const int RowsAtCompileTime = MatrixType::RowsAtCompileTime,
ColsAtCompileTime = MatrixType::ColsAtCompileTime;
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-08 22:02:56 +0000