Changeset 1581 for code/branches/gcc43/src/network/Synchronisable.cc

Timestamp:

Jun 9, 2008, 11:11:21 PM (16 years ago)

Author:

nicolasc

Message:

well, it compiles..
there are only about 1000 warinig about a deprecated header usage in ogre, and some other uglinesses, but apart from that it builds… and still seg faults…

File:

• code/branches/gcc43/src/network/Synchronisable.cc (modified) (9 diffs)

code/branches/gcc43/src/network/Synchronisable.cc

@@ -43 +43 @@
 #include <string>
 #include <iostream>
+#include <string.h>
 
 #include "core/CoreIncludes.h"
@@ -49 +50 @@
 namespace network
 {
-  
-  
+
+
   int Synchronisable::state_=0x1; // detemines wheter we are server (default) or client
-  
+
   /**
   * Constructor:
@@ -72 +73 @@
         delete (*it)->callback;
   }
-  
+
   bool Synchronisable::create(){
     this->classID = this->getIdentifier()->getNetworkID();
@@ -78 +79 @@
     return true;
   }
-  
+
   void Synchronisable::setClient(bool b){
     if(b) // client
@@ -97 +98 @@
     temp->size = size;
     temp->var = var;
-    temp->mode = mode; 
+    temp->mode = mode;
     temp->type = t;
     temp->callback = cb;
-    COUT(5) << "Syncronisable::registering var with size: " << temp->size << " and type: " << temp->type << std::endl; 
+    COUT(5) << "Syncronisable::registering var with size: " << temp->size << " and type: " << temp->type << std::endl;
     // increase datasize
     datasize+=sizeof(int)+size;
@@ -187 +188 @@
       switch((*i)->type){
       case DATA:
-        std::memcpy( (void *)(retVal.data+n), (void*)((*i)->var), (*i)->size);
+        memcpy( (void *)(retVal.data+n), (void*)((*i)->var), (*i)->size);
         n+=(*i)->size;
         break;
@@ -194 +195 @@
         n+=sizeof(int);
         const char *data = ( ( *(std::string *) (*i)->var).c_str());
-        std::memcpy( retVal.data+n, (void*)data, (*i)->size);
+        memcpy( retVal.data+n, (void*)data, (*i)->size);
         COUT(5) << "synchronisable: char: " << (const char *)(retVal.data+n) << " data: " << data << " string: " << *(std::string *)((*i)->var) << std::endl;
         n+=(*i)->size;
@@ -278 +279 @@
     return tsize;
   }
-  
+
   void Synchronisable::setBacksync(bool sync){
     backsync_=sync;
@@ -286 +287 @@
     return backsync_;
   }
-  
+
 }