Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9738 in orxonox.OLD for branches


Ignore:
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:
1 edited
2 copied

Legend:

Unmodified
Added
Removed
  • branches/new_class_id/src/lib/util/executor/executor_const_member.h

    r9737 r9738  
    2525
    2626//! The Name to be attached to the functional (for normal, static, and const modes)
    27 #define __EXECUTOR_FUNCTIONAL_NAME(ParamCount)   Executor##ParamCount##Params
     27#define __EXECUTOR_FUNCTIONAL_NAME(ParamCount)   Executor##ParamCount##Params_const
    2828
    2929//! if Functional is constant calling
    30 #define __EXECUTOR_FUNCTIONAL_CONST
     30#define __EXECUTOR_FUNCTIONAL_CONST              const
    3131//! The Execution-mode (either static or objective)
    3232#define __EXECUTOR_FUNCTIONAL_FUNCTION_EXEC      dynamic_cast<T*>(object)->*(functionPointer)
     
    3434#define __EXECUTOR_FUNCTIONAL_FUNCTION_POINTER   T::*functionPointer
    3535//! The Type of Function
    36 #define __EXECUTOR_FUNCTIONAL_FUNCTIONTYPE       Executor<CallType, BaseClass>::FunctionDefault
     36#define __EXECUTOR_FUNCTIONAL_FUNCTIONTYPE       Executor<CallType, BaseClass>::FunctionConstMember
    3737
    3838
  • branches/new_class_id/src/lib/util/executor/executor_functional.h

    r9737 r9738  
    127127 #endif
    128128 #undef __EXECUTOR_FUNCTIONAL_CONST
    129  #define __EXECUTOR_FUNCTIONAL_CONST const
     129 #define __EXECUTOR_FUNCTIONAL_CONST              const
    130130 #undef __EXECUTOR_FUNCTIONAL_FUNCTIONTYPE
    131131 #define __EXECUTOR_FUNCTIONAL_FUNCTIONTYPE       Executor<CallType, BaseClass>::FunctionConstMember
    132132 #undef __EXECUTOR_FUNCTIONAL_NAME
    133  #define __EXECUTOR_FUNCTIONAL_NAME(ParamCount) Executor##ParamCount##Params_const
     133 #define __EXECUTOR_FUNCTIONAL_NAME(ParamCount)   Executor##ParamCount##Params_const
    134134//#endif /* EXECUTOR_FUNCTIONAL_USE_CONST */
    135135
  • branches/new_class_id/src/lib/util/executor/executor_static.h

    r9737 r9738  
    2525
    2626//! The Name to be attached to the functional (for normal, static, and const modes)
    27 #define __EXECUTOR_FUNCTIONAL_NAME(ParamCount)   Executor##ParamCount##Params
     27#define __EXECUTOR_FUNCTIONAL_NAME(ParamCount)   Executor##ParamCount##Params_static
    2828
    2929//! if Functional is constant calling
    3030#define __EXECUTOR_FUNCTIONAL_CONST
    3131//! The Execution-mode (either static or objective)
    32 #define __EXECUTOR_FUNCTIONAL_FUNCTION_EXEC      dynamic_cast<T*>(object)->*(functionPointer)
     32#define __EXECUTOR_FUNCTIONAL_FUNCTION_EXEC      functionPointer
    3333//! The Function-Pointer, and how to save it internally.
    34 #define __EXECUTOR_FUNCTIONAL_FUNCTION_POINTER   T::*functionPointer
     34#define __EXECUTOR_FUNCTIONAL_FUNCTION_POINTER   *functionPointer
    3535//! The Type of Function
    36 #define __EXECUTOR_FUNCTIONAL_FUNCTIONTYPE       Executor<CallType, BaseClass>::FunctionDefault
     36#define __EXECUTOR_FUNCTIONAL_FUNCTIONTYPE       Executor<CallType, BaseClass>::FunctionStatic
    3737
    3838
Note: See TracChangeset for help on using the changeset viewer.