The following commit has been merged in the upstream branch:
commit 474de6c070023129ad5e543649c2d07193e913a8
Author: Francesco Paolo Lovergine <fran...@debian.org>
Date: Tue May 24 18:16:40 2011 +0200
Changed a bit patch order
diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp
index 1f7876c..e858991 100644
--- a/debian/patches/Node.cpp
+++ b/debian/patches/Node.cpp
@@ -109,33 +109,3 @@ 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
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
