Changeset 9406 in orxonox.OLD for trunk/src/lib/network/synchronizeable_var/synchronizeable_vector.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_vector.h (modified) (3 diffs)

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

@@ -4 +4 @@
 */
 
-#include "synchronizeable_var/synchronizeable_var.h"
-
 #ifndef _SYNCHRONIZEABLE_VECTOR_H
 #define _SYNCHRONIZEABLE_VECTOR_H
+
+#include "synchronizeable_var.h"
 
 #include "vector.h"
@@ -14 +14 @@
 
   public:
-    SynchronizeableVector( Vector * ptrIn, Vector * ptrOut, std::string name, int permission = PERMISSION_SERVER, int priority = 0 );
+    SynchronizeableVector( Vector * ptrIn, Vector * ptrOut, std::string name, int permission = PERMISSION_MASTER_SERVER, int priority = 0 );
     virtual ~SynchronizeableVector();
-    
+
     virtual int writeToBuf( byte * buf, int maxLength );
     virtual int readFromBuf( byte * buf, int maxLength );
-    
+
     /**
      * check if writeToBuf will return the same size every time
@@ -25 +25 @@
      */
     virtual bool hasStaticSize(){ return true; }
-    
+
     virtual void debug();
-    
+
   private:
     Vector * vPtrIn;       //!< pointer to data (read)