Changeset 9406 in orxonox.OLD for trunk/src/lib/network/synchronizeable_var/synchronizeable_string.cc

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:

• trunk/src/lib/network/synchronizeable_var/synchronizeable_string.cc (modified) (5 diffs)

trunk/src/lib/network/synchronizeable_var/synchronizeable_string.cc

@@ -17 +17 @@
 #include "synchronizeable_string.h"
 #include "converter.h"
+#include <cassert>
 
 
@@ -46 +47 @@
 {
   int res = Converter::stringToByteArray( *vPtrIn, buf, maxLength );
-  
+
   assert( res > 0 );
   assert( res == vPtrIn->length()+INTSIZE );
-  
+
   return res;
+}
+
+int SynchronizeableString::getSize()
+{
+   return vPtrIn->length()+INTSIZE;
 }
 
@@ -62 +68 @@
 {
   std::string oldVal = *vPtrOut;
-      
+
   int res = Converter::byteArrayToString( buf, *vPtrOut, maxLength );
-  
+
   setHasChanged( oldVal != *vPtrOut );
-  
+
   if ( res < 0 )
   {
@@ -72 +78 @@
   }
   assert( res > 0 );
-  
+
   return res;
 }
@@ -94 +100 @@
 {
   std::string t;
-  
+
   int res = Converter::byteArrayToString( buf, t, maxLength );
-  
+
   assert( res > 0 );
-  
+
   return res;
 }