From beedd150175e4beabe339ad5c4bf5ec9cab83657 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 17 Aug 2006 09:22:57 +0000 Subject: [PATCH] fixed min/max problem --- .../Min_sphere_of_spheres_d_gcc2-95-2_fix.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Min_sphere_of_spheres_d/include/CGAL/Min_sphere_of_spheres_d/Min_sphere_of_spheres_d_gcc2-95-2_fix.h b/Min_sphere_of_spheres_d/include/CGAL/Min_sphere_of_spheres_d/Min_sphere_of_spheres_d_gcc2-95-2_fix.h index da97e647fcd..b41d528378c 100644 --- a/Min_sphere_of_spheres_d/include/CGAL/Min_sphere_of_spheres_d/Min_sphere_of_spheres_d_gcc2-95-2_fix.h +++ b/Min_sphere_of_spheres_d/include/CGAL/Min_sphere_of_spheres_d/Min_sphere_of_spheres_d_gcc2-95-2_fix.h @@ -204,8 +204,8 @@ template _Base_bitset<_Nw, _WordT>::_Base_bitset(unsigned long __val) { _M_do_reset(); - const size_t __n = min(sizeof(unsigned long)*CHAR_BIT, - __BITS_PER_WORDT(_WordT)*_Nw); + const size_t __n = (std::min)(sizeof(unsigned long)*CHAR_BIT, + __BITS_PER_WORDT(_WordT)*_Nw); for(size_t __i = 0; __i < __n; ++__i, __val >>= 1) if ( __val & 0x1 ) _M_getword(__i) |= _S_maskbit(__i);