Changeset 9740 in orxonox.OLD for branches/new_class_id/src/lib/util/executor/executor_member.h

Timestamp:

Sep 16, 2006, 1:38:36 PM (18 years ago)

Author:

bensch

Message:

multiple generic inclusion of Executors, better and nicer interface for include

File:

• branches/new_class_id/src/lib/util/executor/executor_member.h (modified) (2 diffs)

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

@@ -23 +23 @@
 
 /// Define all Constructs, that define an Executor.
-
 //! The Name to be attached to the functional (for normal, static, and const modes)
 #define __EXECUTOR_FUNCTIONAL_NAME(ParamCount)   Executor##ParamCount##Params
-
 //! if Functional is constant calling
 #define __EXECUTOR_FUNCTIONAL_CONST
@@ -34 +32 @@
 #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>::FunctionMember
 
 
 /// We want to include __EXECUTOR_GENERIC_H again, with current settings.
-#ifdef __EXECUTOR_GENERIC_H
-#undef __EXECUTOR_GENERIC_H
 #include "executor_generic.h"
 
+
 #undef __EXECUTOR_FUNCTIONAL_NAME
-
 #undef __EXECUTOR_FUNCTIONAL_CONST
 #undef __EXECUTOR_FUNCTIONAL_FUNCTION_EXEC