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'

Browse source
This commit is contained in:
Johanna Amann 2019-06-20 20:24:38 -07:00
commit 9564651655
29 changed files with 142 additions and 448 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Val.h
View file

@ -3,15 +3,11 @@
#ifndef val_h
#define val_h
// BRO values.
#include <vector>
#include <list>
#include <array>
#include <unordered_map>
#include <broker/broker.hh>
#include "net_util.h"
#include "Type.h"
#include "Dict.h"
@ -358,6 +354,7 @@ protected:
friend class RecordVal;
friend class VectorVal;
friend class ValManager;
friend class TableEntryVal;
virtual void ValDescribe(ODesc* d) const;
virtual void ValDescribeReST(ODesc* d) const;
@ -725,9 +722,9 @@ public:
int(network_time - bro_start_network_time);
}
TableEntryVal* Clone()
TableEntryVal* Clone(Val::CloneState* state)
{
auto rval = new TableEntryVal(val ? val->Clone() : nullptr);
auto rval = new TableEntryVal(val ? val->Clone(state) : nullptr);
rval->last_access_time = last_access_time;
rval->expire_access_time = expire_access_time;
return rval;