Changeset 7718 in orxonox.OLD for trunk/src

Timestamp:

May 19, 2006, 3:02:29 AM (19 years ago)

Author:

bensch

Message:

trunk: functionality almost reached

Location:

trunk/src

Files:

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

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

@@ -164 +164 @@
 /// HACK !! THESE WILL BE RESET AGAIN !!
 
-template<class T> Executor* createExecutor(void (__EXECUTOR_FUNCTIONAL_FUNCTION_POINTER)() __EXECUTOR_FUNCTIONAL_CONST)
-{
-  return new __EXECUTOR_FUNCTIONAL_NAME(0)<T>(functionPointer);
+
+#define EXECUTOR_FUNCTIONAL_CREATOR0() \
+template<class T> Executor* createExecutor(void (__EXECUTOR_FUNCTIONAL_FUNCTION_POINTER)() __EXECUTOR_FUNCTIONAL_CONST) \
+{ \
+  return new __EXECUTOR_FUNCTIONAL_NAME(0)<T>(functionPointer); \
 }
-template<class T> Executor* createExecutor(void (__EXECUTOR_FUNCTIONAL_FUNCTION_POINTER)(bool) __EXECUTOR_FUNCTIONAL_CONST)
-{
-  return new __EXECUTOR_FUNCTIONAL_NAME(1)<T, bool>(functionPointer);
+
+#define EXECUTOR_FUNCTIONAL_CREATOR1(type0) \
+template<class T> Executor* createExecutor(void (__EXECUTOR_FUNCTIONAL_FUNCTION_POINTER)(type0##_TYPE) __EXECUTOR_FUNCTIONAL_CONST) \
+{ \
+  return new __EXECUTOR_FUNCTIONAL_NAME(1)<T, type0##_TYPE>(functionPointer); \
 }
-template<class T> Executor* createExecutor(void (__EXECUTOR_FUNCTIONAL_FUNCTION_POINTER)(int) __EXECUTOR_FUNCTIONAL_CONST)
-{
-  return new __EXECUTOR_FUNCTIONAL_NAME(1)<T, int>(functionPointer);
+
+#define EXECUTOR_FUNCTIONAL_CREATOR2(type0, type1) \
+template<class T> Executor* createExecutor(void (__EXECUTOR_FUNCTIONAL_FUNCTION_POINTER)(type0##_TYPE, type1##_TYPE) __EXECUTOR_FUNCTIONAL_CONST) \
+{ \
+  return new __EXECUTOR_FUNCTIONAL_NAME(2)<T, type0##_TYPE, type1##_TYPE>(functionPointer); \
 }
-template<class T> Executor* createExecutor(void (__EXECUTOR_FUNCTIONAL_FUNCTION_POINTER)(bool, int) __EXECUTOR_FUNCTIONAL_CONST)
-{
-  return new __EXECUTOR_FUNCTIONAL_NAME(2)<T, bool, int>(functionPointer);
-}
+
+#define EXECUTOR_FUNCTIONAL_CREATOR3(type0, type1, type2)
+#define EXECUTOR_FUNCTIONAL_CREATOR4(type0, type1, type2, type3)
+#define EXECUTOR_FUNCTIONAL_CREATOR5(type0, type1, type2, type3, type4)
+
+
+
+#define FUNCTOR_LIST(x) EXECUTOR_FUNCTIONAL_CREATOR ## x
+#include "functor_list.h"
+#undef FUNCTOR_LIST
+
 
 

trunk/src/orxonox.cc

@@ -430 +430 @@
   void printTestInt(int i) { printf ("%d\n", i); };
   void printTestBool(bool b) { printf("%d\n", (int)b); };
-  void printTwoVals(bool b, int i) { printf ("%d %d\n", b, i); };
+  void printTwoVals(int b, int i) { printf ("%d %d\n", b, i); };
 
   static void printStatic() { printf("STATIC\n");};