diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2018-10-08 22:27:04 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2018-10-08 22:27:04 +0200 |
| commit | e00487f7d2d0f96d6dc1e8eaa26a6e649f59107f (patch) | |
| tree | c92a4d934c62cf0e527bc0e5317a6a4c5639a1ec /Eigen | |
| parent | 2eda9783dea3b8c3e8cee3c9e1eb6ef52a17aa71 (diff) | |
bug #1603: add parenthesis around ternary operator in function body as well as a harmless attempt to make MSVC happy.
Diffstat (limited to 'Eigen')
| -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 538636ab5..6885685d5 100644 --- a/Eigen/src/plugins/ReshapedMethods.h +++ b/Eigen/src/plugins/ReshapedMethods.h @@ -111,7 +111,7 @@ reshaped(NRowsType nRows, NColsType nCols) EIGEN_RESHAPED_METHOD_CONST return 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)> (derived(), internal::get_runtime_reshape_size(nRows,internal::get_runtime_value(nCols),size()), internal::get_runtime_reshape_size(nCols,internal::get_runtime_value(nRows),size())); @@ -132,7 +132,7 @@ inline Reshaped<EIGEN_RESHAPED_METHOD_CONST Derived, SizeAtCompileTime, 1, (Orde reshaped() EIGEN_RESHAPED_METHOD_CONST { EIGEN_STATIC_ASSERT(Order==RowMajor || Order==ColMajor || Order==AutoOrder, INVALID_TEMPLATE_PARAMETER); - return Reshaped<EIGEN_RESHAPED_METHOD_CONST Derived, SizeAtCompileTime, 1, Order==AutoOrder?Flags&RowMajorBit:Order> + return Reshaped<EIGEN_RESHAPED_METHOD_CONST Derived, SizeAtCompileTime, 1, (Order==AutoOrder?Flags&RowMajorBit:Order)> (derived(), size(), 1); } |