diff --git a/ctl/shared_ptr.cc b/ctl/shared_ptr.cc index ae8e4e75d..3da50a074 100644 --- a/ctl/shared_ptr.cc +++ b/ctl/shared_ptr.cc @@ -53,28 +53,28 @@ namespace ctl { namespace __ { void -shared_control::add_shared() noexcept +shared_control::keep_shared() noexcept { incref(&shared); } void -shared_control::release_shared() noexcept +shared_control::drop_shared() noexcept { if (decref(&shared)) { on_zero_shared(); - release_weak(); + drop_weak(); } } void -shared_control::add_weak() noexcept +shared_control::keep_weak() noexcept { incref(&weak); } void -shared_control::release_weak() noexcept +shared_control::drop_weak() noexcept { if (decref(&weak)) on_zero_weak(); diff --git a/ctl/shared_ptr.h b/ctl/shared_ptr.h index bd96dde50..c23e8281e 100644 --- a/ctl/shared_ptr.h +++ b/ctl/shared_ptr.h @@ -32,10 +32,10 @@ struct shared_control { } - void add_shared() noexcept; - void release_shared() noexcept; - void add_weak() noexcept; - void release_weak() noexcept; + void keep_shared() noexcept; + void drop_shared() noexcept; + void keep_weak() noexcept; + void drop_weak() noexcept; size_t use_count() const noexcept; size_t weak_count() const noexcept; @@ -101,7 +101,7 @@ class shared_ptr shared_ptr(const shared_ptr& r) noexcept : p(r.p), ctl(r.ctl) { if (ctl) - ctl->add_shared(); + ctl->keep_shared(); } shared_ptr(shared_ptr&& r) noexcept : p(r.p), ctl(r.ctl) @@ -114,7 +114,7 @@ class shared_ptr shared_ptr(const shared_ptr& r, T* const p) noexcept : p(p), ctl(r.ctl) { if (ctl) - ctl->add_shared(); + ctl->keep_shared(); } template @@ -129,7 +129,7 @@ class shared_ptr ~shared_ptr() { if (ctl) - ctl->release_shared(); + ctl->drop_shared(); } shared_ptr& operator=(shared_ptr r) noexcept @@ -141,7 +141,7 @@ class shared_ptr void reset() noexcept { if (ctl) - ctl->release_shared(); + ctl->drop_shared(); p = nullptr; ctl = nullptr; }