From b80f85167448bf4769e30e9ad4f00477b1069b51 Mon Sep 17 00:00:00 2001 From: fanxiaoyu Date: Tue, 22 Nov 2022 00:58:49 +0000 Subject: [PATCH] fixed 15a44a7 from https://gitee.com/shufewhx/commonlibrary_c_utils/pulls/144 Revert new interface Signed-off-by: fanxiaoyu --- base/include/refbase.h | 2 -- base/src/refbase.cpp | 7 +------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/base/include/refbase.h b/base/include/refbase.h index e7df34a..8122d81 100644 --- a/base/include/refbase.h +++ b/base/include/refbase.h @@ -188,8 +188,6 @@ public: WeakRefCounter *CreateWeakRef(void *cookie); - RefCounter *GetRefCounter() const; - void IncWeakRef(const void *objectId); void DecWeakRef(const void *objectId); diff --git a/base/src/refbase.cpp b/base/src/refbase.cpp index ad5665e..fb46127 100644 --- a/base/src/refbase.cpp +++ b/base/src/refbase.cpp @@ -361,7 +361,7 @@ bool RefCounter::AttemptIncStrong(const void *objectId) if (atomicStrong_.compare_exchange_weak(curCount, curCount + 1, std::memory_order_relaxed)) { break; } - // curCount has been updated. + curCount = atomicStrong_.load(std::memory_order_relaxed); } if (curCount <= 0) { DecWeakRefCount(objectId); @@ -511,11 +511,6 @@ void RefBase::IncWeakRef(const void *objectId) } } -RefCounter *RefBase::GetRefCounter() const -{ - return refs_; -} - void RefBase::DecWeakRef(const void *objectId) { if (refs_ != nullptr) { -- Gitee