* C++ implementation for compact/sliced formats

* C++ implementation for "preserve-slice" metadata
* C++ tests for compact/sliced/preserved types
* Updated stream API
* Python changes for stream API
* Python tests for compact/sliced formats
* Added Ice.Default.SlicedFormat property

1 files changed, 1 insertions, 60 deletions

diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index 562ec3aab3d..6e12657f4b7 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -14,6 +14,7 @@
 #include <Ice/Direct.h>
 #include <Ice/LocalException.h>
 #include <Ice/Stream.h>
+#include <Ice/SlicedData.h>
 
 using namespace std;
 using namespace Ice;
@@ -242,66 +243,6 @@ Ice::Object::__collocDispatch(IceInternal::Direct& request)
 }
 
 void
-Ice::Object::__write(BasicStream* __os) const
-{
-    __os->writeTypeId(ice_staticId());
-    __os->startWriteSlice();
-    __os->writeSize(0); // For compatibility with the old AFM.
-    __os->endWriteSlice();
-}
-
-void
-Ice::Object::__read(BasicStream* __is, bool __rid)
-{
-    if(__rid)
-    {
-        string myId;
-        __is->readTypeId(myId);
-    }
-
-    __is->startReadSlice();
-
-    // For compatibility with the old AFM.
-    Int sz;
-    __is->readSize(sz);
-    if(sz != 0)
-    {
-        throw Ice::MarshalException(__FILE__, __LINE__);
-    }
-
-    __is->endReadSlice();
-}
-
-void
-Ice::Object::__write(const OutputStreamPtr& __outS) const
-{
-    __outS->writeTypeId(ice_staticId());
-    __outS->startSlice();
-    __outS->writeSize(0); // For compatibility with the old AFM.
-    __outS->endSlice();
-}
-
-void
-Ice::Object::__read(const InputStreamPtr& __inS, bool __rid)
-{
-    if(__rid)
-    {
-        __inS->readTypeId();
-    }
-
-    __inS->startSlice();
-
-    // For compatibility with the old AFM.
-    Int sz = __inS->readSize();
-    if(sz != 0)
-    {
-        throw Ice::MarshalException(__FILE__, __LINE__);
-    }
-
-    __inS->endSlice();
-}
-
-void
 Ice::__patch__ObjectPtr(void* __addr, ObjectPtr& v)
 {
     ObjectPtr* p = static_cast<ObjectPtr*>(__addr);