diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2018-10-06 13:49:17 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2018-10-06 13:49:17 +0200 |
| commit | c6a1ab4036afff63fd92a15f15490a38c06bab4c (patch) | |
| tree | c03dc240807e9978418a79e0c14d40ea0efef834 /Eigen | |
| parent | 2b2b4d0580dd9a46790b16909aec607b18dd7b9e (diff) | |
Workaround MSVC compilation issue
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/plugins/ReshapedMethods.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Eigen/src/plugins/ReshapedMethods.h b/Eigen/src/plugins/ReshapedMethods.h index 574eb987b..ee96a368f 100644 --- a/Eigen/src/plugins/ReshapedMethods.h +++ b/Eigen/src/plugins/ReshapedMethods.h @@ -106,7 +106,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, @@ -130,9 +130,9 @@ reshaped() EIGEN_RESHAPED_METHOD_CONST template<int Order> EIGEN_DEVICE_FUNC inline Reshaped<EIGEN_RESHAPED_METHOD_CONST Derived, - Order==RowMajor ? 1 : SizeAtCompileTime, - Order==RowMajor ? SizeAtCompileTime : 1, - Order==AutoOrder?Flags&RowMajorBit:Order> + (Order==RowMajor ? 1 : SizeAtCompileTime), + (Order==RowMajor ? SizeAtCompileTime : 1), + (Order==AutoOrder?Flags&RowMajorBit:Order)> reshaped() EIGEN_RESHAPED_METHOD_CONST { EIGEN_STATIC_ASSERT(Order==RowMajor || Order==ColMajor, INVALID_TEMPLATE_PARAMETER); |