From: Benjamin Kramer Date: Thu, 31 May 2012 22:25:25 +0000 (+0000) Subject: IntrusiveRefCntPtr: Simplify operator= as suggested by Richard Smith. X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=91a8ad71aa5d08e37a8a4ed364d0dae720d8ea7c;p=oota-llvm.git IntrusiveRefCntPtr: Simplify operator= as suggested by Richard Smith. This way the constructors do all the hard work. No intended functionality change. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@157773 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/ADT/IntrusiveRefCntPtr.h b/include/llvm/ADT/IntrusiveRefCntPtr.h index 37018d95e60..0c02a8f3185 100644 --- a/include/llvm/ADT/IntrusiveRefCntPtr.h +++ b/include/llvm/ADT/IntrusiveRefCntPtr.h @@ -140,32 +140,8 @@ namespace llvm { retain(); } - IntrusiveRefCntPtr& operator=(const IntrusiveRefCntPtr& S) { - replace(S.getPtr()); - return *this; - } - -#if LLVM_USE_RVALUE_REFERENCES - IntrusiveRefCntPtr& operator=(IntrusiveRefCntPtr&& S) { - this_type(std::move(S)).swap(*this); - return *this; - } - - template - IntrusiveRefCntPtr& operator=(IntrusiveRefCntPtr&& S) { - this_type(std::move(S)).swap(*this); - return *this; - } -#endif - - template - IntrusiveRefCntPtr& operator=(const IntrusiveRefCntPtr& S) { - replace(S.getPtr()); - return *this; - } - - IntrusiveRefCntPtr& operator=(T * S) { - replace(S); + IntrusiveRefCntPtr& operator=(IntrusiveRefCntPtr S) { + swap(S); return *this; } @@ -200,10 +176,6 @@ namespace llvm { private: void retain() { if (Obj) IntrusiveRefCntPtrInfo::retain(Obj); } void release() { if (Obj) IntrusiveRefCntPtrInfo::release(Obj); } - - void replace(T* S) { - this_type(S).swap(*this); - } }; template