Changeset 3333

Timestamp:

Jul 22, 2009, 1:00:46 PM (15 years ago)

Author:

rgrieder

Message:

Adjusted orxonox_cast to support const pointers. References shall not be supported unless required.

Location:

code/trunk/src/core

Files:

• Identifier.h (modified) (2 diffs)
• OrxonoxClass.h (modified) (1 diff)

code/trunk/src/core/Identifier.h

@@ -458 +458 @@
 
             // Add pointer of type T to the map in the OrxonoxClass instance that enables "dynamic_casts"
-            object->objectPointers_.push_back(std::make_pair(this->getClassID(), reinterpret_cast<void*>(object)));
+            object->objectPointers_.push_back(std::make_pair(this->getClassID(), static_cast<void*>(object)));
             return false;
         }
@@ -496 +496 @@
     */
     template <class T, class U>
-    FORCEINLINE T orxonox_cast(U* source)
+    FORCEINLINE T orxonox_cast(U source)
     {
 #ifdef ORXONOX_COMPILER_MSVC
-        typedef Loki::TypeTraits<T>::PointeeType ClassType;
+        typedef Loki::TypeTraits<typename Loki::TypeTraits<T>::PointeeType>::NonConstType ClassType;
         return source->template getDerivedPointer<ClassType>(ClassIdentifier<ClassType>::getIdentifier()->getClassID());
 #else

code/trunk/src/core/OrxonoxClass.h

@@ -101 +101 @@
             */
             template <class T>
-            FORCEINLINE T* getDerivedPointer(unsigned int classID) const
+            FORCEINLINE T* getDerivedPointer(unsigned int classID)
             {
                 for (int i = this->objectPointers_.size() - 1; i >= 0; --i)
                 {
                     if (this->objectPointers_[i].first == classID)
-                        return reinterpret_cast<T*>(this->objectPointers_[i].second);
+                        return static_cast<T*>(this->objectPointers_[i].second);
                 }
                 return NULL;
+            }
+            //! Const version of getDerivedPointer
+            template <class T>
+            FORCEINLINE const T* getDerivedPointer(unsigned int classID) const
+            {
+                return const_cast<OrxonoxClass*>(this)->getDerivedPointer<T>(classID);
             }