The following commit has been merged in the upstream branch: commit 48d0aee749df35c60df0d355d6022512ce5344e0 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Tue May 24 18:11:44 2011 +0200
Still a fix for qualifier. diff --git a/debian/patches/Bintree.cpp b/debian/patches/Bintree.cpp index dd93150..2dc9748 100644 --- a/debian/patches/Bintree.cpp +++ b/debian/patches/Bintree.cpp @@ -1,7 +1,7 @@ Index: geos/source/index/bintree/Bintree.cpp =================================================================== ---- geos.orig/source/index/bintree/Bintree.cpp 2011-05-24 17:06:29.000000000 +0200 -+++ geos/source/index/bintree/Bintree.cpp 2011-05-24 17:07:06.000000000 +0200 +--- geos.orig/source/index/bintree/Bintree.cpp 2011-05-24 18:10:41.000000000 +0200 ++++ geos/source/index/bintree/Bintree.cpp 2011-05-24 18:11:29.000000000 +0200 @@ -18,6 +18,7 @@ #include <geos/index/bintree/Root.h> #include <geos/index/bintree/Interval.h> @@ -10,3 +10,29 @@ Index: geos/source/index/bintree/Bintree.cpp namespace geos { namespace index { // geos.index +@@ -66,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; + } + +@@ -85,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