[Orxonox-commit 710] r3242 - branches/netp6/src/core

[landauf at orxonox.net]

Author: landauf
Date: 2009-06-28 17:35:50 +0200 (Sun, 28 Jun 2009)
New Revision: 3242

Modified:
   branches/netp6/src/core/Executor.h
Log:
Added a using declaration to ExecutorMember which hopefully solves your problem, Oli.

Modified: branches/netp6/src/core/Executor.h
===================================================================
--- branches/netp6/src/core/Executor.h	2009-06-28 14:10:03 UTC (rev 3241)
+++ branches/netp6/src/core/Executor.h	2009-06-28 15:35:50 UTC (rev 3242)
@@ -242,6 +242,8 @@
             ExecutorMember(FunctorMember<T>* functor, const std::string& name = "") : Executor(functor, name) {}
             virtual ~ExecutorMember() {}
 
+            using Executor::operator();
+
             inline void operator()(T* object) const
                 { (*((FunctorMember<T>*)this->functor_))(object, this->defaultValue_[0], this->defaultValue_[1], this->defaultValue_[2], this->defaultValue_[3], this->defaultValue_[4]); }
             inline void operator()(T* object, const MultiType& param1) const
@@ -274,6 +276,8 @@
             inline void setObject(const T* object) const
                 { ((FunctorMember<T>*)this->functor_)->setObject(object); }
 
+            using Executor::parse;
+
             bool parse(T* object, const std::string& params, const std::string& delimiter = " ") const
             {
                 EXECUTOR_PARSE(object);