[geos-commits] r3108 - trunk/src/operation/buffer

[svn_geos at osgeo.org]

Author: mloskot
Date: 2010-10-10 14:15:11 -0700 (Sun, 10 Oct 2010)
New Revision: 3108

Modified:
   trunk/src/operation/buffer/BufferBuilder.cpp
Log:
Disable argument dependant lookup (Koenig) for min/max functions to make sure GEOS compiles in the presence of the min and max macros.

Modified: trunk/src/operation/buffer/BufferBuilder.cpp
===================================================================
--- trunk/src/operation/buffer/BufferBuilder.cpp	2010-10-10 21:07:57 UTC (rev 3107)
+++ trunk/src/operation/buffer/BufferBuilder.cpp	2010-10-10 21:15:11 UTC (rev 3108)
@@ -245,7 +245,7 @@
          // Let the length of the line play a factor in the distance, which is still 
          // going to be bounded by 98%. Take 10% of the length of the line  from the buffer distance
          // to try and minimize any artifacts.
-         const double ptDistAllowance = std::max(distance - l->getLength()*0.1, distance * 0.98);
+         const double ptDistAllowance = (std::max)(distance - l->getLength()*0.1, distance * 0.98);
          // Use 102% of the buffer width as the line-length requirement - this
          // is to ensure that line segments that is length "distance" +/-
          // epsilon is removed.