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

Merge remote-tracking branch 'origin/master' into topic/seth/stats-improvement

Browse source
This commit is contained in:
Seth Hall 2016-05-02 14:34:29 -04:00
commit d9d579c52c
416 changed files with 12813 additions and 3278 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Conn.h
View file

@ -201,7 +201,7 @@ public:
bool IsPersistent() { return persistent; }
void Describe(ODesc* d) const;
void Describe(ODesc* d) const override;
void IDString(ODesc* d) const;
TimerMgr* GetTimerMgr() const;
@ -336,7 +336,7 @@ public:
{ Init(arg_conn, arg_timer, arg_do_expire); }
virtual ~ConnectionTimer();
void Dispatch(double t, int is_expire);
void Dispatch(double t, int is_expire) override;
protected:
ConnectionTimer() {}