From 7aba51ce530e95e062c098ab4fdbfa2de2c5d8da Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Wed, 20 Aug 2008 00:58:25 +0000
Subject: * Added .all() and .any() members to PartialRedux * Bug fixes in
 euler angle snippet, Assign and MapBase * Started a "quick start guide"
 (draft state)

---
 Eigen/src/Core/Assign.h           |  2 +-
 Eigen/src/Core/CommaInitializer.h | 10 +++++-----
 Eigen/src/Core/MapBase.h          |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'Eigen/src/Core')

diff --git a/Eigen/src/Core/Assign.h b/Eigen/src/Core/Assign.h
index 0145fc7b3..758858165 100644
--- a/Eigen/src/Core/Assign.h
+++ b/Eigen/src/Core/Assign.h
@@ -385,7 +385,7 @@ struct ei_assign_impl<Derived1, Derived2, SliceVectorization, NoUnrolling>
           dst.copyCoeff(index, i, src);
       }
 
-      alignedStart = (alignedStart+alignedStep)%packetSize;
+      alignedStart = std::min<int>((alignedStart+alignedStep)%packetSize, innerSize);
     }
   }
 };
diff --git a/Eigen/src/Core/CommaInitializer.h b/Eigen/src/Core/CommaInitializer.h
index 137413a7c..c394c3d78 100644
--- a/Eigen/src/Core/CommaInitializer.h
+++ b/Eigen/src/Core/CommaInitializer.h
@@ -53,10 +53,10 @@ struct MatrixBase<Derived>::CommaInitializer
       m_col = 0;
       m_currentBlockRows = 1;
       ei_assert(m_row<m_matrix.rows()
-        && "Too many rows passed to MatrixBase::operator<<");
+        && "Too many rows passed to comma initializer (operator<<)");
     }
     ei_assert(m_col<m_matrix.cols()
-      && "Too many coefficients passed to MatrixBase::operator<<");
+      && "Too many coefficients passed to comma initializer (operator<<)");
     ei_assert(m_currentBlockRows==1);
     m_matrix.coeffRef(m_row, m_col++) = s;
     return *this;
@@ -71,10 +71,10 @@ struct MatrixBase<Derived>::CommaInitializer
       m_col = 0;
       m_currentBlockRows = other.rows();
       ei_assert(m_row+m_currentBlockRows<=m_matrix.rows()
-        && "Too many rows passed to MatrixBase::operator<<");
+        && "Too many rows passed to comma initializer (operator<<)");
     }
     ei_assert(m_col<m_matrix.cols()
-      && "Too many coefficients passed to MatrixBase::operator<<");
+      && "Too many coefficients passed to comma initializer (operator<<)");
     ei_assert(m_currentBlockRows==other.rows());
     if (OtherDerived::SizeAtCompileTime != Dynamic)
       m_matrix.block<OtherDerived::RowsAtCompileTime != Dynamic ? OtherDerived::RowsAtCompileTime : 1,
@@ -90,7 +90,7 @@ struct MatrixBase<Derived>::CommaInitializer
   {
     ei_assert((m_row+m_currentBlockRows) == m_matrix.rows()
          && m_col == m_matrix.cols()
-         && "Too few coefficients passed to Matrix::operator<<");
+         && "Too few coefficients passed to comma initializer (operator<<)");
   }
 
   /** \returns the built matrix once all its coefficients have been set.
diff --git a/Eigen/src/Core/MapBase.h b/Eigen/src/Core/MapBase.h
index 74b7d76aa..4f61d1529 100644
--- a/Eigen/src/Core/MapBase.h
+++ b/Eigen/src/Core/MapBase.h
@@ -47,7 +47,7 @@ template<typename Derived> class MapBase
 
     typedef MatrixBase<Derived> Base;
     enum {
-      IsRowMajor = int(ei_traits<Derived>::Flags) & RowMajorBit ? 1 : 0,
+      IsRowMajor = (int(ei_traits<Derived>::Flags) & RowMajorBit) ? 1 : 0,
       PacketAccess = ei_traits<Derived>::PacketAccess,
       RowsAtCompileTime = ei_traits<Derived>::RowsAtCompileTime,
       ColsAtCompileTime = ei_traits<Derived>::ColsAtCompileTime,
-- 
cgit v1.2.3