Changeset 7284 for code/trunk/src/libraries/core/WeakPtr.h
- Timestamp:
- Aug 31, 2010, 3:37:40 AM (14 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/libraries/core/WeakPtr.h
r7268 r7284 37 37 #include "Identifier.h" 38 38 #include "OrxonoxClass.h" 39 #include " Functor.h"39 #include "command/Functor.h" 40 40 41 41 namespace orxonox … … 78 78 if (this->base_) 79 79 this->base_->unregisterWeakPtr(this); 80 if (this->callback_)81 delete this->callback_;82 80 83 81 } … … 169 167 } 170 168 171 inline void setCallback( Functor*callback)169 inline void setCallback(const FunctorPtr& callback) 172 170 { 173 171 this->callback_ = callback; 174 172 } 175 173 176 inline Functor* getFunctor() const174 inline const FunctorPtr& getCallback() const 177 175 { 178 176 return this->callback_; … … 190 188 T* pointer_; 191 189 OrxonoxClass* base_; 192 Functor *callback_;190 FunctorPtr callback_; 193 191 }; 194 192
Note: See TracChangeset
for help on using the changeset viewer.