diff options
| author | Yi Kong <yikong@google.com> | 2022-02-25 16:17:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-25 16:17:02 +0000 |
| commit | 7cb50013986f04dce5fac87bebf319bb8db37a36 (patch) | |
| tree | fb979fb4cf4f8052c8cc66b1ec9516d91fcd859b /unsupported/Eigen/src/KroneckerProduct/KroneckerTensorProduct.h | |
| parent | 26a30e76965432e5088c271df90759e49d9636a2 (diff) | |
| parent | 10f298fc4175c1b8537c674f654a070c871960e5 (diff) | |
| download | eigen-7cb50013986f04dce5fac87bebf319bb8db37a36.tar.gz | |
Merge changes Iee153445,Iee274471 am: 79df15ea88 am: 10f298fc41
Original change: https://android-review.googlesource.com/c/platform/external/eigen/+/1999079
Change-Id: I3dd349f9a45d37f37441ff7a7742ebe953b70516
Diffstat (limited to 'unsupported/Eigen/src/KroneckerProduct/KroneckerTensorProduct.h')
| -rw-r--r-- | unsupported/Eigen/src/KroneckerProduct/KroneckerTensorProduct.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unsupported/Eigen/src/KroneckerProduct/KroneckerTensorProduct.h b/unsupported/Eigen/src/KroneckerProduct/KroneckerTensorProduct.h index 582fa8512..6a9b0be88 100644 --- a/unsupported/Eigen/src/KroneckerProduct/KroneckerTensorProduct.h +++ b/unsupported/Eigen/src/KroneckerProduct/KroneckerTensorProduct.h @@ -235,10 +235,10 @@ struct traits<KroneckerProductSparse<_Lhs,_Rhs> > MaxRowsAtCompileTime = size_at_compile_time<traits<Lhs>::MaxRowsAtCompileTime, traits<Rhs>::MaxRowsAtCompileTime>::ret, MaxColsAtCompileTime = size_at_compile_time<traits<Lhs>::MaxColsAtCompileTime, traits<Rhs>::MaxColsAtCompileTime>::ret, - EvalToRowMajor = (LhsFlags & RhsFlags & RowMajorBit), + EvalToRowMajor = (int(LhsFlags) & int(RhsFlags) & RowMajorBit), RemovedBits = ~(EvalToRowMajor ? 0 : RowMajorBit), - Flags = ((LhsFlags | RhsFlags) & HereditaryBits & RemovedBits) + Flags = ((int(LhsFlags) | int(RhsFlags)) & HereditaryBits & RemovedBits) | EvalBeforeNestingBit, CoeffReadCost = HugeCost }; |