Changeset 3233

Timestamp:

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

Author:

rgrieder

Message:

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

Location:

code/trunk/src/util

Files:

• MultiType.h (modified) (2 diffs)
• TemplateUtils.h (modified) (1 diff)

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. */

code/trunk/src/util/TemplateUtils.h

@@ -39 +39 @@
 namespace orxonox
 {
+    /**
+    @brief
+        Use TypeStripper to get rid of the const and the reference of type T
+    @note
+        Main use of this is when trying to instantiate type T as T().
+    */
+    template <class T> struct TypeStripper
+        { typedef T RawType; };
+    template <class T> struct TypeStripper<const T>
+        { typedef T RawType; };
+    template <class T> struct TypeStripper<const T&>
+        { typedef T RawType; };
+
+
     ///////////////////////////////////////////////////
     // Static detection of implicit type conversions //