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

Deprecate Val(Func*) ctor, replace with one using IntrusivePtr

Browse source
This commit is contained in:
Jon Siwek 2020-05-15 16:24:53 -07:00
parent 4a2221b878
commit a031f5b727
7 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Func.h
View file

@ -93,8 +93,11 @@ public:
virtual TraversalCode Traverse(TraversalCallback* cb) const;
uint32_t GetUniqueFuncID() const { return unique_id; }
static Func* GetFuncPtrByID(uint32_t id)
{ return id >= unique_ids.size() ? nullptr : unique_ids[id]; }
static const IntrusivePtr<Func>& GetFuncPtrByID(uint32_t id)
{
static IntrusivePtr<Func> nil;
return id >= unique_ids.size() ? nil : unique_ids[id];
}
protected:
Func();
@ -111,7 +114,7 @@ protected:
uint32_t unique_id;
IntrusivePtr<BroType> type;
std::string name;
static std::vector<Func*> unique_ids;
static inline std::vector<IntrusivePtr<Func>> unique_ids;
};