[geos-devel] [PATCH 2/3] fixed missing NULL with gcc 4.6

mabrand at mabrand.nl mabrand at mabrand.nl
Sat Mar 26 08:54:41 EDT 2011


From: Mark Brand <mabrand at mabrand.nl>

---
 include/geos/index/chain/MonotoneChainBuilder.h    |    1 +
 .../geos/operation/valid/SimpleNestedRingTester.h  |    1 +
 src/index/bintree/Bintree.cpp                      |    1 +
 src/index/bintree/Node.cpp                         |    1 +
 src/index/bintree/Root.cpp                         |    1 +
 src/index/strtree/AbstractNode.cpp                 |    1 +
 6 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/include/geos/index/chain/MonotoneChainBuilder.h b/include/geos/index/chain/MonotoneChainBuilder.h
index ce1af3e..1b8e6ed 100644
--- a/include/geos/index/chain/MonotoneChainBuilder.h
+++ b/include/geos/index/chain/MonotoneChainBuilder.h
@@ -22,6 +22,7 @@
 
 #include <geos/export.h>
 #include <vector>
+#include <cstddef>
 
 // Forward declarations
 namespace geos {
diff --git a/include/geos/operation/valid/SimpleNestedRingTester.h b/include/geos/operation/valid/SimpleNestedRingTester.h
index 986f840..3f5dd5f 100644
--- a/include/geos/operation/valid/SimpleNestedRingTester.h
+++ b/include/geos/operation/valid/SimpleNestedRingTester.h
@@ -23,6 +23,7 @@
 
 #include <geos/export.h>
 
+#include <cstddef>
 #include <vector>
 
 #ifdef _MSC_VER
diff --git a/src/index/bintree/Bintree.cpp b/src/index/bintree/Bintree.cpp
index 5689c23..e9462d6 100644
--- a/src/index/bintree/Bintree.cpp
+++ b/src/index/bintree/Bintree.cpp
@@ -14,6 +14,7 @@
  *
  **********************************************************************/
 
+#include <cstddef>
 #include <geos/index/bintree/Bintree.h>
 #include <geos/index/bintree/Root.h>
 #include <geos/index/bintree/Interval.h>
diff --git a/src/index/bintree/Node.cpp b/src/index/bintree/Node.cpp
index 55102ff..031df0b 100644
--- a/src/index/bintree/Node.cpp
+++ b/src/index/bintree/Node.cpp
@@ -14,6 +14,7 @@
  *
  **********************************************************************/
 
+#include <cstddef>
 #include <cassert>
 
 #include <geos/index/bintree/Node.h>
diff --git a/src/index/bintree/Root.cpp b/src/index/bintree/Root.cpp
index 11a9443..4f21a51 100644
--- a/src/index/bintree/Root.cpp
+++ b/src/index/bintree/Root.cpp
@@ -19,6 +19,7 @@
 #include <geos/index/bintree/Interval.h>
 #include <geos/index/quadtree/IntervalSize.h>
 
+#include <cstddef>
 #include <cassert>
 
 namespace geos {
diff --git a/src/index/strtree/AbstractNode.cpp b/src/index/strtree/AbstractNode.cpp
index 96ff1ff..a50fa0a 100644
--- a/src/index/strtree/AbstractNode.cpp
+++ b/src/index/strtree/AbstractNode.cpp
@@ -17,6 +17,7 @@
 #include <geos/index/strtree/AbstractNode.h>
 
 #include <vector>
+#include <cstddef>
 #include <cassert>
 
 using namespace std;
-- 
1.7.4.1



More information about the geos-devel mailing list