Changeset 3333 for code/trunk/src/core/Identifier.h

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.

File:

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

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