Fixed 32bit builds.

This commit is contained in:
Hauke Heibel 2010-02-03 09:07:17 +01:00
parent 7b2dd988fa
commit 8861dce7ee
3 changed files with 9 additions and 9 deletions

View File

@ -238,11 +238,11 @@ DenseBase<Derived>::Constant(const Scalar& value)
* Example: \include DenseBase_LinSpaced_seq.cpp * Example: \include DenseBase_LinSpaced_seq.cpp
* Output: \verbinclude DenseBase_LinSpaced_seq.out * 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<typename Derived> template<typename Derived>
EIGEN_STRONG_INLINE const typename DenseBase<Derived>::SequentialLinSpacedReturnType EIGEN_STRONG_INLINE const typename DenseBase<Derived>::SequentialLinSpacedReturnType
DenseBase<Derived>::LinSpaced(Sequential_t, Scalar low, Scalar high, int size) DenseBase<Derived>::LinSpaced(Sequential_t, const Scalar& low, const Scalar& high, int size)
{ {
EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived) EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived)
return NullaryExpr(size, ei_linspaced_op<Scalar,false>(low,high,size)); return NullaryExpr(size, ei_linspaced_op<Scalar,false>(low,high,size));
@ -258,11 +258,11 @@ DenseBase<Derived>::LinSpaced(Sequential_t, Scalar low, Scalar high, int size)
* Example: \include DenseBase_LinSpaced.cpp * Example: \include DenseBase_LinSpaced.cpp
* Output: \verbinclude DenseBase_LinSpaced.out * 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<typename Derived> template<typename Derived>
EIGEN_STRONG_INLINE const typename DenseBase<Derived>::RandomAccessLinSpacedReturnType EIGEN_STRONG_INLINE const typename DenseBase<Derived>::RandomAccessLinSpacedReturnType
DenseBase<Derived>::LinSpaced(Scalar low, Scalar high, int size) DenseBase<Derived>::LinSpaced(const Scalar& low, const Scalar& high, int size)
{ {
EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived) EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived)
return NullaryExpr(size, ei_linspaced_op<Scalar,true>(low,high,size)); return NullaryExpr(size, ei_linspaced_op<Scalar,true>(low,high,size));
@ -358,7 +358,7 @@ DenseStorageBase<Derived,_Base,_Options>::setConstant(int rows, int cols, const
* \sa CwiseNullaryOp * \sa CwiseNullaryOp
*/ */
template<typename Derived> template<typename Derived>
EIGEN_STRONG_INLINE Derived& DenseBase<Derived>::setLinSpaced(Scalar low, Scalar high, int size) EIGEN_STRONG_INLINE Derived& DenseBase<Derived>::setLinSpaced(const Scalar& low, const Scalar& high, int size)
{ {
EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived) EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived)
return derived() = Derived::NullaryExpr(size, ei_linspaced_op<Scalar,false>(low,high,size)); return derived() = Derived::NullaryExpr(size, ei_linspaced_op<Scalar,false>(low,high,size));

View File

@ -348,9 +348,9 @@ template<typename Derived> class DenseBase
Constant(const Scalar& value); Constant(const Scalar& value);
static const SequentialLinSpacedReturnType 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 static const RandomAccessLinSpacedReturnType
LinSpaced(Scalar low, Scalar high, int size); LinSpaced(const Scalar& low, const Scalar& high, int size);
template<typename CustomNullaryOp> template<typename CustomNullaryOp>
static const CwiseNullaryOp<CustomNullaryOp, Derived> static const CwiseNullaryOp<CustomNullaryOp, Derived>
@ -371,7 +371,7 @@ template<typename Derived> class DenseBase
void fill(const Scalar& value); void fill(const Scalar& value);
Derived& setConstant(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& setZero();
Derived& setOnes(); Derived& setOnes();
Derived& setRandom(); Derived& setRandom();

View File

@ -75,7 +75,7 @@ cwiseInverse() const { return derived(); }
* \sa cwiseEqual(const MatrixBase<OtherDerived> &) const * \sa cwiseEqual(const MatrixBase<OtherDerived> &) const
*/ */
inline const CwiseUnaryOp<std::binder1st<std::equal_to<Scalar> >,Derived> inline const CwiseUnaryOp<std::binder1st<std::equal_to<Scalar> >,Derived>
cwiseEqual(Scalar s) const cwiseEqual(const Scalar& s) const
{ {
return CwiseUnaryOp<std::binder1st<std::equal_to<Scalar> >,Derived> return CwiseUnaryOp<std::binder1st<std::equal_to<Scalar> >,Derived>
(derived(), std::bind1st(std::equal_to<Scalar>(), s)); (derived(), std::bind1st(std::equal_to<Scalar>(), s));