Changeset 7212 for code/branches/consolecommands3/src/libraries/core/command/Executor.h

Timestamp:

Aug 24, 2010, 4:56:37 PM (14 years ago)

Author:

landauf

Message:

re-implemented Functor - without macros!

File:

• code/branches/consolecommands3/src/libraries/core/command/Executor.h (modified) (2 diffs)

code/branches/consolecommands3/src/libraries/core/command/Executor.h

@@ -163 +163 @@
             MultiType parse(T* object, const std::string& params, bool* success = 0, const std::string& delimiter = " ") const
             {
-                const typename FunctorMember<T>::Objects& objects = this->functorMember_->getObjects();
+                T* oldobject = this->functorMember_->getObject();
 
                 this->functorMember_->setObject(object);
                 const MultiType& result = this->Executor::parse(params, success, delimiter);
-                this->functorMember_->setObjects(objects);
+                this->functorMember_->setObject(oldobject);
 
                 return result;
@@ -174 +174 @@
             MultiType parse(const T* object, const std::string& params, bool* success = 0, const std::string& delimiter = " ") const
             {
-                const typename FunctorMember<T>::Objects& objects = this->functorMember_->getObjects();
+                T* oldobject = this->functorMember_->getObject();
 
                 this->functorMember_->setObject(object);
                 const MultiType& result = this->Executor::parse(params, success, delimiter);
-                this->functorMember_->setObjects(objects);
+                this->functorMember_->setObjects(oldobject);
 
                 return result;