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

IntrusivePtr: eliminate setPtr()

Browse source 
There are only two call sites, and those hard-code the `add_ref`
parameter.
This commit is contained in:
Max Kellermann 2020-02-25 20:53:48 +01:00
parent 6f3e9d2c4c
commit 4dbc224e21
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/IntrusivePtr.h
View file

@ -71,9 +71,9 @@ public:
* *
* @param raw_ptr Pointer to the shared object. * @param raw_ptr Pointer to the shared object.
*/ */
IntrusivePtr(AdoptRef, pointer raw_ptr) noexcept constexpr IntrusivePtr(AdoptRef, pointer raw_ptr) noexcept
: ptr_(raw_ptr)
{ {
setPtr(raw_ptr, false);
} }
/** /**
@ -85,8 +85,10 @@ public:
* @param raw_ptr Pointer to the shared object. * @param raw_ptr Pointer to the shared object.
*/ */
IntrusivePtr(NewRef, pointer raw_ptr) noexcept IntrusivePtr(NewRef, pointer raw_ptr) noexcept
: ptr_(raw_ptr)
{ {
setPtr(raw_ptr, true); if ( ptr_ )
Ref(ptr_);
} }
IntrusivePtr(IntrusivePtr&& other) noexcept : ptr_(other.release()) IntrusivePtr(IntrusivePtr&& other) noexcept : ptr_(other.release())
@ -158,13 +160,6 @@ public:
} }
private: private:
void setPtr(pointer raw_ptr, bool add_ref) noexcept
{
ptr_ = raw_ptr;
if ( raw_ptr && add_ref )
Ref(raw_ptr);
}
pointer ptr_ = nullptr; pointer ptr_ = nullptr;
}; };