Changeset 3233 for code/trunk/src/util/MultiType.h

Timestamp:

Jun 26, 2009, 11:42:34 AM (15 years ago)

Author:

rgrieder

Message:

Possibly reinstated code compliance with GCC 4.4
Could anyone with GCC 4.4 please test this?

File:

• code/trunk/src/util/MultiType.h (modified) (2 diffs)

code/trunk/src/util/MultiType.h

@@ -76 +76 @@
 #include <OgreQuaternion.h>
 #include <OgreColourValue.h>
+
+#include "TemplateUtils.h"
 
 namespace orxonox
@@ -317 +319 @@
             inline void                       resetValue()                    { if (this->value_) this->value_->reset(); }
 
-            template <typename T> inline void setType()                       { this->assignValue(T());                                 } /** @brief Resets the value and changes the internal type to T. */
+            template <typename T> inline void setType()                       { this->assignValue(TypeStripper<T>::RawType());        } /** @brief Resets the value and changes the internal type to T. */
             inline void                       setType(const MultiType& other) { this->setType(other.getType());                         } /** @brief Resets the value and changes the internal type to the type of the other MultiType. */
             inline void                       setType(MT_Type type)           { this->reset(); this->convert(type); this->resetValue(); } /** @brief Resets the value and changes the internal type to the given type. */