Changeset 7265 for code/branches/consolecommands3/src/libraries/core

Timestamp:

Aug 30, 2010, 1:19:11 PM (14 years ago)

Author:

landauf

Message:

added a missing TypeTrait in MultiType which caused problems on some compilers with explicit conversion

File:

• code/branches/consolecommands3/src/libraries/core/command/Executor.cc (modified) (2 diffs)

code/branches/consolecommands3/src/libraries/core/command/Executor.cc

@@ -67 +67 @@
         }
 
+        COUT(5) << "Executor::parse: \"" << arguments.join(delimiter) << "\" -> " << paramCount << " params: " << param[0] << " / " << param[1] << " / " << param[2] << " / " << param[3] << " / " << param[4] << std::endl;
+
         switch (paramCount)
         {
@@ -96 +98 @@
 
         // assign all given arguments to the multitypes
-        for (unsigned int i = 0; i < std::min(argumentCount, MAX_FUNCTOR_ARGUMENTS); i++)
+        for (unsigned int i = 0; i < std::min(std::min(argumentCount, paramCount), MAX_FUNCTOR_ARGUMENTS); i++)
             param[i] = arguments[i];