summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArt Haas <ahaas@airmail.net>2011-11-09 14:35:09 +0000
committerJon TURNEY <jon.turney@dronecode.org.uk>2011-11-09 18:20:29 +0000
commit7b2864381a0b29c8529270858a1173e8ec2725ec (patch)
treeff986dd41ce7082253bc945560b80c039398e077
parent909c3da5434beae83087191a9f551b6647aa3148 (diff)
blackbox patch to fix building with current gccHEADmaster
http://www.mail-archive.com/blackbox@asgardsrealm.net/msg01417.html "This _very_ ugly patch fixes a build issue with GCC-3.4. The new compiler complains about the variables 'c' and 'comp' - these two variables are protected in the _Base parent class."
-rw-r--r--src/Timer.hh4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Timer.hh b/src/Timer.hh
index 4958154..08432f6 100644
--- a/src/Timer.hh
+++ b/src/Timer.hh
@@ -99,9 +99,9 @@ public:
~_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(); }