Replace double constants by Scalar constants

This commit is contained in:
Nicolas Mellado 2015-07-11 20:02:30 +02:00
parent 1dd6a329e8
commit 20b96025fd

View File

@ -388,7 +388,7 @@ inline NewType cast(const OldType& x)
EIGEN_STATIC_ASSERT((!NumTraits<Scalar>::IsComplex), NUMERIC_TYPE_MUST_BE_REAL) EIGEN_STATIC_ASSERT((!NumTraits<Scalar>::IsComplex), NUMERIC_TYPE_MUST_BE_REAL)
EIGEN_USING_STD_MATH(floor); EIGEN_USING_STD_MATH(floor);
EIGEN_USING_STD_MATH(ceil); EIGEN_USING_STD_MATH(ceil);
return (x > 0.0) ? floor(x + 0.5) : ceil(x - 0.5); return (x > Scalar(0)) ? floor(x + Scalar(0.5)) : ceil(x - Scalar(0.5));
} }
}; };
#endif #endif
@ -420,7 +420,7 @@ struct round_retval
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
static inline RealScalar run(const Scalar& x) static inline RealScalar run(const Scalar& x)
{ {
return (x < 0.0) ? EIGEN_PI : 0.0; } return (x < Scalar(0)) ? Scalar(EIGEN_PI) : Scalar(0); }
}; };
template<typename Scalar> template<typename Scalar>