songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Kinetic_data_structures/include/CGAL/Kinetic/internal/infinity_or_max.h
View File

@ -28,7 +28,7 @@ template <class T>
T infinity_or_max() T infinity_or_max()
{ {
if (std::numeric_limits<T>::has_infinity) return std::numeric_limits<T>::infinity(); 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) T infinity_or_max(T)
{ {
if (std::numeric_limits<T>::has_infinity) return std::numeric_limits<T>::infinity(); 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)();
} }

4
Kinetic_data_structures/include/CGAL/Polynomial/internal/Double_with_infinity.h
View File

@ -27,7 +27,7 @@ CGAL_POLYNOMIAL_BEGIN_INTERNAL_NAMESPACE
template <bool S, bool Q> template <bool S, bool Q>
struct Double_with_infinity_default { 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> template<bool O>
struct Double_with_infinity_default<true,O> { struct Double_with_infinity_default<true,O> {
@ -76,7 +76,7 @@ namespace std {
public: public:
static const bool is_specialized = true; static const bool is_specialized = true;
static const bool has_infinity=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)();}
}; };
}; };

2
Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_root_rep.h
View File

@ -887,7 +887,7 @@ public:
double compute_double(double acc = 1e-10) const double compute_double(double acc = 1e-10) const
{ {
if (idx < 0) { 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 ){ if ( idx == -1 ){
return inf; return inf;
} else return -inf; } else return -inf;