Changeset 7199 in orxonox.OLD for trunk/src/lib/util/executor/executor.cc

Timestamp:

Mar 8, 2006, 10:46:37 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: MultiType rework (now uses std::string) this is more compliant, and better to handle

File:

• trunk/src/lib/util/executor/executor.cc (modified) (4 diffs)

trunk/src/lib/util/executor/executor.cc

@@ -45 +45 @@
   this->setClassID(CL_EXECUTOR, "Executor");
 
-
   // What Parameters have we got
   this->defaultValue[0] = param0;
@@ -53 +52 @@
   this->defaultValue[4] = param4;
 
+  this->paramCount = 0;
   for (unsigned int i = 0; i < FUNCTOR_MAX_ARGUMENTS; i++)
   {
@@ -61 +61 @@
     }
   }
-  assert (paramCount <= FUNCTOR_MAX_ARGUMENTS);
 }
 
@@ -109 +108 @@
   {
     if (*value[i] != MT_NULL)
-    {
-      if (this->defaultValue[i].getType() == value[i]->getType())
-      {
-        this->defaultValue[i] = *value[i];
-      }
-      else
-      {
-        PRINTF(1)("Unable to set this Value, as it is not of type %s\n", MultiType::MultiTypeToString(this->defaultValue[i].getType()));
-      }
-    }
+        this->defaultValue[i].setValueOf(*value[i]);
   }
   return this;