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

Merge remote-tracking branch 'origin/master' into topic/johanna/remove-serializer

Browse source 
# Conflicts:
#	src/File.cc
#	src/File.h
#	src/StateAccess.h
#	src/bro.bif
This commit is contained in:
Johanna Amann 2019-05-22 15:16:31 -07:00
commit 7ae5c7d1b4
68 changed files with 394 additions and 747 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/ID.cc
View file

@ -63,16 +63,6 @@ void ID::SetVal(Val* v, Opcode op, bool arg_weak_ref)
{
if ( op != OP_NONE )
{
if ( type && val && type->Tag() == TYPE_TABLE &&
val->AsTableVal()->FindAttr(ATTR_MERGEABLE) &&
v->AsTableVal()->FindAttr(ATTR_MERGEABLE) )
{
StateAccess::Log(new StateAccess(OP_ASSIGN, this,
v, val));
v->AsTableVal()->AddTo(val->AsTableVal(), 0, false);
return;
}
MutableVal::Properties props = 0;
if ( attrs && attrs->FindAttr(ATTR_TRACKED) )