Changeset 3239 for code/branches/core4/src/core

Timestamp:

Jun 28, 2009, 2:45:37 PM (16 years ago)

Author:

rgrieder

Message:

Found a way to write orxonox_cast<T*> instead of orxonox_cast<T> so that the syntax resembles dynamic_cast<T*>.

Location:

code/branches/core4/src/core

Files:

• EventIncludes.h (modified) (2 diffs)
• Identifier.h (modified) (3 diffs)
• Iterator.h (modified) (2 diffs)
• XMLPort.h (modified) (1 diff)

code/branches/core4/src/core/EventIncludes.h

@@ -54 +54 @@
         this->addEventContainer(eventname, containername); \
     } \
-    event.castedOriginator_ = orxonox::orxonox_cast<subclassname>(event.originator_); \
+    event.castedOriginator_ = orxonox::orxonox_cast<subclassname*>(event.originator_); \
     containername->process(this, event)
 
@@ -66 +66 @@
         this->addEventContainer(eventname, containername); \
     } \
-    event.castedOriginator_ = orxonox::orxonox_cast<subclassname>(event.originator_); \
+    event.castedOriginator_ = orxonox::orxonox_cast<subclassname*>(event.originator_); \
     containername->process(this, event)
 

code/branches/core4/src/core/Identifier.h

@@ -483 +483 @@
     // ###      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
@@ -495 +521 @@
     */
     template <class T, class U>
-    FORCEINLINE T* orxonox_cast(U* source)
-    {
-#ifdef ORXONOX_COMPILER_MSVC
-        return source->template getDerivedPointer<T>(ClassIdentifier<T>::getIdentifier()->getClassID());
-#else
-        return dynamic_cast<T*>(source);
-#endif
+    FORCEINLINE T orxonox_cast(U* source)
+    {
+        return OrxonoxCaster<T, U>::cast(source);
     }
 
@@ -597 +619 @@
                 if (newObject)
                 {
-                    return orxonox_cast<T>(newObject);
+                    return orxonox_cast<T*>(newObject);
                 }
                 else

code/branches/core4/src/core/Iterator.h

@@ -240 +240 @@
             {
                 if (this->element_)
-                    return orxonox_cast<T>(this->element_->objectBase_);
+                    return orxonox_cast<T*>(this->element_->objectBase_);
                 else
                     return 0;
@@ -252 +252 @@
             {
                 if (this->element_)
-                    return orxonox_cast<T>(this->element_->objectBase_);
+                    return orxonox_cast<T*>(this->element_->objectBase_);
                 else
                     return 0;

code/branches/core4/src/core/XMLPort.h

@@ -565 +565 @@
                                                     newObject->setLoaderIndentation(object->getLoaderIndentation() + "  ");
 
-                                                    O* castedObject = orxonox_cast<O>(newObject);
+                                                    O* castedObject = orxonox_cast<O*>(newObject);
                                                     assert(castedObject);