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

Deprecate Val(Func*) ctor, replace with one using IntrusivePtr

Browse source
This commit is contained in:
Jon Siwek 2020-05-15 16:24:53 -07:00
parent 4a2221b878
commit a031f5b727
7 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Var.cc
View file

@ -298,8 +298,8 @@ static void make_var(ID* id, IntrusivePtr<BroType> t, init_class c,
// For events, add a function value (without any body) here so that
// we can later access the ID even if no implementations have been
// defined.
Func* f = new BroFunc(id, nullptr, nullptr, 0, 0);
id->SetVal(make_intrusive<Val>(f));
auto f = make_intrusive<BroFunc>(id, nullptr, nullptr, 0, 0);
id->SetVal(make_intrusive<Val>(std::move(f)));
}
}
@ -638,14 +638,14 @@ void end_func(IntrusivePtr<Stmt> body)
ingredients->priority);
else
{
Func* f = new BroFunc(
auto f = make_intrusive<BroFunc>(
ingredients->id.get(),
ingredients->body,
ingredients->inits,
ingredients->frame_size,
ingredients->priority);
ingredients->id->SetVal(make_intrusive<Val>(f));
ingredients->id->SetVal(make_intrusive<Val>(std::move(f)));
ingredients->id->SetConst();
}