Changeset 285 for code/branches/merger/src/network/Synchronisable.cc
- Timestamp:
- Nov 27, 2007, 11:30:17 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/merger/src/network/Synchronisable.cc
r278 r285 2 2 // C++ Implementation: synchronisable 3 3 // 4 // Description: 4 // Description: 5 5 // 6 6 // … … 10 10 // 11 11 12 #include " network/Synchronisable.h"12 #include "Synchronisable.h" 13 13 14 14 namespace network { … … 27 27 Synchronisable::~Synchronisable() 28 28 { 29 29 30 30 } 31 31 … … 72 72 int n=0; 73 73 for(i=syncList.begin(); n<totalsize && i!=syncList.end(); i++){ 74 //CHANGED: i->size TO (const void*)(&(i->size)) memcpy WANTS A CONST VOID* SO CONVERT INT TO CONST VOID* 74 //CHANGED: i->size TO (const void*)(&(i->size)) memcpy WANTS A CONST VOID* SO CONVERT INT TO CONST VOID* 75 75 std::memcpy(retVal.data+n, (const void*)(i->size), sizeof(int)); 76 76 n+=sizeof(int); … … 102 102 int n=0; 103 103 for(i=syncList.begin(); n<datasize && i!=syncList.end(); i++){ 104 //CHANGED: i->size TO (const void*)(&(i->size)) memcpy WANTS A CONST VOID* SO CONVERT INT TO CONST VOID* 104 //CHANGED: i->size TO (const void*)(&(i->size)) memcpy WANTS A CONST VOID* SO CONVERT INT TO CONST VOID* 105 105 std::memcpy(retVal.data+n, (const void*)(i->size), sizeof(int)); 106 106 n+=sizeof(int);
Note: See TracChangeset
for help on using the changeset viewer.