mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 06:38:20 +00:00
Merge remote-tracking branch 'origin/topic/timw/266-namespaces-part5'
- Did a few whitespace re-adjustments during merge * origin/topic/timw/266-namespaces-part5: Update plugin btests for namespace changes Plugins: Clean up explicit uses of namespaces in places where they're not necessary. Base: Clean up explicit uses of namespaces in places where they're not necessary.
This commit is contained in:
commit
427a7de411
454 changed files with 10363 additions and 10255 deletions
|
@ -50,7 +50,7 @@ std::string Attr::DeprecationMessage() const
|
|||
if ( ! expr )
|
||||
return "";
|
||||
|
||||
auto ce = static_cast<zeek::detail::ConstExpr*>(expr.get());
|
||||
auto ce = static_cast<ConstExpr*>(expr.get());
|
||||
return ce->Value()->AsStringVal()->CheckString();
|
||||
}
|
||||
|
||||
|
@ -164,7 +164,7 @@ Attributes::Attributes(AttrPList* a, TypePtr t, bool arg_in_record, bool is_glob
|
|||
// the necessary checking gets done.
|
||||
|
||||
for ( const auto& attr : *a )
|
||||
AddAttr({zeek::NewRef{}, attr});
|
||||
AddAttr({NewRef{}, attr});
|
||||
|
||||
delete a;
|
||||
}
|
||||
|
@ -209,7 +209,7 @@ void Attributes::AddAttr(AttrPtr attr)
|
|||
if ( (attr->Tag() == ATTR_ADD_FUNC || attr->Tag() == ATTR_DEL_FUNC) &&
|
||||
! Find(ATTR_REDEF) )
|
||||
{
|
||||
auto a = zeek::make_intrusive<Attr>(ATTR_REDEF);
|
||||
auto a = make_intrusive<Attr>(ATTR_REDEF);
|
||||
attrs_list.push_back(a.get());
|
||||
attrs.emplace_back(std::move(a));
|
||||
}
|
||||
|
@ -218,7 +218,7 @@ void Attributes::AddAttr(AttrPtr attr)
|
|||
if ( ! global_var && attr->Tag() == ATTR_DEFAULT &&
|
||||
! Find(ATTR_OPTIONAL) )
|
||||
{
|
||||
auto a = zeek::make_intrusive<Attr>(ATTR_OPTIONAL);
|
||||
auto a = make_intrusive<Attr>(ATTR_OPTIONAL);
|
||||
attrs_list.push_back(a.get());
|
||||
attrs.emplace_back(std::move(a));
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue