[geos-commits] r2242 - in branches/3.0/source: algorithm headers/geos/io operation/buffer

[svn_geos at osgeo.org]

Author: pramsey
Date: 2009-01-18 17:29:34 -0500 (Sun, 18 Jan 2009)
New Revision: 2242

Modified:
   branches/3.0/source/algorithm/ConvexHull.cpp
   branches/3.0/source/headers/geos/io/WKBReader.h
   branches/3.0/source/operation/buffer/BufferBuilder.cpp
Log:
Apply small changes for build in VCC, per #221


Modified: branches/3.0/source/algorithm/ConvexHull.cpp
===================================================================
--- branches/3.0/source/algorithm/ConvexHull.cpp	2009-01-18 21:30:30 UTC (rev 2241)
+++ branches/3.0/source/algorithm/ConvexHull.cpp	2009-01-18 22:29:34 UTC (rev 2242)
@@ -164,7 +164,7 @@
 	// Remove consecutive equal Coordinates
 	// unique() returns an iterator to the end of the resulting
 	// sequence, we erase from there to the end.
-	dest.erase( unique(dest.begin(),dest.end()), dest.end() );
+	dest.erase( std::unique(dest.begin(),dest.end()), dest.end() );
 
 	// points must all lie in a line	
 	if ( dest.size() < 3 ) return false;
@@ -269,7 +269,7 @@
 	}
 
 	// sort the points radially around the focal point.
-	sort(pts.begin(), pts.end(), RadiallyLessThen(pts[0]));
+	std::sort(pts.begin(), pts.end(), RadiallyLessThen(pts[0]));
 }
 
 /*private*/

Modified: branches/3.0/source/headers/geos/io/WKBReader.h
===================================================================
--- branches/3.0/source/headers/geos/io/WKBReader.h	2009-01-18 21:30:30 UTC (rev 2241)
+++ branches/3.0/source/headers/geos/io/WKBReader.h	2009-01-18 22:29:34 UTC (rev 2242)
@@ -22,6 +22,7 @@
 
 #include <iosfwd> // ostream, istream
 #include <vector>
+#include <string>
 
 // Forward declarations
 namespace geos {

Modified: branches/3.0/source/operation/buffer/BufferBuilder.cpp
===================================================================
--- branches/3.0/source/operation/buffer/BufferBuilder.cpp	2009-01-18 21:30:30 UTC (rev 2241)
+++ branches/3.0/source/operation/buffer/BufferBuilder.cpp	2009-01-18 22:29:34 UTC (rev 2242)
@@ -360,7 +360,7 @@
 	 * subgraphs for shells will have been built before the subgraphs for
 	 * any holes they contain
 	 */
-	sort(subgraphList.begin(), subgraphList.end(), BufferSubgraphGT);
+	std::sort(subgraphList.begin(), subgraphList.end(), BufferSubgraphGT);
 }
 
 /*private*/