[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8

Francesco Paolo Lovergine frankie at debian.org
Wed May 25 16:04:43 UTC 2011


The following commit has been merged in the master branch:
commit 4495372d93e1cd2d56a5db5bbad0ec66f65d02e7
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed May 25 15:11:52 2011 +0200

    Still another cstddef include missing.

diff --git a/debian/patches/SimpleNestedRingTester.h b/debian/patches/SimpleNestedRingTester.h
new file mode 100644
index 0000000..77b49d4
--- /dev/null
+++ b/debian/patches/SimpleNestedRingTester.h
@@ -0,0 +1,21 @@
+Index: geos/source/headers/geos/operation/valid/SimpleNestedRingTester.h
+===================================================================
+--- geos.orig/source/headers/geos/operation/valid/SimpleNestedRingTester.h	2011-05-25 15:10:53.000000000 +0200
++++ geos/source/headers/geos/operation/valid/SimpleNestedRingTester.h	2011-05-25 15:11:11.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include <geos/export.h>
+ 
+ #include <vector>
++#include <cstddef>
+ 
+ // Forward declarations
+ namespace geos {
+@@ -40,6 +41,8 @@
+ namespace operation { // geos::operation
+ namespace valid { // geos::operation::valid
+ 
++using namespace std;
++
+ /** \brief
+  * Tests whether any of a set of {@link LinearRing}s are
+  * nested inside another ring in the set, using a simple O(n^2)
diff --git a/debian/patches/series b/debian/patches/series
index 2aba345..a4edf69 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ Node.cpp
 Root.cpp
 MonotoneChainBuilder.h
 AbstractNode.cpp
+SimpleNestedRingTester.h

-- 
Geometry engine for Geographic Information Systems



More information about the Pkg-grass-devel mailing list