[SCM] geos branch, upstream, updated. upstream/3.3.2-56-g722309c

[Francesco Paolo Lovergine]

The following commit has been merged in the upstream branch:
commit 8040000ceb67d6a5cf9b9fbc9a4ac813d5fdffe0
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed May 25 12:47:01 2011 +0200

    Changing qualification in Node.cpp

diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp
index bec4a7d..506bb11 100644
--- a/debian/patches/Node.cpp
+++ b/debian/patches/Node.cpp
@@ -1,7 +1,7 @@
 Index: geos/source/index/bintree/Node.cpp
 ===================================================================
---- geos.orig/source/index/bintree/Node.cpp	2011-05-24 18:16:35.000000000 +0200
-+++ geos/source/index/bintree/Node.cpp	2011-05-25 12:17:04.000000000 +0200
+--- geos.orig/source/index/bintree/Node.cpp	2011-05-25 12:45:36.000000000 +0200
++++ geos/source/index/bintree/Node.cpp	2011-05-25 12:46:20.000000000 +0200
 @@ -15,6 +15,7 @@
   **********************************************************************/
  
@@ -10,49 +10,19 @@ Index: geos/source/index/bintree/Node.cpp
  
  #include <geos/index/bintree/Node.h>
  #include <geos/index/bintree/Key.h>
-@@ -38,9 +39,9 @@
- Node::createExpanded(Node *node,Interval *addInterval)
- {
- 	Interval *expandInt=new Interval(addInterval);
--	if (node!=NULL) expandInt->expandToInclude(node->interval);
-+	if (node!=std::NULL) expandInt->expandToInclude(node->interval);
- 	Node *largerNode=createNode(expandInt);
--	if (node!=NULL) largerNode->insert(node);
-+	if (node!=std::NULL) largerNode->insert(node);
- 	delete expandInt;
- 	return largerNode;
- }
-@@ -99,7 +100,7 @@
- 	int subnodeIndex=getSubnodeIndex(searchInterval,centre);
- 	if (subnodeIndex==-1)
- 		return this;
--	if (subnode[subnodeIndex]!=NULL) {
-+	if (subnode[subnodeIndex]!=std::NULL) {
- 		// query lies in subnode, so search it
- 		Node *node=subnode[subnodeIndex];
- 		return node->find(searchInterval);
-@@ -111,7 +112,7 @@
- void
- Node::insert(Node *node)
- {
--	assert(interval==NULL || interval->contains(node->interval));
-+	assert(interval==std::NULL || interval->contains(node->interval));
- 	int index=getSubnodeIndex(node->interval,centre);
- 	if (node->level==level-1) {
- 		subnode[index]=node;
-@@ -131,7 +132,7 @@
+@@ -24,6 +25,8 @@
+ namespace index { // geos.index
+ namespace bintree { // geos.index.bintree
+ 
++using namespace std;
++
  Node*
- Node::getSubnode(int index)
+ Node::createNode(Interval *itemInterval)
  {
--	if (subnode[index]==NULL) {
-+	if (subnode[index]==std::NULL) {
- 		subnode[index]=createSubnode(index);
- 	}
- 	return subnode[index];
 Index: geos/source/geomgraph/Node.cpp
 ===================================================================
---- geos.orig/source/geomgraph/Node.cpp	2011-05-24 18:16:35.000000000 +0200
-+++ geos/source/geomgraph/Node.cpp	2011-05-25 12:17:04.000000000 +0200
+--- geos.orig/source/geomgraph/Node.cpp	2011-05-25 12:45:36.000000000 +0200
++++ geos/source/geomgraph/Node.cpp	2011-05-25 12:45:40.000000000 +0200
 @@ -30,6 +30,7 @@
  #include <sstream>
  #include <vector>
@@ -81,8 +51,8 @@ Index: geos/source/geomgraph/Node.cpp
  	int newLoc;
 Index: geos/source/index/quadtree/Node.cpp
 ===================================================================
---- geos.orig/source/index/quadtree/Node.cpp	2011-05-24 18:16:35.000000000 +0200
-+++ geos/source/index/quadtree/Node.cpp	2011-05-25 12:17:04.000000000 +0200
+--- geos.orig/source/index/quadtree/Node.cpp	2011-05-25 12:45:36.000000000 +0200
++++ geos/source/index/quadtree/Node.cpp	2011-05-25 12:45:40.000000000 +0200
 @@ -25,6 +25,7 @@
  #include <string>
  #include <sstream>
@@ -111,8 +81,8 @@ Index: geos/source/index/quadtree/Node.cpp
  	}
 Index: geos/source/index/bintree/Bintree.cpp
 ===================================================================
---- geos.orig/source/index/bintree/Bintree.cpp	2011-05-25 12:34:58.000000000 +0200
-+++ geos/source/index/bintree/Bintree.cpp	2011-05-25 12:35:09.000000000 +0200
+--- geos.orig/source/index/bintree/Bintree.cpp	2011-05-25 12:45:40.000000000 +0200
++++ geos/source/index/bintree/Bintree.cpp	2011-05-25 12:45:40.000000000 +0200
 @@ -67,14 +67,14 @@
  int
  Bintree::depth()

-- 
Geometry engine for Geographic Information Systems