Changeset 7211 in orxonox.OLD for branches/std/src/lib/util/executor/executor.h

Timestamp:

Mar 10, 2006, 4:52:21 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: new SubString class

File:

• branches/std/src/lib/util/executor/executor.h (modified) (4 diffs)

branches/std/src/lib/util/executor/executor.h

@@ -16 +16 @@
 //! an enumerator for the definition of the Type.
 typedef enum {
-  Executor_Objective         = 0x00000001,
-  Executor_Static            = 0x00000002,
-
-  Executor_NoLoadString      = 0x00000010,
+  Executor_Objective         = 1,
+  Executor_Static            = 2,
+
+  Executor_NoLoadString      = 8,
 } Executor_Type;
 
@@ -192 +192 @@
 #define ExecutorExecute1(t1) \
    else if (this->paramCount == 1 && this->defaultValue[0] == t1##_PARAM) \
-    EXECUTOREXECUTER(_1_##t1)(t1##_FUNC((const char*)parameters, t1##_DEFGRAB(0)))
+    EXECUTOREXECUTER(_1_##t1)(t1##_FUNC(sub.getString(0), t1##_DEFGRAB(0)))
 
 //! execute-macro for functions with two parameters
@@ -270 +270 @@
     virtual void execute (BaseObject* object, const void* parameters = NULL)
     {
-      SubString sub(((const std::string*) parameters)->c_str(), " \n\t,", '\\');
+      SubString sub((const char*)parameters, " \n\t", '\\');
 //! FUNCTOR_LIST is the List of Executive Functions
 #define FUNCTOR_LIST(x) ExecutorExecute ## x
@@ -332 +332 @@
     virtual void execute (BaseObject* object, const void* parameters = NULL)
     {
-  SubString sub((const char*)parameters, " \n\t,");
+      SubString sub(((const char*)parameters), " \n\t,");
 //! FUNCTOR_LIST is the List of Executive Functions
 #define FUNCTOR_LIST(x) ExecutorExecute ## x