Changeset 3332 for code/trunk/src/core

Timestamp:

Jul 21, 2009, 12:54:15 PM (16 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

File:

• code/trunk/src/core/Identifier.h (modified) (3 diffs)

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
     }