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

Switch Func::Call(val_list*) back to returning Val*

Browse source 
And renamed the method returning IntrusivePtr to operator().
This corrects the deprecation process for Func::Call(val_list*).
This commit is contained in:
Jon Siwek 2020-05-20 18:41:59 -07:00
parent 85a0ddd62d
commit 087a0f3636
15 changed files with 43 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Val.cc
View file

@ -1869,7 +1869,7 @@ IntrusivePtr<Val> TableVal::Default(const IntrusivePtr<Val>& index)
try
{
result = f->Call(vl);
result = f->operator()(vl);
}
catch ( InterpreterException& e )
@ -2080,7 +2080,7 @@ void TableVal::CallChangeFunc(const Val* index, Val* old_value, OnChangeType tpe
vl.emplace_back(NewRef{}, old_value);
in_change_func = true;
f->Call(vl);
f->operator()(vl);
}
catch ( InterpreterException& e )
{
@ -2538,7 +2538,7 @@ double TableVal::CallExpireFunc(IntrusivePtr<ListVal> idx)
vl.emplace_back(std::move(idx));
}
auto result = f->Call(vl);
auto result = f->operator()(vl);
if ( result )
secs = result->AsInterval();