more warning fixes by Armin Berres

This commit is contained in:
Gael Guennebaud 2008-12-15 12:30:04 +00:00
parent 936eaf600a
commit a164646c77
2 changed files with 2 additions and 1 deletions

View File

@ -407,7 +407,7 @@ inline Derived& MatrixBase<Derived>
} }
template<typename Derived, typename OtherDerived, template<typename Derived, typename OtherDerived,
bool EvalBeforeAssigning = int(OtherDerived::Flags) & EvalBeforeAssigningBit, bool EvalBeforeAssigning = (int(OtherDerived::Flags) & EvalBeforeAssigningBit) != 0,
bool NeedToTranspose = Derived::IsVectorAtCompileTime bool NeedToTranspose = Derived::IsVectorAtCompileTime
&& OtherDerived::IsVectorAtCompileTime && OtherDerived::IsVectorAtCompileTime
&& int(Derived::RowsAtCompileTime) == int(OtherDerived::ColsAtCompileTime) && int(Derived::RowsAtCompileTime) == int(OtherDerived::ColsAtCompileTime)

View File

@ -90,6 +90,7 @@ inline static int ei_alignmentOffset(const Scalar* ptr, int maxOffset)
const bool Vectorized = PacketSize>1; const bool Vectorized = PacketSize>1;
return Vectorized return Vectorized
? std::min<int>( (PacketSize - ((size_t(ptr)/sizeof(Scalar)) & PacketAlignedMask)) ? std::min<int>( (PacketSize - ((size_t(ptr)/sizeof(Scalar)) & PacketAlignedMask))
? std::min<int>( (PacketSize - (int((size_t(ptr)/sizeof(Scalar))) & PacketAlignedMask))
& PacketAlignedMask, maxOffset) & PacketAlignedMask, maxOffset)
: 0; : 0;
} }