GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-10 02:39:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix deprecated anonymous enum-enum conversion warnings

Browse Source
This commit is contained in:
Tyler Veness 2024-03-01 15:37:44 -08:00 committed by Antonio Sánchez
parent 55dd487478
commit 5ffb307afa
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Eigen/src/Core/Matrix.h
View File

@ -30,7 +30,7 @@ struct traits<Matrix<Scalar_, Rows_, Cols_, Options_, MaxRows_, MaxCols_>> {
actual_alignment = ((Options_ & DontAlign) == 0) ? default_alignment : 0, actual_alignment = ((Options_ & DontAlign) == 0) ? default_alignment : 0,
required_alignment = unpacket_traits<PacketScalar>::alignment, required_alignment = unpacket_traits<PacketScalar>::alignment,
packet_access_bit = (packet_traits<Scalar_>::Vectorizable && packet_access_bit = (packet_traits<Scalar_>::Vectorizable &&
(EIGEN_UNALIGNED_VECTORIZE || (actual_alignment >= required_alignment))) (EIGEN_UNALIGNED_VECTORIZE || (int(actual_alignment) >= int(required_alignment))))
? PacketAccessBit ? PacketAccessBit
: 0 : 0
}; };
@ -48,7 +48,7 @@ struct traits<Matrix<Scalar_, Rows_, Cols_, Options_, MaxRows_, MaxCols_>> {
Flags = compute_matrix_flags(Options_), Flags = compute_matrix_flags(Options_),
Options = Options_, Options = Options_,
InnerStrideAtCompileTime = 1, InnerStrideAtCompileTime = 1,
OuterStrideAtCompileTime = (Options & RowMajor) ? ColsAtCompileTime : RowsAtCompileTime, OuterStrideAtCompileTime = (int(Options) & int(RowMajor)) ? ColsAtCompileTime : RowsAtCompileTime,
// FIXME, the following flag in only used to define NeedsToAlign in PlainObjectBase // FIXME, the following flag in only used to define NeedsToAlign in PlainObjectBase
EvaluatorFlags = LinearAccessBit | DirectAccessBit | packet_access_bit | row_major_bit, EvaluatorFlags = LinearAccessBit | DirectAccessBit | packet_access_bit | row_major_bit,

3
Eigen/src/Core/TriangularMatrix.h
View File

@ -184,7 +184,8 @@ class TriangularView
enum { enum {
Mode = Mode_, Mode = Mode_,
Flags = internal::traits<TriangularView>::Flags, Flags = internal::traits<TriangularView>::Flags,
TransposeMode = (Mode & Upper ? Lower : 0) | (Mode & Lower ? Upper : 0) | (Mode & (UnitDiag)) | (Mode & (ZeroDiag)), TransposeMode = (int(Mode) & int(Upper) ? Lower : 0) | (int(Mode) & int(Lower) ? Upper : 0) |
(int(Mode) & int(UnitDiag)) | (int(Mode) & int(ZeroDiag)),
IsVectorAtCompileTime = false IsVectorAtCompileTime = false
}; };

2
Eigen/src/Core/util/XprHelper.h
View File

@ -484,7 +484,7 @@ struct nested_eval {
// solution could be to count the number of temps? // solution could be to count the number of temps?
NAsInteger = n == Dynamic ? HugeCost : n, NAsInteger = n == Dynamic ? HugeCost : n,
CostEval = (NAsInteger + 1) * ScalarReadCost + CoeffReadCost, CostEval = (NAsInteger + 1) * ScalarReadCost + CoeffReadCost,
CostNoEval = NAsInteger * CoeffReadCost, CostNoEval = int(NAsInteger) * int(CoeffReadCost),
Evaluate = (int(evaluator<T>::Flags) & EvalBeforeNestingBit) || (int(CostEval) < int(CostNoEval)) Evaluate = (int(evaluator<T>::Flags) & EvalBeforeNestingBit) || (int(CostEval) < int(CostNoEval))
}; };

2
Eigen/src/SparseCore/SparseSelfAdjointView.h
View File

@ -53,7 +53,7 @@ class SparseSelfAdjointView : public EigenBase<SparseSelfAdjointView<MatrixType,
public: public:
enum { enum {
Mode = Mode_, Mode = Mode_,
TransposeMode = ((Mode & Upper) ? Lower : 0) | ((Mode & Lower) ? Upper : 0), TransposeMode = ((int(Mode) & int(Upper)) ? Lower : 0) | ((int(Mode) & int(Lower)) ? Upper : 0),
RowsAtCompileTime = internal::traits<SparseSelfAdjointView>::RowsAtCompileTime, RowsAtCompileTime = internal::traits<SparseSelfAdjointView>::RowsAtCompileTime,
ColsAtCompileTime = internal::traits<SparseSelfAdjointView>::ColsAtCompileTime ColsAtCompileTime = internal::traits<SparseSelfAdjointView>::ColsAtCompileTime
}; };