Changeset 7198 for code/branches/consolecommands3/src/libraries/core/WeakPtr.h

Timestamp:

Aug 21, 2010, 9:52:13 PM (14 years ago)

Author:

landauf

Message:

createFunctor() now returns a SharedPtr instead of a pointer. Adapted code that uses createFunctor() accordingly.

File:

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

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

@@ -77 +77 @@
                 if (this->base_)
                     this->base_->unregisterWeakPtr(this);
-                if (this->callback_)
-                    delete this->callback_;
 
             }
@@ -168 +166 @@
             }
 
-            inline void setCallback(Functor* callback)
+            inline void setCallback(const FunctorPtr& callback)
             {
                 this->callback_ = callback;
             }
 
-            inline Functor* getFunctor() const
+            inline const FunctorPtr& getCallback() const
             {
                 return this->callback_;
@@ -189 +187 @@
             T* pointer_;
             OrxonoxClass* base_;
-            Functor* callback_;
+            FunctorPtr callback_;
     };