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

Merge branch 'master' into topic/jsiwek/supervisor

Browse source
This commit is contained in:
Jon Siwek 2020-01-21 12:17:56 -08:00
commit 9c0d252c2b
32 changed files with 479 additions and 318 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Timer.h
View file

@ -12,7 +12,7 @@ extern "C" {
}
// If you add a timer here, adjust TimerNames in Timer.cc.
enum TimerType {
enum TimerType : uint8_t {
TIMER_BACKDOOR,
TIMER_BREAKPOINT,
TIMER_CONN_DELETE,
@ -52,8 +52,7 @@ class ODesc;
class Timer : public PQ_Element {
public:
Timer(double t, TimerType arg_type) : PQ_Element(t)
{ type = (char) arg_type; }
Timer(double t, TimerType arg_type) : PQ_Element(t), type(arg_type) { }
~Timer() override { }
TimerType Type() const { return (TimerType) type; }
@ -67,8 +66,7 @@ public:
protected:
Timer() {}
unsigned int type:8;
TimerType type;
};
class TimerMgr {