[Orxonox-commit 3387] r8074 - code/branches/kicklib/src/libraries/core/command

rgrieder at orxonox.net rgrieder at orxonox.net
Mon Mar 14 04:20:15 CET 2011


Author: rgrieder
Date: 2011-03-14 04:20:15 +0100 (Mon, 14 Mar 2011)
New Revision: 8074

Modified:
   code/branches/kicklib/src/libraries/core/command/Functor.h
Log:
Build fix required by merge.

Modified: code/branches/kicklib/src/libraries/core/command/Functor.h
===================================================================
--- code/branches/kicklib/src/libraries/core/command/Functor.h	2011-03-14 03:08:06 UTC (rev 8073)
+++ code/branches/kicklib/src/libraries/core/command/Functor.h	2011-03-14 03:20:15 UTC (rev 8074)
@@ -243,7 +243,6 @@
             /// Constructor: Stores the object-pointer.
             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)
             virtual MultiType operator()(O* object, const MultiType& param1 = MT_Type::Null, const MultiType& param2 = MT_Type::Null, const MultiType& param3 = MT_Type::Null, const MultiType& param4 = MT_Type::Null, const MultiType& param5 = MT_Type::Null) = 0;




More information about the Orxonox-commit mailing list