minmax fixes

This commit is contained in:
Andreas Fabri 2006-08-18 21:03:47 +00:00
parent 7e401a82f5
commit f1ae462f61
3 changed files with 5 additions and 5 deletions

View File

@ -28,7 +28,7 @@ template <class T>
T infinity_or_max()
{
if (std::numeric_limits<T>::has_infinity) return std::numeric_limits<T>::infinity();
else return std::numeric_limits<T>::max();
else return (std::numeric_limits<T>::max)();
}
@ -36,7 +36,7 @@ template <class T>
T infinity_or_max(T)
{
if (std::numeric_limits<T>::has_infinity) return std::numeric_limits<T>::infinity();
else return std::numeric_limits<T>::max();
else return (std::numeric_limits<T>::max)();
}

View File

@ -27,7 +27,7 @@ CGAL_POLYNOMIAL_BEGIN_INTERNAL_NAMESPACE
template <bool S, bool Q>
struct Double_with_infinity_default {
static double value(){return std::numeric_limits<double>::max();};
static double value(){return (std::numeric_limits<double>::max)();};
};
template<bool O>
struct Double_with_infinity_default<true,O> {
@ -76,7 +76,7 @@ namespace std {
public:
static const bool is_specialized = true;
static const bool has_infinity=true;
static double infinity() throw() {return std::numeric_limits<double>::max();}
static double infinity() throw() {return (std::numeric_limits<double>::max)();}
};
};

View File

@ -887,7 +887,7 @@ public:
double compute_double(double acc = 1e-10) const
{
if (idx < 0) {
double inf=std::numeric_limits<double>::has_infinity? std::numeric_limits<double>::infinity() : std::numeric_limits<double>::max();
double inf=std::numeric_limits<double>::has_infinity? std::numeric_limits<double>::infinity() : (std::numeric_limits<double>::max)();
if ( idx == -1 ){
return inf;
} else return -inf;