Changeset 3301 for code/trunk/src/network/synchronisable/SynchronisableVariable.h

Timestamp:

Jul 18, 2009, 4:03:59 PM (15 years ago)

Author:

rgrieder

Message:

Found even more casts. They sure aren't all of them, but I hope to have caught every pointer C-style cast because they can be very dangerous.
Note: I didn't do the pointer casts in the network library because that would have taken way too long.

File:

• code/trunk/src/network/synchronisable/SynchronisableVariable.h (modified) (4 diffs)

code/trunk/src/network/synchronisable/SynchronisableVariable.h

@@ -36 +36 @@
 #include <cstring>
 #include "util/Serialise.h"
+#include "util/TemplateUtils.h"
 #include "core/GameMode.h"
 #include "network/synchronisable/NetworkCallbackManager.h"
@@ -78 +79 @@
       virtual inline void putData(uint8_t*& mem, uint8_t mode, bool forceCallback = false);
       virtual inline uint32_t getSize(uint8_t mode);
-      virtual inline void* getReference(){ return (void *)&this->variable_; }
+      virtual inline void* getReference(){ return static_cast<void*>(const_cast<typename TypeStripper<T>::RawType*>(&this->variable_)); }
     protected:
       
@@ -178 +179 @@
         {
           this->varReference_++;
-          memcpy((void*)&this->varBuffer_, &this->variable_, sizeof(this->variable_));
+          memcpy(static_cast<void*>(const_cast<typename TypeStripper<T>::RawType*>(&this->varBuffer_)), &this->variable_, sizeof(this->variable_));
         }
       }
@@ -211 +212 @@
           {
             mem += sizeof(varReference_);
-            memcpy((void*)&this->varBuffer_, &this->variable_, sizeof(T));
+            memcpy(static_cast<void*>(const_cast<typename TypeStripper<T>::RawType*>(&this->varBuffer_)), &this->variable_, sizeof(T));
             if ( this->callback_ != 0 )
               callback = true;