diff options
| author |  Hauke Heibel <hauke.heibel@gmail.com> | 2010-06-12 13:24:02 +0200 |
|---|---|---|
| committer | Hauke Heibel <hauke.heibel@gmail.com> | 2010-06-12 13:24:02 +0200 |
| commit | 340ac9ea9da3f16377a493bfff88c25a98dcd07c (patch) | |
| tree | a52b7f6f3fef6bad629b8d079b97352f64515feb /Eigen/src | |
| parent | 03331552a9daf670d510f26089c9584ab0a5e655 (diff) | |
Fixed warnings regarding enums.
Diffstat (limited to 'Eigen/src')
| -rw-r--r-- | Eigen/src/Core/DenseStorageBase.h | 2 | ||||
| -rw-r--r-- | Eigen/src/Core/Map.h | 2 | ||||
| -rw-r--r-- | Eigen/src/Core/Matrix.h | 2 | ||||
| -rw-r--r-- | Eigen/src/LU/Inverse.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Eigen/src/Core/DenseStorageBase.h b/Eigen/src/Core/DenseStorageBase.h index 2bdb12b78..50efa8c89 100644 --- a/Eigen/src/Core/DenseStorageBase.h +++ b/Eigen/src/Core/DenseStorageBase.h @@ -70,7 +70,7 @@ class DenseStorageBase : public ei_dense_xpr_base<Derived>::type public: enum { NeedsToAlign = (!(Options&DontAlign)) - && SizeAtCompileTime!=Dynamic && ((sizeof(Scalar)*SizeAtCompileTime)%16)==0 }; + && SizeAtCompileTime!=Dynamic && ((static_cast<int>(sizeof(Scalar))*SizeAtCompileTime)%16)==0 }; EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF(NeedsToAlign) Base& base() { return *static_cast<Base*>(this); } diff --git a/Eigen/src/Core/Map.h b/Eigen/src/Core/Map.h index a1ab29ead..cb65b8e00 100644 --- a/Eigen/src/Core/Map.h +++ b/Eigen/src/Core/Map.h @@ -94,7 +94,7 @@ struct ei_traits<Map<PlainObjectType, MapOptions, StrideType> > && ( bool(IsDynamicSize) || HasNoOuterStride || ( OuterStrideAtCompileTime!=Dynamic - && ((int(OuterStrideAtCompileTime)*sizeof(Scalar))%16)==0 ) ), + && ((static_cast<int>(sizeof(Scalar))*OuterStrideAtCompileTime)%16)==0 ) ), Flags0 = ei_traits<PlainObjectType>::Flags, Flags1 = IsAligned ? int(Flags0) | AlignedBit : int(Flags0) & ~AlignedBit, Flags2 = HasNoStride ? int(Flags1) : int(Flags1 & ~LinearAccessBit), diff --git a/Eigen/src/Core/Matrix.h b/Eigen/src/Core/Matrix.h index 54fca7046..b9453a216 100644 --- a/Eigen/src/Core/Matrix.h +++ b/Eigen/src/Core/Matrix.h @@ -146,7 +146,7 @@ class Matrix typedef typename Base::PlainObject PlainObject; enum { NeedsToAlign = (!(Options&DontAlign)) - && SizeAtCompileTime!=Dynamic && ((sizeof(Scalar)*SizeAtCompileTime)%16)==0 }; + && SizeAtCompileTime!=Dynamic && ((static_cast<int>(sizeof(Scalar))*SizeAtCompileTime)%16)==0 }; EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF(NeedsToAlign) using Base::base; diff --git a/Eigen/src/LU/Inverse.h b/Eigen/src/LU/Inverse.h index 5ccc59a32..41218f052 100644 --- a/Eigen/src/LU/Inverse.h +++ b/Eigen/src/LU/Inverse.h @@ -295,7 +295,7 @@ struct ei_inverse_impl : public ReturnByValue<ei_inverse_impl<MatrixType> > template<typename Dest> inline void evalTo(Dest& dst) const { - const int Size = EIGEN_ENUM_MIN(MatrixType::ColsAtCompileTime,Dest::ColsAtCompileTime); + const int Size = EIGEN_PLAIN_ENUM_MIN(MatrixType::ColsAtCompileTime,Dest::ColsAtCompileTime); ei_assert(( (Size<=1) || (Size>4) || (ei_extract_data(m_matrix)!=ei_extract_data(dst))) && "Aliasing problem detected in inverse(), you need to do inverse().eval() here."); |