From: Automatic source maintenance Date: Tue, 31 Aug 2010 00:14:13 +0000 (-0600) Subject: Bootstrapped X-Git-Tag: take1~314 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6cb816e53cb83bfb6c81c2e1c8d80886a9b2e06f;p=thirdparty%2Fsquid.git Bootstrapped --- diff --git a/src/base/CbcPointer.h b/src/base/CbcPointer.h index 1283327022..ef93009e5f 100644 --- a/src/base/CbcPointer.h +++ b/src/base/CbcPointer.h @@ -49,10 +49,10 @@ public: template CbcPointer &operator =(const CbcPointer &o) { if (this != &o) { // assignment to self - clear(); - cbc = o.raw(); // so that set() is accurate - if (o.valid()) - lock = cbdataReference(o->toCbdata()); + clear(); + cbc = o.raw(); // so that set() is accurate + if (o.valid()) + lock = cbdataReference(o->toCbdata()); } return *this; } @@ -104,10 +104,10 @@ template CbcPointer &CbcPointer::operator =(const CbcPointer &d) { if (this != &d) { // assignment to self - clear(); - cbc = d.cbc; - if (d.lock && cbdataReferenceValid(d.lock)) - lock = cbdataReference(d.lock); + clear(); + cbc = d.cbc; + if (d.lock && cbdataReferenceValid(d.lock)) + lock = cbdataReference(d.lock); } return *this; }