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

Timestamp:

Dec 30, 2005, 1:52:26 AM (19 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.cc (modified) (1 diff)

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

@@ -66 +66 @@
  *  write data to Synchronizeable
  */
-void SimpleSync::writeBytes(const byte* data, int length)
+int SimpleSync::writeBytes(const byte* data, int length, int sender)
 {
   PRINTF(0)("SimpleSync: got %i bytes of data\n", length);