Changeset 7715 in orxonox.OLD for trunk/src/orxonox.cc

Timestamp:

May 19, 2006, 1:48:12 AM (18 years ago)

Author:

bensch

Message:

trunk: mighty templates

File:

• trunk/src/orxonox.cc (modified) (3 diffs)

trunk/src/orxonox.cc

@@ -444 +444 @@
 template<class T> class Executor0Params : public Executor
 {
-  private:
-    void (T::*functionPointer)();
-
-  public:
-    Executor0Params (void (T::*functionPointer)())
-  : Executor()
-    {
-      this->functorType = Executor_Objective;
-      this->functionPointer = functionPointer;
-    }
-    virtual void operator()(BaseObject* object, const SubString& sub = SubString()) const
-    {
-      (dynamic_cast<T*>(object)->*functionPointer)();
-    };
-
-    Executor* clone() const {};
+private:
+  void (T::*functionPointer)();
+
+public:
+  Executor0Params (void (T::*functionPointer)())
+      : Executor()
+  {
+    this->functorType = Executor_Objective;
+    this->functionPointer = functionPointer;
+  }
+  virtual void operator()(BaseObject* object, const SubString& sub = SubString()) const
+  {
+    (dynamic_cast<T*>(object)->*functionPointer)();
+  };
+
+  Executor* clone() const {};
 };
 
@@ -512 +512 @@
 };
 
+
+template<class T> Executor* createExecutor(void (T::*functionPointer)())
+{
+  return new Executor0Params<T>(functionPointer);
+}
+template<class T> Executor* createExecutor(void (T::*functionPointer)(bool))
+{
+  return new Executor1Params<T, bool>(functionPointer);
+}
+template<class T> Executor* createExecutor(void (T::*functionPointer)(int))
+{
+  return new Executor1Params<T, int>(functionPointer);
+}
+template<class T> Executor* createExecutor(void (T::*functionPointer)(bool, int))
+{
+  return new Executor2Params<T, bool, int>(functionPointer);
+}
+
+
 class TestClass : public BaseObject
 {
@@ -527 +546 @@
   TestClass test;
   SubString testStrings("1, 2, 3", ",", SubString::WhiteSpaces, false);
-  (Executor0Params<TestClass>(&TestClass::printTest))(&test, testStrings);
-  (Executor1Params<TestClass,int>(&TestClass::printTestInt))(&test, testStrings);
-  (Executor1Params<TestClass,bool>(&TestClass::printTestBool))(&test, testStrings);
-  (Executor2Params<TestClass,bool, int>(&TestClass::printTwoVals))(&test, testStrings);
+  (*createExecutor(&TestClass::printTest))(&test, testStrings);
+  (*createExecutor(&TestClass::printTestInt))(&test, testStrings);
+  (*createExecutor(&TestClass::printTestBool))(&test, testStrings);
+  (*createExecutor(&TestClass::printTwoVals))(&test, testStrings);
 
 }