Deprecate FuncType::ArgTypes(), replace with ParamList()

This commit is contained in:
Jon Siwek 2020-05-15 19:15:24 -07:00
parent 40153cc5cb
commit 83f1a911d7
10 changed files with 21 additions and 15 deletions

View file

@ -269,7 +269,7 @@ IntrusivePtr<Val> Val::SizeVal() const
case TYPE_INTERNAL_OTHER:
if ( type->Tag() == TYPE_FUNC )
return val_mgr->Count(val.func_val->GetType()->ArgTypes()->Types().size());
return val_mgr->Count(val.func_val->GetType()->ParamList()->Types().size());
if ( type->Tag() == TYPE_FILE )
return make_intrusive<Val>(val.file_val->Size(), TYPE_DOUBLE);
@ -2482,7 +2482,7 @@ double TableVal::CallExpireFunc(IntrusivePtr<ListVal> idx)
const Func* f = vf->AsFunc();
zeek::Args vl;
const auto& func_args = f->GetType()->ArgTypes()->Types();
const auto& func_args = f->GetType()->ParamList()->Types();
// backwards compatibility with idx: any idiom
bool any_idiom = func_args.size() == 2 && func_args.back()->Tag() == TYPE_ANY;