Merge branch 'master' into topic/jsiwek/fuzzing

This commit is contained in:
Jon Siwek 2020-04-28 17:25:32 -07:00
commit d533212a6a
218 changed files with 3816 additions and 3557 deletions

View file

@ -844,7 +844,7 @@ zeek::SetupResult zeek::setup(int argc, char** argv, zeek::Options* zopts)
mgr.Enqueue(zeek_script_loaded,
make_intrusive<StringVal>(i->name.c_str()),
IntrusivePtr{AdoptRef{}, val_mgr->GetCount(i->include_level)}
val_mgr->Count(i->include_level)
);
}
}