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

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.h (modified) (3 diffs)

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

@@ -4 +4 @@
 */
 
-#include "synchronizeable_var/synchronizeable_var.h"
-#include "converter.h"
-
 #ifndef _SYNCHRONIZEABLE_STRING_H
 #define _SYNCHRONIZEABLE_STRING_H
+
+#include "synchronizeable_var.h"
 
 #include <string>
@@ -15 +14 @@
 
   public:
-    SynchronizeableString( std::string * ptrIn, std::string * ptrOut, std::string name, int permission = PERMISSION_SERVER, int priority = 0 );
+    SynchronizeableString( std::string * ptrIn, std::string * ptrOut, std::string name, int permission = PERMISSION_MASTER_SERVER, int priority = 0 );
     virtual ~SynchronizeableString();
-    
+
     virtual int writeToBuf( byte * buf, int maxLength );
     virtual int readFromBuf( byte * buf, int maxLength );
-    
-        
+
+
     /**
      * check if writeToBuf will return the same size every time
@@ -27 +26 @@
      */
     virtual bool hasStaticSize(){ return false; };
-    
-    virtual int getSize(){ return vPtrIn->length()+INTSIZE; }
-    
+
+    virtual int getSize();
+
     virtual int getSizeFromBuf( byte * buf, int maxLength );
-    
+
     virtual void debug();
-    
+
   private:
     std::string * vPtrIn;       //!< pointer to data (read)