diff options
author | 2018-09-19 11:49:26 +0200 | |
---|---|---|
committer | 2018-09-19 11:49:26 +0200 | |
commit | dfa8439e4d71a3b8dafc38a8419998e683f3ee96 (patch) | |
tree | e265df048a88fe428c28f60d10e3544cd906eb7f /Eigen/src/Core/util | |
parent | 5c68ba41a8b5fab7a742d786a12e7b3b92119b3e (diff) |
Update reshaped API to use RowMajor/ColMajor directly as integral values instead of introducing RowOrder/ColOrder types.
The API changed from A.respahed(rows,cols,RowOrder) to A.template reshaped<RowOrder>(rows,cols).
Diffstat (limited to 'Eigen/src/Core/util')
-rw-r--r-- | Eigen/src/Core/util/IntegralConstant.h | 5 | ||||
-rw-r--r-- | Eigen/src/Core/util/ReshapedHelper.h | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/Eigen/src/Core/util/IntegralConstant.h b/Eigen/src/Core/util/IntegralConstant.h index 4310aada1..c7d3b1c06 100644 --- a/Eigen/src/Core/util/IntegralConstant.h +++ b/Eigen/src/Core/util/IntegralConstant.h @@ -265,11 +265,6 @@ static const auto fix(int val); #endif // EIGEN_PARSED_BY_DOXYGEN -const int AutoOrderValue = 2; -const internal::FixedInt<ColMajor> ColOrder; -const internal::FixedInt<RowMajor> RowOrder; -const internal::FixedInt<AutoOrderValue> AutoOrder; - } // end namespace Eigen #endif // EIGEN_INTEGRAL_CONSTANT_H diff --git a/Eigen/src/Core/util/ReshapedHelper.h b/Eigen/src/Core/util/ReshapedHelper.h index 7b7435205..97370c138 100644 --- a/Eigen/src/Core/util/ReshapedHelper.h +++ b/Eigen/src/Core/util/ReshapedHelper.h @@ -14,6 +14,7 @@ namespace Eigen { enum AutoSize_t { AutoSize }; +const int AutoOrder = 2; namespace internal { |