Changeset 9406 in orxonox.OLD for trunk/src/lib/network/synchronizeable_var/synchronizeable_uint.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_uint.h (modified) (1 diff)

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

@@ -4 +4 @@
 */
 
-#include "synchronizeable_var/synchronizeable_int.h"
 
 #ifndef _SYNCHRONIZEABLE_UINT_H
 #define _SYNCHRONIZEABLE_UINT_H
 
+#include "synchronizeable_int.h"
+
 class SynchronizeableUInt : public SynchronizeableInt {
 
   public:
-    SynchronizeableUInt( unsigned int * ptrIn, unsigned int * ptrOut, std::string name, int permission = PERMISSION_SERVER, int priority = 0 );
+    SynchronizeableUInt( unsigned int * ptrIn, unsigned int * ptrOut, std::string name, int permission = PERMISSION_MASTER_SERVER, int priority = 0 );
     virtual ~SynchronizeableUInt();
-    
+
     virtual void debug();