geos-gcc43.patch

   1 diff -urN geos-3.0.0/doc/example.cpp geos-3.0.0.new/doc/example.cpp
   2 --- geos-3.0.0/doc/example.cpp  2007-12-12 22:59:31.000000000 +0100
   3 +++ geos-3.0.0.new/doc/example.cpp      2008-10-18 15:27:34.000000000 +0200
   4 @@ -28,6 +28,7 @@
   5   *
   6   **********************************************************************/
   7
   8 +#include <cstdlib>
   9  #include <vector>
  10  #include <sstream>
  11  #include <iomanip>
  12 diff -urN geos-3.0.0/source/geomgraph/EdgeNodingValidator.cpp geos-3.0.0.new/source/geomgraph/EdgeNodingValidator.cpp
  13 --- geos-3.0.0/source/geomgraph/EdgeNodingValidator.cpp 2007-12-12 22:59:26.000000000 +0100
  14 +++ geos-3.0.0.new/source/geomgraph/EdgeNodingValidator.cpp     2008-10-18 15:21:38.000000000 +0200
  15 @@ -18,10 +18,10 @@
  16
  17  #include <vector>
  18
  19 +#include <geos/geom/CoordinateSequence.h>
  20  #include <geos/geomgraph/EdgeNodingValidator.h>
  21  #include <geos/geomgraph/Edge.h>
  22  #include <geos/noding/SegmentString.h>
  23 -#include <geos/geom/CoordinateSequence.h>
  24
  25  using namespace std;
  26  using namespace geos::noding;
  27 diff -urN geos-3.0.0/source/geomgraph/GeometryGraph.cpp geos-3.0.0.new/source/geomgraph/GeometryGraph.cpp
  28 --- geos-3.0.0/source/geomgraph/GeometryGraph.cpp       2007-12-12 22:59:26.000000000 +0100
  29 +++ geos-3.0.0.new/source/geomgraph/GeometryGraph.cpp   2008-10-18 15:22:16.000000000 +0200
  30 @@ -42,6 +42,7 @@
  31
  32  #include <geos/inline.h>
  33
  34 +#include <typeinfo>
  35  #include <vector>
  36  #include <memory> // auto_ptr
  37  #include <cassert>
  38 diff -urN geos-3.0.0/source/headers/geos/noding/IntersectionAdder.h geos-3.0.0.new/source/headers/geos/noding/IntersectionAdder.h
  39 --- geos-3.0.0/source/headers/geos/noding/IntersectionAdder.h   2007-12-12 22:59:29.000000000 +0100
  40 +++ geos-3.0.0.new/source/headers/geos/noding/IntersectionAdder.h       2008-10-18 15:06:02.000000000 +0200
  41 @@ -19,6 +19,7 @@
  42  #include <vector>
  43  #include <iostream>
  44  #include <cmath> // for abs()
  45 +#include <cstdlib>
  46
  47  #include <geos/inline.h>
  48
  49 diff -urN geos-3.0.0/source/index/quadtree/DoubleBits.cpp geos-3.0.0.new/source/index/quadtree/DoubleBits.cpp
  50 --- geos-3.0.0/source/index/quadtree/DoubleBits.cpp     2007-12-12 22:59:26.000000000 +0100
  51 +++ geos-3.0.0.new/source/index/quadtree/DoubleBits.cpp 2008-10-18 14:59:01.000000000 +0200
  52 @@ -21,7 +21,7 @@
  53  #include <geos/index/quadtree/DoubleBits.h>
  54  #include <geos/util/IllegalArgumentException.h>
  55
  56 -#include <string>
  57 +#include <cstring>
  58
  59  #if __STDC_IEC_559__
  60  #define ASSUME_IEEE_DOUBLE 1
  61 diff -urN geos-3.0.0/source/io/ByteOrderValues.cpp geos-3.0.0.new/source/io/ByteOrderValues.cpp
  62 --- geos-3.0.0/source/io/ByteOrderValues.cpp    2007-12-12 22:59:26.000000000 +0100
  63 +++ geos-3.0.0.new/source/io/ByteOrderValues.cpp        2008-10-18 15:01:27.000000000 +0200
  64 @@ -22,6 +22,7 @@
  65  #include <geos/util.h>
  66
  67  #include <cassert>
  68 +#include <cstring>
  69
  70  namespace geos {
  71  namespace io { // geos.io
  72 diff -urN geos-3.0.0/source/io/StringTokenizer.cpp geos-3.0.0.new/source/io/StringTokenizer.cpp
  73 --- geos-3.0.0/source/io/StringTokenizer.cpp    2007-12-12 22:59:26.000000000 +0100
  74 +++ geos-3.0.0.new/source/io/StringTokenizer.cpp        2008-10-18 15:01:01.000000000 +0200
  75 @@ -16,6 +16,7 @@
  76
  77  #include <geos/io/StringTokenizer.h>
  78
  79 +#include <cstdlib>
  80  #include <string>
  81
  82  using namespace std;
  83 diff -urN geos-3.0.0/source/noding/FastNodingValidator.cpp geos-3.0.0.new/source/noding/FastNodingValidator.cpp
  84 --- geos-3.0.0/source/noding/FastNodingValidator.cpp    2007-12-12 22:59:30.000000000 +0100
  85 +++ geos-3.0.0.new/source/noding/FastNodingValidator.cpp        2008-10-18 15:04:49.000000000 +0200
  86 @@ -17,12 +17,12 @@
  87   *
  88   **********************************************************************/
  89
  90 -#include <geos/noding/FastNodingValidator.h>
  91  #include <geos/noding/MCIndexNoder.h> // for checkInteriorIntersections()
  92  #include <geos/noding/SingleInteriorIntersectionFinder.h>
  93  #include <geos/util/TopologyException.h> // for checkValid()
  94  #include <geos/geom/Coordinate.h>
  95  #include <geos/io/WKTWriter.h> // for getErrorMessage()
  96 +#include <geos/noding/FastNodingValidator.h>
  97
  98  #include <string>
  99  #include <iostream>
 100 diff -urN geos-3.0.0/source/operation/buffer/OffsetCurveSetBuilder.cpp geos-3.0.0.new/source/operation/buffer/OffsetCurveSetBuilder.cpp
 101 --- geos-3.0.0/source/operation/buffer/OffsetCurveSetBuilder.cpp        2007-12-12 22:59:25.000000000 +0100
 102 +++ geos-3.0.0.new/source/operation/buffer/OffsetCurveSetBuilder.cpp    2008-10-18 15:08:39.000000000 +0200
 103 @@ -37,6 +37,7 @@
 104  #include <geos/geomgraph/Label.h>
 105  #include <geos/noding/SegmentString.h>
 106
 107 +#include <typeinfo>
 108  #include <cmath>
 109  #include <vector>
 110  #include <memory>
 111 diff -urN geos-3.0.0/source/operation/distance/ConnectedElementPointFilter.cpp geos-3.0.0.new/source/operation/distance/ConnectedElementPointFilter.cpp
 112 --- geos-3.0.0/source/operation/distance/ConnectedElementPointFilter.cpp        2007-12-12 22:59:25.000000000 +0100
 113 +++ geos-3.0.0.new/source/operation/distance/ConnectedElementPointFilter.cpp    2008-10-18 15:09:49.000000000 +0200
 114 @@ -19,6 +19,7 @@
 115  #include <geos/geom/LineString.h>
 116  #include <geos/geom/Polygon.h>
 117
 118 +#include <typeinfo>
 119  #include <vector>
 120
 121  using namespace std;
 122 diff -urN geos-3.0.0/source/planargraph/DirectedEdge.cpp geos-3.0.0.new/source/planargraph/DirectedEdge.cpp
 123 --- geos-3.0.0/source/planargraph/DirectedEdge.cpp      2007-12-12 22:59:25.000000000 +0100
 124 +++ geos-3.0.0.new/source/planargraph/DirectedEdge.cpp  2008-10-18 15:14:51.000000000 +0200
 125 @@ -18,6 +18,7 @@
 126  #include <geos/geomgraph/Quadrant.h>
 127  #include <geos/algorithm/CGAlgorithms.h>
 128
 129 +#include <typeinfo>
 130  #include <cmath>
 131  #include <sstream>
 132  #include <vector>
 133 diff -urN geos-3.0.0/source/precision/SimpleGeometryPrecisionReducer.cpp geos-3.0.0.new/source/precision/SimpleGeometryPrecisionReducer.cpp
 134 --- geos-3.0.0/source/precision/SimpleGeometryPrecisionReducer.cpp      2007-12-12 22:59:24.000000000 +0100
 135 +++ geos-3.0.0.new/source/precision/SimpleGeometryPrecisionReducer.cpp  2008-10-18 15:23:34.000000000 +0200
 136 @@ -29,6 +29,7 @@
 137  #include <geos/geom/LineString.h>
 138  #include <geos/geom/LinearRing.h>
 139
 140 +#include <typeinfo>
 141  #include <vector>
 142
 143  using namespace std;
 144 diff -urN geos-3.0.0/tests/bigtest/TestSweepLineSpeed.cpp geos-3.0.0.new/tests/bigtest/TestSweepLineSpeed.cpp
 145 --- geos-3.0.0/tests/bigtest/TestSweepLineSpeed.cpp     2007-12-12 22:59:30.000000000 +0100
 146 +++ geos-3.0.0.new/tests/bigtest/TestSweepLineSpeed.cpp 2008-10-18 15:40:00.000000000 +0200
 147 @@ -88,7 +88,7 @@
 148  //     cout << "n Pts: " << nPts << "   Executed in " << totalTime << endl;
 149  }
 150
 151 -int main(int /* argC */, char* /* argV[] */) {
 152 +int main(int /* argC */, char** /* argV[] */) {
 153
 154         GeometryFactory *fact=new GeometryFactory();
 155
 156 diff -urN geos-3.0.0/tests/xmltester/markup/MarkupSTL.h geos-3.0.0.new/tests/xmltester/markup/MarkupSTL.h
 157 --- geos-3.0.0/tests/xmltester/markup/MarkupSTL.h       2007-12-12 22:59:30.000000000 +0100
 158 +++ geos-3.0.0.new/tests/xmltester/markup/MarkupSTL.h   2008-10-18 15:43:12.000000000 +0200
 159 @@ -62,6 +62,7 @@
 160  #pragma warning(disable:4786)
 161  #endif
 162
 163 +#include <cstring>
 164  #include <string>
 165  #include <map>
 166  #include <vector>
 167 diff -urN geos-3.0.0/tests/xmltester/XMLTester.cpp geos-3.0.0.new/tests/xmltester/XMLTester.cpp
 168 --- geos-3.0.0/tests/xmltester/XMLTester.cpp    2007-12-21 19:14:09.000000000 +0100
 169 +++ geos-3.0.0.new/tests/xmltester/XMLTester.cpp        2008-10-18 15:41:02.000000000 +0200
 170 @@ -48,6 +48,7 @@
 171  #include <cassert>
 172  #include <cctype>
 173  #include <cstdlib>
 174 +#include <cstring>
 175  #include <fstream>
 176  #include <functional>
 177  #include <iostream>