Changeset 7265 for code/branches

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

Location:

code/branches/consolecommands3/src/libraries

Files:

• core/command/Executor.cc (modified) (2 diffs)
• util/MultiType.h (modified) (1 diff)

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];
 

code/branches/consolecommands3/src/libraries/util/MultiType.h

@@ -321 +321 @@
             inline void                       copy(const MultiType& other)    { if (this == &other) { return; } if (this->value_) { delete this->value_; } this->value_ = (other.value_) ? other.value_->clone() : 0; }
 
-            template <typename T> inline bool convert()                       { return this->setValue<T>((T)(*this));  } /** @brief Converts the current value to type T. */
+            template <typename T> inline bool convert()                       { return this->setValue<T>((typename Loki::TypeTraits<T>::UnqualifiedReferredType)(*this));  } /** @brief Converts the current value to type T. */
             inline bool                       convert(const MultiType& other) { return this->convert(other.getType()); } /** @brief Converts the current value to the type of the other MultiType. */
             bool                              convert(MT_Type::Value type);