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

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit b8b8fc51f0b4ddeeb0def9854229836cc2a6e1d0
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue May 24 17:56:45 2011 +0200

    Fixed patch for missing qualiefier.

diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp
index f514140..1f7876c 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 17:26:38.000000000 +0200
-+++ geos/source/index/bintree/Node.cpp	2011-05-24 17:27:28.000000000 +0200
+--- geos.orig/source/index/bintree/Node.cpp	2011-05-24 17:31:02.000000000 +0200
++++ geos/source/index/bintree/Node.cpp	2011-05-24 17:54:22.000000000 +0200
 @@ -15,6 +15,7 @@
   **********************************************************************/
  
@@ -51,8 +51,8 @@ Index: geos/source/index/bintree/Node.cpp
  	return subnode[index];
 Index: geos/source/geomgraph/Node.cpp
 ===================================================================
---- geos.orig/source/geomgraph/Node.cpp	2011-05-24 17:29:37.000000000 +0200
-+++ geos/source/geomgraph/Node.cpp	2011-05-24 17:30:35.000000000 +0200
+--- geos.orig/source/geomgraph/Node.cpp	2011-05-24 17:31:02.000000000 +0200
++++ geos/source/geomgraph/Node.cpp	2011-05-24 17:54:22.000000000 +0200
 @@ -30,6 +30,7 @@
  #include <sstream>
  #include <vector>
@@ -81,8 +81,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 17:28:56.000000000 +0200
-+++ geos/source/index/quadtree/Node.cpp	2011-05-24 17:29:13.000000000 +0200
+--- geos.orig/source/index/quadtree/Node.cpp	2011-05-24 17:31:02.000000000 +0200
++++ geos/source/index/quadtree/Node.cpp	2011-05-24 17:54:22.000000000 +0200
 @@ -25,6 +25,7 @@
  #include <string>
  #include <sstream>
@@ -109,3 +109,33 @@ Index: geos/source/index/quadtree/Node.cpp
  	{
  		subnode[index] = createSubnode(index).release();
  	}
+Index: geos/source/index/bintree/Bintree.cpp
+===================================================================
+--- geos.orig/source/index/bintree/Bintree.cpp	2011-05-24 17:54:40.000000000 +0200
++++ geos/source/index/bintree/Bintree.cpp	2011-05-24 17:55:56.000000000 +0200
+@@ -67,14 +67,14 @@
+ int
+ Bintree::depth()
+ {
+-	if (root!=NULL) return root->depth();
++	if (root!=std::NULL) return root->depth();
+ 	return 0;
+ }
+ 
+ int
+ Bintree::size()
+ {
+-	if (root!=NULL) return root->size();
++	if (root!=std::NULL) return root->size();
+ 	return 0;
+ }
+ 
+@@ -86,7 +86,7 @@
+ int
+ Bintree::nodeSize()
+ {
+-	if (root!=NULL) return root->nodeSize();
++	if (root!=std::NULL) return root->nodeSize();
+ 	return 0;
+ }
+ 

-- 
Geometry engine for Geographic Information Systems