[geos-commits] r2143 - in trunk: doc source/geomgraph source/headers/geos/noding source/index/quadtree source/io tests/bigtest

[svn_geos at osgeo.org]

Author: mloskot
Date: 2008-07-26 19:06:11 -0400 (Sat, 26 Jul 2008)
New Revision: 2143

Modified:
   trunk/doc/example.cpp
   trunk/source/geomgraph/GeometryGraph.cpp
   trunk/source/headers/geos/noding/FastNodingValidator.h
   trunk/source/headers/geos/noding/IntersectionAdder.h
   trunk/source/index/quadtree/DoubleBits.cpp
   trunk/source/io/StringTokenizer.cpp
   trunk/tests/bigtest/TestSweepLineSpeed.cpp
Log:
Number of fixes enabling GEOS compilation with GCC 4.3 (Ticket #167).

Modified: trunk/doc/example.cpp
===================================================================
--- trunk/doc/example.cpp	2008-07-26 21:00:44 UTC (rev 2142)
+++ trunk/doc/example.cpp	2008-07-26 23:06:11 UTC (rev 2143)
@@ -28,9 +28,6 @@
  *
  **********************************************************************/
 
-#include <vector>
-#include <sstream>
-#include <iomanip>
 #include <geos/geom/PrecisionModel.h>
 #include <geos/geom/GeometryFactory.h>
 #include <geos/geom/Geometry.h>
@@ -51,6 +48,10 @@
 #include <geos/util/IllegalArgumentException.h>
 #include <geos/opLinemerge.h>
 #include <geos/opPolygonize.h>
+#include <vector>
+#include <sstream>
+#include <iomanip>
+#include <cstdlib> // exit()
 
 #ifndef M_PI
 #define M_PI       3.14159265358979323846

Modified: trunk/source/geomgraph/GeometryGraph.cpp
===================================================================
--- trunk/source/geomgraph/GeometryGraph.cpp	2008-07-26 21:00:44 UTC (rev 2142)
+++ trunk/source/geomgraph/GeometryGraph.cpp	2008-07-26 23:06:11 UTC (rev 2143)
@@ -169,6 +169,7 @@
 	if (g->isEmpty()) return;
 	// check if this Geometry should obey the Boundary Determination Rule
 	// all collections except MultiPolygons obey the rule
+    // FIXME - mloskot: Make this condition readable and use paranthesis
 	if ((typeid(*g)==typeid(GeometryCollection)) ||
 			   (typeid(*g)==typeid(MultiPoint)) ||
 			   (typeid(*g)==typeid(MultiLineString)) &&

Modified: trunk/source/headers/geos/noding/FastNodingValidator.h
===================================================================
--- trunk/source/headers/geos/noding/FastNodingValidator.h	2008-07-26 21:00:44 UTC (rev 2142)
+++ trunk/source/headers/geos/noding/FastNodingValidator.h	2008-07-26 23:06:11 UTC (rev 2143)
@@ -23,8 +23,9 @@
 #include <geos/noding/SingleInteriorIntersectionFinder.h> // for composition
 #include <geos/algorithm/LineIntersector.h> // for composition
 
+#include <memory>
+#include <string>
 #include <cassert>
-#include <string>
 
 // Forward declarations
 namespace geos {

Modified: trunk/source/headers/geos/noding/IntersectionAdder.h
===================================================================
--- trunk/source/headers/geos/noding/IntersectionAdder.h	2008-07-26 21:00:44 UTC (rev 2142)
+++ trunk/source/headers/geos/noding/IntersectionAdder.h	2008-07-26 23:06:11 UTC (rev 2143)
@@ -18,7 +18,7 @@
 
 #include <vector>
 #include <iostream>
-#include <cmath> // for abs()
+#include <cstdlib> // for abs()
 
 #include <geos/inline.h>
 

Modified: trunk/source/index/quadtree/DoubleBits.cpp
===================================================================
--- trunk/source/index/quadtree/DoubleBits.cpp	2008-07-26 21:00:44 UTC (rev 2142)
+++ trunk/source/index/quadtree/DoubleBits.cpp	2008-07-26 23:06:11 UTC (rev 2143)
@@ -22,6 +22,7 @@
 #include <geos/util/IllegalArgumentException.h>
 
 #include <string>
+#include <cstring>
 
 #if __STDC_IEC_559__
 #define ASSUME_IEEE_DOUBLE 1

Modified: trunk/source/io/StringTokenizer.cpp
===================================================================
--- trunk/source/io/StringTokenizer.cpp	2008-07-26 21:00:44 UTC (rev 2142)
+++ trunk/source/io/StringTokenizer.cpp	2008-07-26 23:06:11 UTC (rev 2143)
@@ -17,6 +17,7 @@
 #include <geos/io/StringTokenizer.h>
 
 #include <string>
+#include <cstdlib>
 
 using namespace std;
 

Modified: trunk/tests/bigtest/TestSweepLineSpeed.cpp
===================================================================
--- trunk/tests/bigtest/TestSweepLineSpeed.cpp	2008-07-26 21:00:44 UTC (rev 2142)
+++ trunk/tests/bigtest/TestSweepLineSpeed.cpp	2008-07-26 23:06:11 UTC (rev 2143)
@@ -88,7 +88,7 @@
 //	cout << "n Pts: " << nPts << "   Executed in " << totalTime << endl;
 }
 
-int main(int /* argC */, char* /* argV[] */) {
+int main(int /* argc */, char** /* argv[] */) {
 
 	GeometryFactory *fact=new GeometryFactory();