Changeset 7717 in orxonox.OLD

Timestamp:

May 19, 2006, 2:51:00 AM (18 years ago)

Author:

bensch

Message:

trunk: clone-functions

Location:

trunk/src

Files:

• lib/util/executor/executor_functional.h (modified) (6 diffs)
• orxonox.cc (modified) (1 diff)

trunk/src/lib/util/executor/executor_functional.h

@@ -91 +91 @@
     this->functorType = Executor_Objective;
     this->functionPointer = functionPointer;
-  }
+  };
+
   virtual void operator()(BaseObject* object, const SubString& sub = SubString()) const
   {
@@ -97 +98 @@
   };
 
-  Executor* clone() const { };
+  virtual Executor* clone() const {
+    return new __EXECUTOR_FUNCTIONAL_NAME(0)<T>(this->functionPointer);
+  };
 };
 
@@ -112 +115 @@
     this->functorType = Executor_Objective;
     this->functionPointer = functionPointer;
-  }
+  };
+
   virtual void operator()(BaseObject* object, const SubString& sub = SubString()) const
   {
@@ -125 +129 @@
   };
 
-  virtual Executor* clone() const {};
+  virtual Executor* clone() const {
+    return  new __EXECUTOR_FUNCTIONAL_NAME(1)<T, type0>(this->functionPointer);
+  };
 };
 
@@ -140 +146 @@
     this->functorType = Executor_Objective;
     this->functionPointer = functionPointer;
-  }
+  };
+
   virtual void operator()(BaseObject* object, const SubString& sub = SubString()) const
   {
@@ -148 +155 @@
   };
 
-  virtual Executor* clone() const {};
+  virtual Executor* clone() const {
+    return new __EXECUTOR_FUNCTIONAL_NAME(2)<T, type0, type1>(this->functionPointer);
+  };
 };
 

trunk/src/orxonox.cc

@@ -435 +435 @@
 };
 
-template<class T> Executor* createExecutorStatic(void (*functionPointer)())
- {
-   return new Executor0Params_static<TestClass>(functionPointer);
- }
-
 void TEST()
 {