From a164646c77252a8389fd69e7cad105ddc27a4816 Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Mon, 15 Dec 2008 12:30:04 +0000
Subject: [PATCH] more warning fixes by Armin Berres

---
 Eigen/src/Core/Assign.h      | 2 +-
 Eigen/src/Core/util/Memory.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Eigen/src/Core/Assign.h b/Eigen/src/Core/Assign.h
index fffa78919..11f35c5e7 100644
--- a/Eigen/src/Core/Assign.h
+++ b/Eigen/src/Core/Assign.h
@@ -407,7 +407,7 @@ inline Derived& MatrixBase<Derived>
 }
 
 template<typename Derived, typename OtherDerived,
-         bool EvalBeforeAssigning = int(OtherDerived::Flags) & EvalBeforeAssigningBit,
+         bool EvalBeforeAssigning = (int(OtherDerived::Flags) & EvalBeforeAssigningBit) != 0,
          bool NeedToTranspose = Derived::IsVectorAtCompileTime
                 && OtherDerived::IsVectorAtCompileTime
                 && int(Derived::RowsAtCompileTime) == int(OtherDerived::ColsAtCompileTime)
diff --git a/Eigen/src/Core/util/Memory.h b/Eigen/src/Core/util/Memory.h
index a75e3f001..a29ddb624 100644
--- a/Eigen/src/Core/util/Memory.h
+++ b/Eigen/src/Core/util/Memory.h
@@ -90,6 +90,7 @@ inline static int ei_alignmentOffset(const Scalar* ptr, int maxOffset)
   const bool Vectorized = PacketSize>1;
   return Vectorized
           ? std::min<int>( (PacketSize - ((size_t(ptr)/sizeof(Scalar)) & PacketAlignedMask))
+          ? std::min<int>( (PacketSize - (int((size_t(ptr)/sizeof(Scalar))) & PacketAlignedMask))
                            & PacketAlignedMask, maxOffset)
           : 0;
 }