Changeset 5825

Timestamp:

Sep 28, 2009, 8:59:34 PM (15 years ago)

Author:

landauf

Message:

small fix in WeakPtr

File:

• code/branches/core5/src/libraries/core/WeakPtr.h (modified) (3 diffs)

code/branches/core5/src/libraries/core/WeakPtr.h

@@ -141 +141 @@
             inline void swap(WeakPtr& other)
             {
+                if (this->base_)
+                    this->base_->unregisterWeakPtr(this);
+                if (other.base_)
+                    other.base_->unregisterWeakPtr(&other);
+                
                 {
                     T* temp = this->pointer_;
@@ -151 +156 @@
                     other.base_ = temp;
                 }
+
+                if (this->base_)
+                    this->base_->registerWeakPtr(this);
+                if (other.base_)
+                    other.base_->registerWeakPtr(&other);
             }
 
@@ -171 +181 @@
             inline void objectDeleted()
             {
-                this->reset();
+                this->base_ = 0;
+                this->pointer_ = 0;
                 if (this->callback_)
                     (*this->callback_)();