Changeset 3332 for code

Timestamp:

Jul 21, 2009, 12:54:15 PM (15 years ago)

Author:

rgrieder

Message:

Added TypeTraits.h from the Loki library (stripped it a bit though). This should make things a bit less error prone since Andrei Alexandrescu really is the master of templates

Location:

code/trunk/src

Files:

• core/Identifier.h (modified) (3 diffs)
• network/synchronisable/SynchronisableVariable.h (modified) (4 diffs)
• util/MultiType.h (modified) (3 diffs)
• util/TemplateUtils.h (modified) (1 diff)
• util/TypeTraits.h (added)

code/trunk/src/core/Identifier.h

@@ -62 +62 @@
 
 #include "util/Debug.h"
+#include "util/TypeTraits.h"
 #include "MetaObjectList.h"
 #include "ObjectList.h"
@@ -483 +484 @@
     // ###      orxonox_cast       ###
     // ###############################
-    //! Helper struct to have orxonox_cast<T*> instead of orxonox_cast<T>
-    template <class T, class U>
-    struct OrxonoxCaster
-    {
-        static T* cast(U* source)
-        {
-            // If you see this function in a compiler error description, it means
-            // you were misusing orxonox_cast. You must always cast to a pointer type!
-            *****T();
-        }
-    };
-
-    //! Helper struct to have orxonox_cast<T*> instead of orxonox_cast<T*>
-    template <class T, class U>
-    struct OrxonoxCaster<T*, U>
-    {
-        FORCEINLINE static T* cast(U* source)
-        {
-#ifdef ORXONOX_COMPILER_MSVC
-            return source->template getDerivedPointer<T>(ClassIdentifier<T>::getIdentifier()->getClassID());
-#else
-            return dynamic_cast<T*>(source);
-#endif
-        }
-    };
-
     /**
     @brief
@@ -523 +498 @@
     FORCEINLINE T orxonox_cast(U* source)
     {
-        return OrxonoxCaster<T, U>::cast(source);
+#ifdef ORXONOX_COMPILER_MSVC
+        typedef Loki::TypeTraits<T>::PointeeType ClassType;
+        return source->template getDerivedPointer<ClassType>(ClassIdentifier<ClassType>::getIdentifier()->getClassID());
+#else
+        return dynamic_cast<T>(source);
+#endif
     }
 

code/trunk/src/network/synchronisable/SynchronisableVariable.h

@@ -36 +36 @@
 #include <cstring>
 #include "util/Serialise.h"
-#include "util/TemplateUtils.h"
+#include "util/TypeTraits.h"
 #include "core/GameMode.h"
 #include "network/synchronisable/NetworkCallbackManager.h"
@@ -79 +79 @@
       virtual inline void putData(uint8_t*& mem, uint8_t mode, bool forceCallback = false);
       virtual inline uint32_t getSize(uint8_t mode);
-      virtual inline void* getReference(){ return static_cast<void*>(const_cast<typename TypeStripper<T>::RawType*>(&this->variable_)); }
+      virtual inline void* getReference(){ return static_cast<void*>(const_cast<typename Loki::TypeTraits<T>::UnqualifiedType*>(&this->variable_)); }
     protected:
       
@@ -182 +182 @@
         {
           this->varReference_++;
-          memcpy(static_cast<void*>(const_cast<typename TypeStripper<T>::RawType*>(&this->varBuffer_)), &this->variable_, sizeof(this->variable_));
+          memcpy(static_cast<void*>(const_cast<typename Loki::TypeTraits<T>::UnqualifiedType*>(&this->varBuffer_)), &this->variable_, sizeof(this->variable_));
         }
       }
@@ -215 +215 @@
           {
             mem += sizeof(varReference_);
-            memcpy(static_cast<void*>(const_cast<typename TypeStripper<T>::RawType*>(&this->varBuffer_)), &this->variable_, sizeof(T));
+            memcpy(static_cast<void*>(const_cast<typename Loki::TypeTraits<T>::UnqualifiedType*>(&this->varBuffer_)), &this->variable_, sizeof(T));
             if ( this->callback_ != 0 )
               callback = true;

code/trunk/src/util/MultiType.h

@@ -77 +77 @@
 #include <OgreColourValue.h>
 
-#include "TemplateUtils.h"
+#include "TypeTraits.h"
 
 namespace orxonox
@@ -303 +303 @@
             inline bool                                   setValue(const char* value);
             /** @brief Assigns a pointer. */
-            template <typename V> inline bool             setValue(V* value)               { if (this->value_) { return this->value_->setValue(static_cast<void*>(const_cast<typename TypeStripper<V>::RawType*>(value))); } else { return this->assignValue(static_cast<void*>(const_cast<typename TypeStripper<V>::RawType*>(value))); } }
+            template <typename V> inline bool setValue(V* value)
+            {
+                if (this->value_)
+                    return this->value_->setValue(static_cast<void*>(const_cast<typename Loki::TypeTraits<V>::UnqualifiedType*>(value)));
+                else
+                    return this->assignValue     (static_cast<void*>(const_cast<typename Loki::TypeTraits<V>::UnqualifiedType*>(value)));
+            }
             /** @brief Assigns the value of the other MultiType and converts it to the current type. */
             bool                                          setValue(const MultiType& other) { if (this->value_) { return this->value_->assimilate(other); } else { if (other.value_) { this->value_ = other.value_->clone(); } return true; } }
@@ -322 +328 @@
             inline void                       resetValue()                    { if (this->value_) this->value_->reset(); }
 
-            template <typename T> inline void setType()                       { this->assignValue(typename 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::Value type)    { this->reset(); this->convert(type); this->resetValue(); } /** @brief Resets the value and changes the internal type to the given type. */
+            template <typename T> inline void setType()                       { this->assignValue(typename Loki::TypeTraits<T>::UnqualifiedReferredType()); } /** @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::Value type)    { this->reset(); this->convert(type); this->resetValue();                     } /** @brief Resets the value and changes the internal type to the given type. */
 
             /** @brief Returns the current 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 //