tags 687604 + pending thanks Dear maintainer,
Sebastian Ramacher has prepared an NMU for libkdtree++ (versioned as 0.7.0-1.1) and I've uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Chavela Vargas: En El Ultimo Trago
diff -u libkdtree++-0.7.0/debian/changelog libkdtree++-0.7.0/debian/changelog
--- libkdtree++-0.7.0/debian/changelog
+++ libkdtree++-0.7.0/debian/changelog
@@ -1,3 +1,11 @@
+libkdtree++ (0.7.0-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Cherry pick 8d4fbb9a from upstream to fix issues with g++ 4.7. (Closes:
+ #687604)
+
+ -- Sebastian Ramacher <s.ramac...@gmx.at> Tue, 25 Sep 2012 16:57:06 +0200
+
libkdtree++ (0.7.0-1) unstable; urgency=low
* New upstream release (closes: Bug#506485)
only in patch2:
unchanged:
--- libkdtree++-0.7.0.orig/kdtree++/kdtree.hpp
+++ libkdtree++-0.7.0/kdtree++/kdtree.hpp
@@ -1163,7 +1163,7 @@
{
typename _Base::NoLeakAlloc noleak(this);
_Link_type new_node = noleak.get();
- _M_construct_node(new_node, __V, __PARENT, __LEFT, __RIGHT);
+ _Base::_M_construct_node(new_node, __V, __PARENT, __LEFT, __RIGHT);
noleak.disconnect();
return new_node;
}
@@ -1181,8 +1181,8 @@
void
_M_delete_node(_Link_type __p)
{
- _M_destroy_node(__p);
- _M_deallocate_node(__p);
+ _Base::_M_destroy_node(__p);
+ _Base::_M_deallocate_node(__p);
}
_Link_type _M_root;
signature.asc
Description: Digital signature
