diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2018-10-08 17:35:18 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2018-10-08 17:35:18 +0200 |
| commit | 649d4758a6b8bdfd50656ff6b937e0276cc1eb8b (patch) | |
| tree | ba84c90c8e08d9dd25f81865630793f155c2526a /Eigen/src/plugins | |
| parent | aa5820056ec1a21b23c716b2b6519c16f9fe4d04 (diff) | |
| parent | e29bfe84796370c6b12c09f013ef86e37222f743 (diff) | |
merge
Diffstat (limited to 'Eigen/src/plugins')
| -rw-r--r-- | Eigen/src/plugins/ReshapedMethods.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/plugins/ReshapedMethods.h b/Eigen/src/plugins/ReshapedMethods.h index 2466d24cb..538636ab5 100644 --- a/Eigen/src/plugins/ReshapedMethods.h +++ b/Eigen/src/plugins/ReshapedMethods.h @@ -105,7 +105,7 @@ EIGEN_DEVICE_FUNC inline Reshaped<EIGEN_RESHAPED_METHOD_CONST Derived, internal::get_compiletime_reshape_size<NRowsType,NColsType,SizeAtCompileTime>::value, internal::get_compiletime_reshape_size<NColsType,NRowsType,SizeAtCompileTime>::value, - Order==AutoOrder?Flags&RowMajorBit:Order> + (Order==AutoOrder?Flags&RowMajorBit:Order)> reshaped(NRowsType nRows, NColsType nCols) EIGEN_RESHAPED_METHOD_CONST { return Reshaped<EIGEN_RESHAPED_METHOD_CONST Derived, @@ -128,7 +128,7 @@ reshaped() EIGEN_RESHAPED_METHOD_CONST template<int Order> EIGEN_DEVICE_FUNC -inline Reshaped<EIGEN_RESHAPED_METHOD_CONST Derived, SizeAtCompileTime, 1, Order==AutoOrder?Flags&RowMajorBit:Order> +inline Reshaped<EIGEN_RESHAPED_METHOD_CONST Derived, SizeAtCompileTime, 1, (Order==AutoOrder?Flags&RowMajorBit:Order)> reshaped() EIGEN_RESHAPED_METHOD_CONST { EIGEN_STATIC_ASSERT(Order==RowMajor || Order==ColMajor || Order==AutoOrder, INVALID_TEMPLATE_PARAMETER); |