From 8861dce7eeac5bf16f28a0d0e3c73cc57abbcf65 Mon Sep 17 00:00:00 2001 From: Hauke Heibel Date: Wed, 3 Feb 2010 09:07:17 +0100 Subject: [PATCH] Fixed 32bit builds. --- Eigen/src/Core/CwiseNullaryOp.h | 10 +++++----- Eigen/src/Core/DenseBase.h | 6 +++--- Eigen/src/plugins/MatrixCwiseUnaryOps.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Eigen/src/Core/CwiseNullaryOp.h b/Eigen/src/Core/CwiseNullaryOp.h index f4dd0b695..5800335d7 100644 --- a/Eigen/src/Core/CwiseNullaryOp.h +++ b/Eigen/src/Core/CwiseNullaryOp.h @@ -238,11 +238,11 @@ DenseBase::Constant(const Scalar& value) * Example: \include DenseBase_LinSpaced_seq.cpp * Output: \verbinclude DenseBase_LinSpaced_seq.out * - * \sa setLinSpaced(Scalar,Scalar,int), LinSpaced(Scalar,Scalar,int), CwiseNullaryOp + * \sa setLinSpaced(const Scalar&,const Scalar&,int), LinSpaced(Scalar,Scalar,int), CwiseNullaryOp */ template EIGEN_STRONG_INLINE const typename DenseBase::SequentialLinSpacedReturnType -DenseBase::LinSpaced(Sequential_t, Scalar low, Scalar high, int size) +DenseBase::LinSpaced(Sequential_t, const Scalar& low, const Scalar& high, int size) { EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived) return NullaryExpr(size, ei_linspaced_op(low,high,size)); @@ -258,11 +258,11 @@ DenseBase::LinSpaced(Sequential_t, Scalar low, Scalar high, int size) * Example: \include DenseBase_LinSpaced.cpp * Output: \verbinclude DenseBase_LinSpaced.out * - * \sa setLinSpaced(Scalar,Scalar,int), LinSpaced(Sequential_t,Scalar,Scalar,int), CwiseNullaryOp + * \sa setLinSpaced(const Scalar&,const Scalar&,int), LinSpaced(Sequential_t,const Scalar&,const Scalar&,int), CwiseNullaryOp */ template EIGEN_STRONG_INLINE const typename DenseBase::RandomAccessLinSpacedReturnType -DenseBase::LinSpaced(Scalar low, Scalar high, int size) +DenseBase::LinSpaced(const Scalar& low, const Scalar& high, int size) { EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived) return NullaryExpr(size, ei_linspaced_op(low,high,size)); @@ -358,7 +358,7 @@ DenseStorageBase::setConstant(int rows, int cols, const * \sa CwiseNullaryOp */ template -EIGEN_STRONG_INLINE Derived& DenseBase::setLinSpaced(Scalar low, Scalar high, int size) +EIGEN_STRONG_INLINE Derived& DenseBase::setLinSpaced(const Scalar& low, const Scalar& high, int size) { EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived) return derived() = Derived::NullaryExpr(size, ei_linspaced_op(low,high,size)); diff --git a/Eigen/src/Core/DenseBase.h b/Eigen/src/Core/DenseBase.h index e0a3a04af..a2165b52f 100644 --- a/Eigen/src/Core/DenseBase.h +++ b/Eigen/src/Core/DenseBase.h @@ -348,9 +348,9 @@ template class DenseBase Constant(const Scalar& value); static const SequentialLinSpacedReturnType - LinSpaced(Sequential_t, Scalar low, Scalar high, int size); + LinSpaced(Sequential_t, const Scalar& low, const Scalar& high, int size); static const RandomAccessLinSpacedReturnType - LinSpaced(Scalar low, Scalar high, int size); + LinSpaced(const Scalar& low, const Scalar& high, int size); template static const CwiseNullaryOp @@ -371,7 +371,7 @@ template class DenseBase void fill(const Scalar& value); Derived& setConstant(const Scalar& value); - Derived& setLinSpaced(Scalar low, Scalar high, int size); + Derived& setLinSpaced(const Scalar& low, const Scalar& high, int size); Derived& setZero(); Derived& setOnes(); Derived& setRandom(); diff --git a/Eigen/src/plugins/MatrixCwiseUnaryOps.h b/Eigen/src/plugins/MatrixCwiseUnaryOps.h index d75e229fb..8927711ed 100644 --- a/Eigen/src/plugins/MatrixCwiseUnaryOps.h +++ b/Eigen/src/plugins/MatrixCwiseUnaryOps.h @@ -75,7 +75,7 @@ cwiseInverse() const { return derived(); } * \sa cwiseEqual(const MatrixBase &) const */ inline const CwiseUnaryOp >,Derived> -cwiseEqual(Scalar s) const +cwiseEqual(const Scalar& s) const { return CwiseUnaryOp >,Derived> (derived(), std::bind1st(std::equal_to(), s));