Changeset 8071 for code/branches/kicklib/src/libraries/core/command

Timestamp:

Mar 14, 2011, 3:53:38 AM (14 years ago)

Author:

rgrieder

Message:

Merged ois_update branch (before it was renamed to mac_osx) into kicklib branch.

Location:

code/branches/kicklib

Files:

• . (modified) (1 prop)
• src/libraries/core/command/Functor.h (modified) (1 diff)

code/branches/kicklib/src/libraries/core/command/Functor.h

@@ -244 +244 @@
             FunctorMember(O* object = 0) : object_(object), bSafeMode_(false) {}
             virtual ~FunctorMember() { if (this->bSafeMode_) { this->unregisterObject(this->object_); } }
+            virtual ~FunctorMember() {}
 
             /// Calls the function-pointer with up to five arguments and an object. In case of a static-function, the object can be NULL. @return Returns the return-value of the function (if any; MT_Type::Null otherwise)