Changeset 3325 for code/trunk/src/network

Timestamp:

Jul 19, 2009, 3:48:00 PM (15 years ago)

Author:

rgrieder

Message:

Merged orxonox_cast related revisions from core4 back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/network/NetworkFunction.h (modified) (2 diffs)
• src/network/synchronisable/Synchronisable.cc (modified) (2 diffs)

code/trunk/src/network/NetworkFunction.h

@@ -39 +39 @@
 #include <boost/static_assert.hpp>
 
-#include "core/OrxonoxClass.h"
 #include "core/Functor.h"
+#include "core/Identifier.h"
 #include "FunctionCallManager.h"
 #include "synchronisable/Synchronisable.h"
@@ -153 +153 @@
     { 
       if ( Synchronisable::getSynchronisable(objectID)!=0 )
-        (*this->functor_)(dynamic_cast<T*>(Synchronisable::getSynchronisable(objectID)));
+        (*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)));
     }
     inline void call(uint32_t objectID, const MultiType& mt1)
     { 
       if ( Synchronisable::getSynchronisable(objectID)!=0 )
-        (*this->functor_)(dynamic_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1);
+        (*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1);
     }
     inline void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2)
     { 
       if ( Synchronisable::getSynchronisable(objectID)!=0 )
-        (*this->functor_)(dynamic_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2);
+        (*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2);
     }
     inline void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3)
     { 
       if ( Synchronisable::getSynchronisable(objectID)!=0 )
-        (*this->functor_)(dynamic_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2, mt3);
+        (*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2, mt3);
     }
     inline void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4)
     { 
       if ( Synchronisable::getSynchronisable(objectID)!=0 )
-        (*this->functor_)(dynamic_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2, mt3, mt4);
+        (*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2, mt3, mt4);
     }
     inline void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5)
     { 
       if ( Synchronisable::getSynchronisable(objectID)!=0 )
-        (*this->functor_)(dynamic_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2, mt3, mt4, mt5);
+        (*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2, mt3, mt4, mt5);
     }
     

code/trunk/src/network/synchronisable/Synchronisable.cc

@@ -73 +73 @@
     if (creator)
     {
-        Synchronisable* synchronisable_creator = dynamic_cast<Synchronisable*>(creator);
+        Synchronisable* synchronisable_creator = orxonox_cast<Synchronisable*>(creator);
         if (synchronisable_creator && synchronisable_creator->objectMode_)
         {
@@ -161 +161 @@
       }
       else
-        creator = dynamic_cast<BaseObject*>(synchronisable_creator);
+        creator = orxonox_cast<BaseObject*>(synchronisable_creator);
     }
     assert(getSynchronisable(header.getObjectID())==0);   //make sure no object with this id exists
     BaseObject *bo = id->fabricate(creator);
     assert(bo);
-    Synchronisable *no = dynamic_cast<Synchronisable *>(bo);
+    Synchronisable *no = orxonox_cast<Synchronisable*>(bo);
     assert(no);
     no->objectID=header.getObjectID();