From e00487f7d2d0f96d6dc1e8eaa26a6e649f59107f Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Mon, 8 Oct 2018 22:27:04 +0200 Subject: [PATCH] bug #1603: add parenthesis around ternary operator in function body as well as a harmless attempt to make MSVC happy. --- Eigen/src/plugins/ReshapedMethods.h | 4 ++-- 1 file 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::value, internal::get_compiletime_reshape_size::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 + return Reshaped (derived(), size(), 1); }