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

Migrate Tag classes to use IntrusivePtr

Browse source 
Deprecates various methods that previously took raw pointers
This commit is contained in:
Jon Siwek 2020-05-05 17:10:34 -07:00
parent b096e552d3
commit 1abed4fd4c
20 changed files with 174 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/plugin/ComponentManager.h
View file

@ -52,6 +52,9 @@ public:
/**
* @return The enum type associated with the script-layer "Tag".
*/
const IntrusivePtr<EnumType>& GetTagType() const;
[[deprecated("Remove in v4.1. Use GetTagType() instead.")]]
EnumType* GetTagEnumType() const;
/**
@ -68,6 +71,9 @@ public:
* @param val A component's enum value.
* @return The canonical component name.
*/
const std::string& GetComponentName(IntrusivePtr<EnumVal> val) const;
[[deprecated("Remove in v4.1. Use IntrusivePtr argument instead.")]]
const std::string& GetComponentName(Val* val) const;
/**
@ -156,6 +162,12 @@ std::list<C*> ComponentManager<T, C>::GetComponents() const
return rval;
}
template <class T, class C>
const IntrusivePtr<EnumType>& ComponentManager<T, C>::GetTagType() const
{
return tag_enum_type;
}
template <class T, class C>
EnumType* ComponentManager<T, C>::GetTagEnumType() const
{
@ -180,10 +192,16 @@ const std::string& ComponentManager<T, C>::GetComponentName(T tag) const
return error;
}
template <class T, class C>
const std::string& ComponentManager<T, C>::GetComponentName(IntrusivePtr<EnumVal> val) const
{
return GetComponentName(T(std::move(val)));
}
template <class T, class C>
const std::string& ComponentManager<T, C>::GetComponentName(Val* val) const
{
return GetComponentName(T(val->AsEnumVal()));
return GetComponentName(T({NewRef{}, val->AsEnumVal()}));
}
template <class T, class C>
@ -239,12 +257,12 @@ void ComponentManager<T, C>::RegisterComponent(C* component,
components_by_name.insert(std::make_pair(cname, component));
components_by_tag.insert(std::make_pair(component->Tag(), component));
components_by_val.insert(std::make_pair(
component->Tag().AsEnumVal()->InternalInt(), component));
component->Tag().AsVal()->InternalInt(), component));
// Install an identfier for enum value
std::string id = fmt("%s%s", prefix.c_str(), cname.c_str());
tag_enum_type->AddName(module, id.c_str(),
component->Tag().AsEnumVal()->InternalInt(), true,
component->Tag().AsVal()->InternalInt(), true,
nullptr);
}