From fc1798c671f9d804899e55e46e04abe3fccb3d7d Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 2 Jan 2006 21:47:43 +0000 Subject: Fix template members for GCC 3.4+. --- wm/blackbox/distinfo | 3 ++- wm/blackbox/patches/patch-ae | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 wm/blackbox/patches/patch-ae (limited to 'wm') diff --git a/wm/blackbox/distinfo b/wm/blackbox/distinfo index c67f82e505f..1314d6b9eb3 100644 --- a/wm/blackbox/distinfo +++ b/wm/blackbox/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2005/11/11 19:07:40 tonio Exp $ +$NetBSD: distinfo,v 1.11 2006/01/02 21:47:43 joerg Exp $ SHA1 (blackbox-0.65.0.tar.gz) = 903a35526b1c29912ca500b7f8c205368e60fc38 RMD160 (blackbox-0.65.0.tar.gz) = d88d9c5d9375274da149c77d3c63bb9c92470f26 @@ -7,3 +7,4 @@ SHA1 (patch-aa) = 265249c3e27da0d7dd9b2b85da1c417684c57e0f SHA1 (patch-ab) = 6081da04f0dbab0f711523114e130c176a0f1f05 SHA1 (patch-ac) = 5f249a2e6d75e5d88605d6d8a1675d003b1cb52f SHA1 (patch-ad) = 0906aa36c45b1e9ebd8c10e166ac1ba8e345fd9e +SHA1 (patch-ae) = 0e919952cd5209e787807548ca7ce45c5ed03497 diff --git a/wm/blackbox/patches/patch-ae b/wm/blackbox/patches/patch-ae new file mode 100644 index 00000000000..1c1be7d2a9a --- /dev/null +++ b/wm/blackbox/patches/patch-ae @@ -0,0 +1,16 @@ +$NetBSD: patch-ae,v 1.1 2006/01/02 21:47:44 joerg Exp $ + +--- src/Timer.hh.orig 2006-01-02 21:42:01.000000000 +0000 ++++ src/Timer.hh +@@ -98,9 +98,9 @@ public: + ~_timer_queue(void) {} + + void release(const _Tp& value) { +- c.erase(std::remove(c.begin(), c.end(), value), c.end()); ++ this->c.erase(std::remove(this->c.begin(), this->c.end(), value), this->c.end()); + // after removing the item we need to make the heap again +- std::make_heap(c.begin(), c.end(), comp); ++ std::make_heap(this->c.begin(), this->c.end(), this->comp); + } + bool empty(void) const { return _Base::empty(); } + size_t size(void) const { return _Base::size(); } -- cgit v1.2.3