Avoid clang-tidy false positives for intrusive_ptr

zeek · Nov 27, 2024 · 2c69607 · 2c69607
1 parent 10afbbc
commit 2c69607
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/libcaf_core/caf/intrusive_ptr.hpp b/libcaf_core/caf/intrusive_ptr.hpp
@@ -103,10 +103,12 @@ class intrusive_ptr {
   /// Returns the raw pointer without modifying reference
   /// count and sets this to `nullptr`.
   pointer detach() noexcept {
-    auto result = ptr_;
-    if (result)
+    if (ptr_ != nullptr) {
+      auto result = ptr_;
       ptr_ = nullptr;
-    return result;
+      return result;
+    }
+    return nullptr;
   }
 
   /// Returns the raw pointer without modifying reference
@@ -116,10 +118,8 @@ class intrusive_ptr {
   }
 
   void reset(pointer new_value = nullptr, bool add_ref = true) noexcept {
-    auto old = ptr_;
-    set_ptr(new_value, add_ref);
-    if (old)
-      intrusive_ptr_access<T>::release(old);
+    intrusive_ptr tmp{new_value, add_ref};
+    swap(tmp);
   }
 
   template <class... Ts>