diff options
| author |  Eugene Zhulenev <ezhulenev@google.com> | 2018-11-02 14:48:28 -0700 |
|---|---|---|
| committer | Eugene Zhulenev <ezhulenev@google.com> | 2018-11-02 14:48:28 -0700 |
| commit | 118520f04a84b6246a1fb1c6db4ce99290a79956 (patch) | |
| tree | eb4e2a99be9093db0d6106526457504779a99a56 /Eigen/src/plugins | |
| parent | 9d318b92c6d5487727d3994c733c9d86186f4204 (diff) | |
Workaround nbcc+msvc compiler bug
Diffstat (limited to 'Eigen/src/plugins')
| -rw-r--r-- | Eigen/src/plugins/ReshapedMethods.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Eigen/src/plugins/ReshapedMethods.h b/Eigen/src/plugins/ReshapedMethods.h index 6885685d5..482a6b045 100644 --- a/Eigen/src/plugins/ReshapedMethods.h +++ b/Eigen/src/plugins/ReshapedMethods.h @@ -105,13 +105,13 @@ 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)> + internal::get_compiletime_reshape_order<Flags,Order>::value> 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)> + internal::get_compiletime_reshape_order<Flags,Order>::value> (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())); @@ -128,11 +128,13 @@ 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, + internal::get_compiletime_reshape_order<Flags,Order>::value> 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, + internal::get_compiletime_reshape_order<Flags,Order>::value> (derived(), size(), 1); } |