Fix for Windows 'min/max' bug

This commit is contained in:
Andreas Fabri 2012-01-23 08:37:40 +00:00
parent dc91170ac8
commit 6f1f044fd6
1 changed files with 2 additions and 2 deletions

View File

@ -55,7 +55,7 @@ struct Get_max_coefficient<CGAL::Sqrt_extension<NT, Root, ACDE_TAG, FP_TAG> >{
result_type operator () (const CGAL::Sqrt_extension<NT, Root, ACDE_TAG, FP_TAG>& a) { result_type operator () (const CGAL::Sqrt_extension<NT, Root, ACDE_TAG, FP_TAG>& a) {
GMC gmc; GMC gmc;
return std::max(std::max(gmc(a.a0()), gmc(a.a1())), gmc(NT(a.root()))); return (std::max)((std::max)(gmc(a.a0()), gmc(a.a1())), gmc(NT(a.root())));
} }
}; };
@ -68,7 +68,7 @@ struct Get_max_coefficient<CGAL::Polynomial<NT> >{
GMC gmc; GMC gmc;
result_type m=0; result_type m=0;
for(int i=0; i<=a.degree(); i++){ for(int i=0; i<=a.degree(); i++){
m = std::max(gmc(a[i]),m); m = (std::max)(gmc(a[i]),m);
} }
return m; return m;
} }