Changeset 7216 in orxonox.OLD for branches/std/src/lib/util

Timestamp:

Mar 12, 2006, 8:54:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/std:: compile and run again, with many more std::strings….

Location:

branches/std/src/lib/util

Files:

• executor/executor.h (modified) (1 diff)
• executor/functor_list.h (modified) (2 diffs)
• helper_functions.cc (modified) (1 diff)
• loading/load_param.cc (modified) (1 diff)

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

@@ -271 +271 @@
     {
       SubString sub;
-      printf("===%s\n", parameters.c_str());
       sub.split(parameters, " \n\t,", '\\');
-      sub.debug();
 //! FUNCTOR_LIST is the List of Executive Functions
 #define FUNCTOR_LIST(x) ExecutorExecute ## x

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

@@ -98 +98 @@
 
   FUNCTOR_LIST(0)();
-  //! makes functions with one cstring
-  FUNCTOR_LIST(1)(l_CSTRING);
-  //! makes functions with two cstrings
-  FUNCTOR_LIST(2)(l_CSTRING, l_CSTRING);
-  //! makes functions with three cstrings
-  FUNCTOR_LIST(3)(l_CSTRING, l_CSTRING, l_CSTRING);
-  //! makes functions with four cstrings
-  FUNCTOR_LIST(4)(l_CSTRING, l_CSTRING, l_CSTRING, l_CSTRING);
-
   //! makes functions with one string
   FUNCTOR_LIST(1)(l_STRING);
@@ -151 +142 @@
 
   //! mixed values:
-  FUNCTOR_LIST(2)(l_CSTRING, l_FLOAT);
+  FUNCTOR_LIST(2)(l_STRING, l_FLOAT);
   FUNCTOR_LIST(2)(l_UINT, l_LONG);
-  FUNCTOR_LIST(2)(l_CSTRING, l_UINT);
+  FUNCTOR_LIST(2)(l_STRING, l_UINT);
 
-  FUNCTOR_LIST(3)(l_CSTRING, l_FLOAT, l_UINT);
+  FUNCTOR_LIST(3)(l_STRING, l_FLOAT, l_UINT);
 
 

branches/std/src/lib/util/helper_functions.cc

@@ -104 +104 @@
 {
   if (STRING.size() > 0)
-  {
-    printf("DECISION1: %s\n", STRING.c_str());
     return STRING;
-  }
   else
-  {
-    printf("DECISION2: %s\n", defaultValue.c_str());
     return defaultValue;
-  }
 }
 

branches/std/src/lib/util/loading/load_param.cc

@@ -66 +66 @@
           ((this->executor->getType() & Executor_NoLoadString) == Executor_NoLoadString)))
     {
-      PRINTF(0)("Loading value '%s' with Parameters '%s' onto: %s::%s\n", this->paramName.c_str(), loadString.c_str(), this->object->getClassName(), this->object->getName());
+      PRINTF(4)("Loading value '%s' with Parameters '%s' onto: %s::%s\n", this->paramName.c_str(), loadString.c_str(), this->object->getClassName(), this->object->getName());
       this->executor->execute(this->object, loadString);
     }