Changeset 9738 in orxonox.OLD for branches/new_class_id

Timestamp:

Sep 16, 2006, 12:44:02 PM (18 years ago)

Author:

bensch

Message:

more includes for simpler usage

Location:

branches/new_class_id/src/lib/util/executor

Files:

• executor_const_member.h (copied) (copied from branches/new_class_id/src/lib/util/executor/executor_member.h) (2 diffs)
• executor_functional.h (modified) (1 diff)
• executor_static.h (copied) (copied from branches/new_class_id/src/lib/util/executor/executor_member.h) (1 diff)

branches/new_class_id/src/lib/util/executor/executor_const_member.h

@@ -25 +25 @@
 
 //! The Name to be attached to the functional (for normal, static, and const modes)
-#define __EXECUTOR_FUNCTIONAL_NAME(ParamCount)   Executor##ParamCount##Params
+#define __EXECUTOR_FUNCTIONAL_NAME(ParamCount)   Executor##ParamCount##Params_const
 
 //! if Functional is constant calling
-#define __EXECUTOR_FUNCTIONAL_CONST
+#define __EXECUTOR_FUNCTIONAL_CONST              const
 //! The Execution-mode (either static or objective)
 #define __EXECUTOR_FUNCTIONAL_FUNCTION_EXEC      dynamic_cast<T*>(object)->*(functionPointer)
@@ -34 +34 @@
 #define __EXECUTOR_FUNCTIONAL_FUNCTION_POINTER   T::*functionPointer
 //! The Type of Function
-#define __EXECUTOR_FUNCTIONAL_FUNCTIONTYPE       Executor<CallType, BaseClass>::FunctionDefault
+#define __EXECUTOR_FUNCTIONAL_FUNCTIONTYPE       Executor<CallType, BaseClass>::FunctionConstMember
 
 

branches/new_class_id/src/lib/util/executor/executor_functional.h

@@ -127 +127 @@
  #endif
  #undef __EXECUTOR_FUNCTIONAL_CONST
- #define __EXECUTOR_FUNCTIONAL_CONST const
+ #define __EXECUTOR_FUNCTIONAL_CONST              const
  #undef __EXECUTOR_FUNCTIONAL_FUNCTIONTYPE
  #define __EXECUTOR_FUNCTIONAL_FUNCTIONTYPE       Executor<CallType, BaseClass>::FunctionConstMember
  #undef __EXECUTOR_FUNCTIONAL_NAME
- #define __EXECUTOR_FUNCTIONAL_NAME(ParamCount) Executor##ParamCount##Params_const
+ #define __EXECUTOR_FUNCTIONAL_NAME(ParamCount)   Executor##ParamCount##Params_const
 //#endif /* EXECUTOR_FUNCTIONAL_USE_CONST */
 

branches/new_class_id/src/lib/util/executor/executor_static.h

@@ -25 +25 @@
 
 //! The Name to be attached to the functional (for normal, static, and const modes)
-#define __EXECUTOR_FUNCTIONAL_NAME(ParamCount)   Executor##ParamCount##Params
+#define __EXECUTOR_FUNCTIONAL_NAME(ParamCount)   Executor##ParamCount##Params_static
 
 //! if Functional is constant calling
 #define __EXECUTOR_FUNCTIONAL_CONST
 //! The Execution-mode (either static or objective)
-#define __EXECUTOR_FUNCTIONAL_FUNCTION_EXEC      dynamic_cast<T*>(object)->*(functionPointer)
+#define __EXECUTOR_FUNCTIONAL_FUNCTION_EXEC      functionPointer
 //! The Function-Pointer, and how to save it internally.
-#define __EXECUTOR_FUNCTIONAL_FUNCTION_POINTER   T::*functionPointer
+#define __EXECUTOR_FUNCTIONAL_FUNCTION_POINTER   *functionPointer
 //! The Type of Function
-#define __EXECUTOR_FUNCTIONAL_FUNCTIONTYPE       Executor<CallType, BaseClass>::FunctionDefault
+#define __EXECUTOR_FUNCTIONAL_FUNCTIONTYPE       Executor<CallType, BaseClass>::FunctionStatic