mirror of
https://gitlab.com/libeigen/eigen.git
synced 2025-04-20 16:49:38 +08:00
fix warnings with recent gcc
This commit is contained in:
parent
dec09a618d
commit
ddb6e96d48
@ -71,12 +71,12 @@ struct ei_traits<Block<MatrixType, BlockRows, BlockCols, _PacketAccess, _DirectA
|
|||||||
RowsAtCompileTime = BlockRows,
|
RowsAtCompileTime = BlockRows,
|
||||||
ColsAtCompileTime = BlockCols,
|
ColsAtCompileTime = BlockCols,
|
||||||
MaxRowsAtCompileTime = RowsAtCompileTime == 1 ? 1
|
MaxRowsAtCompileTime = RowsAtCompileTime == 1 ? 1
|
||||||
: (BlockRows==Dynamic ? ei_traits<MatrixType>::MaxRowsAtCompileTime : BlockRows),
|
: (BlockRows==Dynamic ? int(ei_traits<MatrixType>::MaxRowsAtCompileTime) : BlockRows),
|
||||||
MaxColsAtCompileTime = ColsAtCompileTime == 1 ? 1
|
MaxColsAtCompileTime = ColsAtCompileTime == 1 ? 1
|
||||||
: (BlockCols==Dynamic ? ei_traits<MatrixType>::MaxColsAtCompileTime : BlockCols),
|
: (BlockCols==Dynamic ? int(ei_traits<MatrixType>::MaxColsAtCompileTime) : BlockCols),
|
||||||
RowMajor = int(ei_traits<MatrixType>::Flags)&RowMajorBit,
|
RowMajor = int(ei_traits<MatrixType>::Flags)&RowMajorBit,
|
||||||
InnerSize = RowMajor ? ColsAtCompileTime : RowsAtCompileTime,
|
InnerSize = RowMajor ? int(ColsAtCompileTime) : int(RowsAtCompileTime),
|
||||||
InnerMaxSize = RowMajor ? MaxColsAtCompileTime : MaxRowsAtCompileTime,
|
InnerMaxSize = RowMajor ? int(MaxColsAtCompileTime) : int(MaxRowsAtCompileTime),
|
||||||
MaskPacketAccessBit = (InnerMaxSize == Dynamic || (InnerSize >= ei_packet_traits<Scalar>::size))
|
MaskPacketAccessBit = (InnerMaxSize == Dynamic || (InnerSize >= ei_packet_traits<Scalar>::size))
|
||||||
? PacketAccessBit : 0,
|
? PacketAccessBit : 0,
|
||||||
FlagsLinearAccessBit = (RowsAtCompileTime == 1 || ColsAtCompileTime == 1) ? LinearAccessBit : 0,
|
FlagsLinearAccessBit = (RowsAtCompileTime == 1 || ColsAtCompileTime == 1) ? LinearAccessBit : 0,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user