blackbox 0.65.0 vs gcc 3.4 patch

Zack Winkles winkie at linuxfromscratch.org
Sat Apr 10 22:44:25 PDT 2004


Submitted By: Zack Winkles <winkie AT linuxfromscratch DOT org>
Date: 2004-04-11
Initial Package Version: 0.65.0
Origin: Upstream CVS
Description: Fix compilation of blackbox with GCC 3.4.

diff -Naur blackbox-0.65.0.orig/src/Timer.hh blackbox-0.65.0/src/Timer.hh
--- blackbox-0.65.0.orig/src/Timer.hh	2002-08-23 14:50:54.000000000 -0400
+++ blackbox-0.65.0/src/Timer.hh	2004-04-11 01:23:27.000000000 -0400
@@ -98,9 +98,10 @@
   ~_timer_queue(void) {}
 
   void release(const _Tp& value) {
-    c.erase(std::remove(c.begin(), c.end(), value), c.end());
+    _Base::c.erase(std::remove(_Base::c.begin(), _Base::c.end(), value),
+			_Base::c.end());
     // after removing the item we need to make the heap again
-    std::make_heap(c.begin(), c.end(), comp);
+    std::make_heap(_Base::c.begin(), _Base::c.end(), _Base::comp);
   }
   bool empty(void) const { return _Base::empty(); }
   size_t size(void) const { return _Base::size(); }


More information about the patches mailing list