[Orxonox-commit 5897] r10556 - code/branches/core7/src/libraries/network/synchronisable

landauf at orxonox.net landauf at orxonox.net
Sat Aug 29 17:40:08 CEST 2015


Author: landauf
Date: 2015-08-29 17:40:08 +0200 (Sat, 29 Aug 2015)
New Revision: 10556

Modified:
   code/branches/core7/src/libraries/network/synchronisable/Serialise.h
Log:
I assume that this should be WeakPtr instead of StrongPtr?

Modified: code/branches/core7/src/libraries/network/synchronisable/Serialise.h
===================================================================
--- code/branches/core7/src/libraries/network/synchronisable/Serialise.h	2015-08-29 15:35:59 UTC (rev 10555)
+++ code/branches/core7/src/libraries/network/synchronisable/Serialise.h	2015-08-29 15:40:08 UTC (rev 10556)
@@ -124,7 +124,7 @@
     template <class T> inline void loadAndIncrease( const WeakPtr<T>& variable, uint8_t*& mem )
     {
         //         *const_cast<typename Loki::TypeTraits<T*>::UnqualifiedType*>(&variable) = dynamic_cast<T*>(variable->getSynchronisable( *(uint32_t*)(mem) ));
-        *const_cast<typename Loki::TypeTraits<StrongPtr<T> >::UnqualifiedType*>(&variable) = orxonox_cast<T*>(T::getSynchronisable(*(uint32_t*)(mem)));
+        *const_cast<typename Loki::TypeTraits<WeakPtr<T> >::UnqualifiedType*>(&variable) = orxonox_cast<T*>(T::getSynchronisable(*(uint32_t*)(mem)));
         mem += returnSize( variable );
     }
 




More information about the Orxonox-commit mailing list