GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-14 04:35:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

bug #1603: add parenthesis around ternary operator in function body as well as a harmless attempt to make MSVC happy.

Browse Source
This commit is contained in:
Gael Guennebaud 2018-10-08 22:27:04 +02:00
parent 2eda9783de
commit e00487f7d2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Eigen/src/plugins/ReshapedMethods.h
View File

@ -111,7 +111,7 @@ reshaped(NRowsType nRows, NColsType nCols) EIGEN_RESHAPED_METHOD_CONST
return Reshaped<EIGEN_RESHAPED_METHOD_CONST Derived, return Reshaped<EIGEN_RESHAPED_METHOD_CONST Derived,
internal::get_compiletime_reshape_size<NRowsType,NColsType,SizeAtCompileTime>::value, internal::get_compiletime_reshape_size<NRowsType,NColsType,SizeAtCompileTime>::value,
internal::get_compiletime_reshape_size<NColsType,NRowsType,SizeAtCompileTime>::value, internal::get_compiletime_reshape_size<NColsType,NRowsType,SizeAtCompileTime>::value,
Order==AutoOrder?Flags&RowMajorBit:Order> (Order==AutoOrder?Flags&RowMajorBit:Order)>
(derived(), (derived(),
internal::get_runtime_reshape_size(nRows,internal::get_runtime_value(nCols),size()), internal::get_runtime_reshape_size(nRows,internal::get_runtime_value(nCols),size()),
internal::get_runtime_reshape_size(nCols,internal::get_runtime_value(nRows),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 reshaped() EIGEN_RESHAPED_METHOD_CONST
{ {
EIGEN_STATIC_ASSERT(Order==RowMajor || Order==ColMajor || Order==AutoOrder, INVALID_TEMPLATE_PARAMETER); 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); (derived(), size(), 1);
} }