Changeset 10358 for code/branches/core7/src

Timestamp:

Apr 12, 2015, 3:27:09 PM (10 years ago)

Author:

landauf

Message:

removed int constructor & assignment-operator from WeakPtr and SmartPtr

Location:

code/branches/core7/src/libraries/core

Files:

• BaseObject.cc (modified) (1 diff)
• object/SmartPtr.h (modified) (2 diffs)
• object/WeakPtr.h (modified) (2 diffs)

code/branches/core7/src/libraries/core/BaseObject.cc

@@ -86 +86 @@
         {
             this->file_ = 0;
-            this->namespace_ = 0;
-            this->scene_ = 0;
             this->sceneID_ = OBJECTID_UNKNOWN;
-            this->gametype_ = 0;
-            this->level_ = 0;
         }
     }

code/branches/core7/src/libraries/core/object/SmartPtr.h

@@ -142 +142 @@
             }
 
-            /// Constructor: Used to explicitly initialize the smart pointer with a null pointer
-            inline SmartPtr(int) : pointer_(0), base_(0)
-            {
-            }
-
             /// Constructor: Initializes the smart pointer with a pointer to an object. @param pointer The pointer @param bAddRef If true, the reference counter is increased. Don't set this to false unless you know exactly what you're doing! (for example to avoid circular references if the @c this pointer of the possessing object is stored)
             inline SmartPtr(T* pointer, bool bAddRef = true) : pointer_(pointer), base_(pointer)
@@ -182 +177 @@
                 if (this->base_)
                     this->base_->decrementReferenceCount();
-            }
-
-            /// Used to assign a null pointer.
-            inline SmartPtr& operator=(int)
-            {
-                SmartPtr(0).swap(*this);
-                return *this;
             }
 

code/branches/core7/src/libraries/core/object/WeakPtr.h

@@ -104 +104 @@
             }
 
-            /// Constructor: Used to explicitly initialize the weak pointer with a null pointer
-            inline WeakPtr(int) : pointer_(0), base_(0), callback_(0)
-            {
-            }
-
             /// Constructor: Initializes the weak pointer with a pointer to an object.
             inline WeakPtr(T* pointer) : pointer_(pointer), base_(pointer), callback_(0)
@@ -132 +127 @@
             {
                 this->unregisterAsDestructionListener(this->base_);
-            }
-
-            /// Used to assign a null pointer.
-            inline WeakPtr& operator=(int)
-            {
-                WeakPtr(0).swap(*this);
-                return *this;
             }