diff --git a/Eigen/src/Array/VectorwiseOp.h b/Eigen/src/Array/VectorwiseOp.h index 3684d7cd1..fa0958987 100644 --- a/Eigen/src/Array/VectorwiseOp.h +++ b/Eigen/src/Array/VectorwiseOp.h @@ -355,10 +355,22 @@ template class VectorwiseOp /////////// Artithmetic operators /////////// + /** Copies the vector \a other to each subvector of \c *this */ + template + ExpressionType& operator=(const MatrixBase& other) + { + EIGEN_STATIC_ASSERT_VECTOR_ONLY(OtherDerived) + //ei_assert((m_matrix.isNull()) == (other.isNull())); FIXME + for(int j=0; j(m_matrix); + } + /** Adds the vector \a other to each subvector of \c *this */ template ExpressionType& operator+=(const MatrixBase& other) { + EIGEN_STATIC_ASSERT_VECTOR_ONLY(OtherDerived) for(int j=0; j(m_matrix); @@ -368,6 +380,7 @@ template class VectorwiseOp template ExpressionType& operator-=(const MatrixBase& other) { + EIGEN_STATIC_ASSERT_VECTOR_ONLY(OtherDerived) for(int j=0; j(m_matrix); diff --git a/Eigen/src/Core/Fuzzy.h b/Eigen/src/Core/Fuzzy.h index a882981e4..e10446398 100644 --- a/Eigen/src/Core/Fuzzy.h +++ b/Eigen/src/Core/Fuzzy.h @@ -49,7 +49,7 @@ template template bool MatrixBase::isApprox( const MatrixBase& other, - typename NumTraits::Real prec + RealScalar prec ) const { const typename ei_nested::type nested(derived()); @@ -73,7 +73,7 @@ bool MatrixBase::isApprox( template bool MatrixBase::isMuchSmallerThan( const typename NumTraits::Real& other, - typename NumTraits::Real prec + RealScalar prec ) const { return cwise().abs2().sum() <= prec * prec * other * other; @@ -93,7 +93,7 @@ template template bool MatrixBase::isMuchSmallerThan( const MatrixBase& other, - typename NumTraits::Real prec + RealScalar prec ) const { return this->cwise().abs2().sum() <= prec * prec * other.cwise().abs2().sum(); @@ -124,7 +124,7 @@ template template bool MatrixBase::isApprox( const MatrixBase& other, - typename NumTraits::Real prec + RealScalar prec ) const { return ei_fuzzy_selector::isApprox(derived(), other.derived(), prec); @@ -143,7 +143,7 @@ bool MatrixBase::isApprox( template bool MatrixBase::isMuchSmallerThan( const typename NumTraits::Real& other, - typename NumTraits::Real prec + RealScalar prec ) const { return ei_fuzzy_selector::isMuchSmallerThan(derived(), other, prec); @@ -163,7 +163,7 @@ template template bool MatrixBase::isMuchSmallerThan( const MatrixBase& other, - typename NumTraits::Real prec + RealScalar prec ) const { return ei_fuzzy_selector::isMuchSmallerThan(derived(), other.derived(), prec);