diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2017-02-20 11:46:21 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2017-02-20 11:46:21 +0100 |
| commit | 9081c8f6eaeb61a682950fac53af6b321667e355 (patch) | |
| tree | 4531a647e5952576c89a4fbac3b3a679774a09d6 /Eigen/src/plugins | |
| parent | 4b22048cead4b3b34f2a784bb77f215350496103 (diff) | |
Add support for RowOrder reshaped
Diffstat (limited to 'Eigen/src/plugins')
| -rw-r--r-- | Eigen/src/plugins/ReshapedMethods.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Eigen/src/plugins/ReshapedMethods.h b/Eigen/src/plugins/ReshapedMethods.h index a9b4af7c3..7a11a4bcc 100644 --- a/Eigen/src/plugins/ReshapedMethods.h +++ b/Eigen/src/plugins/ReshapedMethods.h @@ -40,10 +40,12 @@ reshaped(NRowsType nRows, NColsType nCols) template<typename NRowsType, typename NColsType, typename OrderType> EIGEN_DEVICE_FUNC -inline Reshaped<Derived,internal::get_fixed_value<NRowsType>::value,internal::get_fixed_value<NColsType>::value,OrderType::value> +inline Reshaped<Derived,internal::get_fixed_value<NRowsType>::value,internal::get_fixed_value<NColsType>::value, + OrderType::value==AutoOrderValue?Flags&RowMajorBit:OrderType::value> reshaped(NRowsType nRows, NColsType nCols, OrderType) { - return Reshaped<Derived,internal::get_fixed_value<NRowsType>::value,internal::get_fixed_value<NColsType>::value,OrderType::value>( + return Reshaped<Derived,internal::get_fixed_value<NRowsType>::value,internal::get_fixed_value<NColsType>::value, + OrderType::value==AutoOrderValue?Flags&RowMajorBit:OrderType::value>( derived(), internal::get_runtime_value(nRows), internal::get_runtime_value(nCols)); } @@ -59,10 +61,12 @@ reshaped(NRowsType nRows, NColsType nCols) const template<typename NRowsType, typename NColsType, typename OrderType> EIGEN_DEVICE_FUNC -inline const Reshaped<const Derived,internal::get_fixed_value<NRowsType>::value,internal::get_fixed_value<NColsType>::value,OrderType::value> +inline const Reshaped<const Derived,internal::get_fixed_value<NRowsType>::value,internal::get_fixed_value<NColsType>::value, + OrderType::value==AutoOrderValue?Flags&RowMajorBit:OrderType::value> reshaped(NRowsType nRows, NColsType nCols, OrderType) const { - return Reshaped<const Derived,internal::get_fixed_value<NRowsType>::value,internal::get_fixed_value<NColsType>::value,OrderType::value>( + return Reshaped<const Derived,internal::get_fixed_value<NRowsType>::value,internal::get_fixed_value<NColsType>::value, + OrderType::value==AutoOrderValue?Flags&RowMajorBit:OrderType::value>( derived(), internal::get_runtime_value(nRows), internal::get_runtime_value(nCols)); } |