From d0ea813515d6b577326c027ff54904abd3653877 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Tue, 9 Jul 2013 19:01:05 -0700 Subject: [PATCH] Add timer parameter to DeadlineTimer callback --- .../events/beast_DeadlineTimer.cpp | 2 +- .../beast_basics/events/beast_DeadlineTimer.h | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/modules/beast_basics/events/beast_DeadlineTimer.cpp b/modules/beast_basics/events/beast_DeadlineTimer.cpp index 671d2ff0..8475610e 100644 --- a/modules/beast_basics/events/beast_DeadlineTimer.cpp +++ b/modules/beast_basics/events/beast_DeadlineTimer.cpp @@ -97,7 +97,7 @@ public: // // Note that this happens while the lock is held. // - iter->m_listener->onDeadlineTimer (); + iter->m_listener->onDeadlineTimer (*iter); // Remove it from the list. m_items.erase (iter); diff --git a/modules/beast_basics/events/beast_DeadlineTimer.h b/modules/beast_basics/events/beast_DeadlineTimer.h index cc4d2d63..5af0a236 100644 --- a/modules/beast_basics/events/beast_DeadlineTimer.h +++ b/modules/beast_basics/events/beast_DeadlineTimer.h @@ -35,7 +35,7 @@ public: class Listener { public: - virtual void onDeadlineTimer () { } + virtual void onDeadlineTimer (DeadlineTimer&) { } }; public: @@ -64,6 +64,22 @@ public: */ void reset (); + /** Equality comparison. + + Timers are equal if they have the same address. + */ + inline bool operator== (DeadlineTimer const& other) const + { + return this == &other; + } + + /** Inequality comparison. + */ + inline bool operator!= (DeadlineTimer const& other) const + { + return this != &other; + } + private: class Manager;