Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-06 00:28:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move Timer and PriorityQueue classes to namespaces

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-07-20 13:52:54 -07:00
parent 910aa77d95
commit 1c17700c48
33 changed files with 206 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Conn.h
View file

@ -332,9 +332,9 @@ protected:
// is true, then the timer is also evaluated when Bro terminates,
// otherwise not.
void AddTimer(timer_func timer, double t, bool do_expire,
TimerType type);
zeek::detail::TimerType type);
void RemoveTimer(Timer* t);
void RemoveTimer(zeek::detail::Timer* t);
// Allow other classes to access pointers to these:
friend class ConnectionTimer;
@ -389,11 +389,11 @@ protected:
WeirdStateMap weird_state;
};
class ConnectionTimer final : public Timer {
class ConnectionTimer final : public zeek::detail::Timer {
public:
ConnectionTimer(Connection* arg_conn, timer_func arg_timer,
double arg_t, bool arg_do_expire, TimerType arg_type)
: Timer(arg_t, arg_type)
double arg_t, bool arg_do_expire, zeek::detail::TimerType arg_type)
: zeek::detail::Timer(arg_t, arg_type)
{ Init(arg_conn, arg_timer, arg_do_expire); }
~ConnectionTimer() override;