Changeset 7497 for code/branches/network4/src/libraries/network/synchronisable/Synchronisable.cc

Timestamp:

Sep 28, 2010, 10:10:56 PM (14 years ago)

Author:

scheusso

Message:

merging network3 into network4 branch

Location:

code/branches/network4

Files:

• . (modified) (1 prop)
• src/libraries/network/synchronisable/Synchronisable.cc (modified) (1 diff)

code/branches/network4/src/libraries/network/synchronisable/Synchronisable.cc

@@ -123 +123 @@
   {
     SynchronisableHeader header(mem);
-    assert( !header.isDiffed() );
+    if( header.isDiffed() )
+    {
+      mem += header.getDataSize() + header.getSize();
+      return 0;
+    }
+//     assert( !header.isDiffed() );
 
     COUT(4) << "fabricating object with id: " << header.getObjectID() << std::endl;