diff options
| author |  Sebastian Lipponer <lipponer@gsc.tu-darmstadt.de> | 2011-12-09 10:39:10 +0000 |
|---|---|---|
| committer | Sebastian Lipponer <lipponer@gsc.tu-darmstadt.de> | 2011-12-09 10:39:10 +0000 |
| commit | fff25a4b4629ef440945d9157a0ed7a93403e1f9 (patch) | |
| tree | d6348b940ef6062a01d312b94ebcb276320fa9f5 | |
| parent | 57c6bfba08ba59595992299b6acd64002d0e305a (diff) | |
Fix MSVC integer overflow warning
| -rw-r--r-- | Eigen/src/Core/Block.h | 2 | ||||
| -rw-r--r-- | Eigen/src/Core/util/XprHelper.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Core/Block.h b/Eigen/src/Core/Block.h index 0c833c2bc..427e6d5c9 100644 --- a/Eigen/src/Core/Block.h +++ b/Eigen/src/Core/Block.h @@ -94,7 +94,7 @@ struct traits<Block<XprType, BlockRows, BlockCols, InnerPanel, HasDirectAccess> MaskPacketAccessBit = (InnerSize == Dynamic || (InnerSize % packet_traits<Scalar>::size) == 0) && (InnerStrideAtCompileTime == 1) ? PacketAccessBit : 0, - MaskAlignedBit = (InnerPanel && (OuterStrideAtCompileTime!=Dynamic) && (((OuterStrideAtCompileTime * sizeof(Scalar)) % 16) == 0)) ? AlignedBit : 0, + MaskAlignedBit = (InnerPanel && (OuterStrideAtCompileTime!=Dynamic) && (((OuterStrideAtCompileTime * int(sizeof(Scalar))) % 16) == 0)) ? AlignedBit : 0, FlagsLinearAccessBit = (RowsAtCompileTime == 1 || ColsAtCompileTime == 1) ? LinearAccessBit : 0, FlagsLvalueBit = is_lvalue<XprType>::value ? LvalueBit : 0, FlagsRowMajorBit = IsRowMajor ? RowMajorBit : 0, diff --git a/Eigen/src/Core/util/XprHelper.h b/Eigen/src/Core/util/XprHelper.h index fcd3b093f..c2078f137 100644 --- a/Eigen/src/Core/util/XprHelper.h +++ b/Eigen/src/Core/util/XprHelper.h @@ -127,7 +127,7 @@ class compute_matrix_flags ((Options&DontAlign)==0) && ( #if EIGEN_ALIGN_STATICALLY - ((!is_dynamic_size_storage) && (((MaxCols*MaxRows*sizeof(Scalar)) % 16) == 0)) + ((!is_dynamic_size_storage) && (((MaxCols*MaxRows*int(sizeof(Scalar))) % 16) == 0)) #else 0 #endif |