Changeset 7850

Timestamp:

Feb 10, 2011, 10:26:46 PM (14 years ago)

Author:

landauf

Message:

moved if(object) condition from WeakPtr to DestructionListener

Location:

code/trunk/src/libraries/core

Files:

• OrxonoxClass.h (modified) (1 diff)
• WeakPtr.h (modified) (6 diffs)

code/trunk/src/libraries/core/OrxonoxClass.h

@@ -195 +195 @@
         protected:
             inline void registerAsDestructionListener(OrxonoxClass* object)
-                { object->registerDestructionListener(this); }
+                { if (object) { object->registerDestructionListener(this); } }
             inline void unregisterAsDestructionListener(OrxonoxClass* object)
-                { object->unregisterDestructionListener(this); }
+                { if (object) { object->unregisterDestructionListener(this); } }
 
             virtual void objectDeleted() = 0;

code/trunk/src/libraries/core/WeakPtr.h

@@ -112 +112 @@
             inline WeakPtr(T* pointer) : pointer_(pointer), base_(pointer), callback_(0)
             {
-                if (this->base_)
-                    this->registerAsDestructionListener(this->base_);
+                this->registerAsDestructionListener(this->base_);
             }
 
@@ -119 +118 @@
             inline WeakPtr(const WeakPtr& other) : pointer_(other.pointer_), base_(other.base_), callback_(0)
             {
-                if (this->base_)
-                    this->registerAsDestructionListener(this->base_);
+                this->registerAsDestructionListener(this->base_);
             }
 
@@ -127 +125 @@
             inline WeakPtr(const WeakPtr<O>& other) : pointer_(other.get()), base_(other.base_), callback_(0)
             {
-                if (this->base_)
-                    this->registerAsDestructionListener(this->base_);
+                this->registerAsDestructionListener(this->base_);
             }
 
@@ -134 +131 @@
             inline ~WeakPtr()
             {
-                if (this->base_)
-                    this->unregisterAsDestructionListener(this->base_);
-
+                this->unregisterAsDestructionListener(this->base_);
             }
 
@@ -209 +204 @@
             inline void swap(WeakPtr& other)
             {
-                if (this->base_)
-                    this->unregisterAsDestructionListener(this->base_);
-                if (other.base_)
-                    other.unregisterAsDestructionListener(other.base_);
+                this->unregisterAsDestructionListener(this->base_);
+                other.unregisterAsDestructionListener(other.base_);
 
                 {
@@ -225 +218 @@
                 }
 
-                if (this->base_)
-                    this->registerAsDestructionListener(this->base_);
-                if (other.base_)
-                    other.registerAsDestructionListener(other.base_);
+                this->registerAsDestructionListener(this->base_);
+                other.registerAsDestructionListener(other.base_);
             }