[geos-commits] r2189 - in trunk/source: operation/predicate util

[svn_geos at osgeo.org]

Author: mloskot
Date: 2008-09-16 17:09:14 -0400 (Tue, 16 Sep 2008)
New Revision: 2189

Modified:
   trunk/source/operation/predicate/SegmentIntersectionTester.cpp
   trunk/source/util/math.cpp
Log:
Patch fixing build problems on Solaris (Ticket #205).

Modified: trunk/source/operation/predicate/SegmentIntersectionTester.cpp
===================================================================
--- trunk/source/operation/predicate/SegmentIntersectionTester.cpp	2008-09-16 21:01:36 UTC (rev 2188)
+++ trunk/source/operation/predicate/SegmentIntersectionTester.cpp	2008-09-16 21:09:14 UTC (rev 2189)
@@ -48,17 +48,17 @@
 	const CoordinateSequence &seq0, const CoordinateSequence &seq1)
 {
 
-	for (unsigned i=1, ni=seq0.getSize(); i<ni; ++i)
+    for (std::size_t i = 1, ni = seq0.getSize(); i < ni; ++i)
 	{
-		const Coordinate &pt00 = seq0.getAt(i - 1);
-		const Coordinate &pt01 = seq0.getAt(i);
-		for (unsigned j=1, nj=seq1.getSize(); j<nj; ++j)
+		const Coordinate& pt00 = seq0.getAt(i - 1);
+		const Coordinate& pt01 = seq0.getAt(i);
+		
+        for (std::size_t j = 1, nj = seq1.getSize(); j < nj; ++j)
 		{
-			const Coordinate &pt10 = seq1.getAt(j-1);
-			const Coordinate &pt11 = seq1.getAt(j); 
+			const Coordinate& pt10 = seq1.getAt(j-1);
+			const Coordinate& pt11 = seq1.getAt(j); 
 
-			li.LineIntersector::computeIntersection(pt00, pt01,
-				pt10, pt11);
+			li.algorithm::LineIntersector::computeIntersection(pt00, pt01, pt10, pt11);
 			if (li.hasIntersection())
 			{
 				hasIntersectionVar = true;

Modified: trunk/source/util/math.cpp
===================================================================
--- trunk/source/util/math.cpp	2008-09-16 21:01:36 UTC (rev 2188)
+++ trunk/source/util/math.cpp	2008-09-16 21:09:14 UTC (rev 2189)
@@ -26,7 +26,7 @@
 sym_round(double val)
 {
         double n;
-        double f = std::fabs(modf(val, &n));
+        double f = std::fabs(std::modf(val, &n));
         if (val >= 0) {
                 if (f < 0.5) {
                         return std::floor(val);