From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 21 Feb 2015 12:29:16 +0000 (-0800)
Subject: Use RefCount::dereference() correctly in move assignment
X-Git-Tag: merge-candidate-3-v1~249
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e63f9735e38f624f73275bd39463d2478cc016f;p=thirdparty%2Fsquid.git

Use RefCount::dereference() correctly in move assignment

The dereference() member is actually an update operation on the stored
pointer. We can and should just use it to steal the others pointer
instead of using it on our own then stealing.
---

diff --git a/src/base/RefCount.h b/src/base/RefCount.h
index 32ef2db675..18b6cfb988 100644
--- a/src/base/RefCount.h
+++ b/src/base/RefCount.h
@@ -54,8 +54,7 @@ public:
 
     RefCount& operator = (RefCount&& p) {
         if (this != &p) {
-            dereference(p_);
-            p_ = std::move(p.p_);
+            dereference(p.p_);
             p.p_ = NULL;
         }
         return *this;