Changeset 6340 in orxonox.OLD for branches/network_merged/src/subprojects/network/simple_sync.h

Timestamp:

Dec 30, 2005, 1:52:26 AM (18 years ago)

Author:

bensch

Message:

orxonox/branches/newtork: merged the network branche for merging to the trunk
confilcts maily resolved in favor of trunk with some minor fixes

merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6146:HEAD

File:

• branches/network_merged/src/subprojects/network/simple_sync.h (modified) (1 diff)

branches/network_merged/src/subprojects/network/simple_sync.h

@@ -16 +16 @@
     ~SimpleSync();
 
-    virtual void writeBytes(const byte* data, int length);
+    virtual int writeBytes(const byte* data, int length, int sender);
     virtual int readBytes(byte* data, int maxLength, int * reciever);