diff options
| author |  Rasmus Munk Larsen <rmlarsen@google.com> | 2021-06-15 09:09:31 -0700 |
|---|---|---|
| committer | Rasmus Munk Larsen <rmlarsen@google.com> | 2021-06-15 09:09:31 -0700 |
| commit | 13fb5ab92c3226f7b9be20882b0418d53516d35a (patch) | |
| tree | ed529fae15c51ae29073e2dca90d4f667bb6f625 /Eigen/src/SVD | |
| parent | ad82d20cf649ba8c07352f947fd25766d0328df2 (diff) | |
Fix more enum arithmetic.
Diffstat (limited to 'Eigen/src/SVD')
| -rw-r--r-- | Eigen/src/SVD/JacobiSVD.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Eigen/src/SVD/JacobiSVD.h b/Eigen/src/SVD/JacobiSVD.h index a22a2e5c3..8551a06c6 100644 --- a/Eigen/src/SVD/JacobiSVD.h +++ b/Eigen/src/SVD/JacobiSVD.h @@ -112,8 +112,8 @@ public: ColsAtCompileTime = MatrixType::ColsAtCompileTime, MaxRowsAtCompileTime = MatrixType::MaxRowsAtCompileTime, MaxColsAtCompileTime = MatrixType::MaxColsAtCompileTime, - TrOptions = RowsAtCompileTime==1 ? (MatrixType::Options & ~(RowMajor)) - : ColsAtCompileTime==1 ? (MatrixType::Options | RowMajor) + TrOptions = RowsAtCompileTime==1 ? (int(MatrixType::Options) & ~(int(RowMajor))) + : ColsAtCompileTime==1 ? (int(MatrixType::Options) | int(RowMajor)) : MatrixType::Options }; typedef Matrix<Scalar, ColsAtCompileTime, RowsAtCompileTime, TrOptions, MaxColsAtCompileTime, MaxRowsAtCompileTime> @@ -202,8 +202,8 @@ public: ColsAtCompileTime = MatrixType::ColsAtCompileTime, MaxRowsAtCompileTime = MatrixType::MaxRowsAtCompileTime, MaxColsAtCompileTime = MatrixType::MaxColsAtCompileTime, - TrOptions = RowsAtCompileTime==1 ? (MatrixType::Options & ~(RowMajor)) - : ColsAtCompileTime==1 ? (MatrixType::Options | RowMajor) + TrOptions = RowsAtCompileTime==1 ? (int(MatrixType::Options) & ~(int(RowMajor))) + : ColsAtCompileTime==1 ? (int(MatrixType::Options) | int(RowMajor)) : MatrixType::Options }; |