Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 23:58: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

12
src/logging/Manager.cc
View file

@ -721,7 +721,7 @@ bool Manager::Write(EnumVal* id, RecordVal* columns_arg)
// See whether the predicates indicates that we want
// to log this record.
int result = 1;
auto v = filter->pred->Call(columns);
auto v = filter->pred->operator()(columns);
if ( v )
result = v->AsBool();
@ -748,9 +748,9 @@ bool Manager::Write(EnumVal* id, RecordVal* columns_arg)
// Can be TYPE_ANY here.
rec_arg = columns;
auto v = filter->path_func->Call(IntrusivePtr{NewRef{}, id},
std::move(path_arg),
std::move(rec_arg));
auto v = filter->path_func->operator()(IntrusivePtr{NewRef{}, id},
std::move(path_arg),
std::move(rec_arg));
if ( ! v )
return false;
@ -1054,7 +1054,7 @@ threading::Value** Manager::RecordToFilterVals(Stream* stream, Filter* filter,
if ( filter->num_ext_fields > 0 )
{
auto res = filter->ext_func->Call(IntrusivePtr{NewRef{}, filter->path_val});
auto res = filter->ext_func->operator()(IntrusivePtr{NewRef{}, filter->path_val});
if ( res )
ext_rec = {AdoptRef{}, res.release()->AsRecordVal()};
@ -1531,7 +1531,7 @@ bool Manager::FinishedRotation(WriterFrontend* writer, const char* new_name, con
// Call the postprocessor function.
int result = 0;
auto v = func->Call(std::move(info));
auto v = func->operator()(std::move(info));
if ( v )
result = v->AsBool();