Partial fix for ICE-4869: C++ stream read/write for structs (and structs-as-class)

is now generated as templates.
Removed most slice2cpp --stream uses (but not all)
Also fixed various build failures on Solaris.

1 files changed, 4 insertions, 4 deletions

diff --git a/cpp/src/Freeze/ObjectStore.cpp b/cpp/src/Freeze/ObjectStore.cpp
index 4015ab63eb5..99a09af7b98 100644
--- a/cpp/src/Freeze/ObjectStore.cpp
+++ b/cpp/src/Freeze/ObjectStore.cpp
@@ -336,7 +336,7 @@ Freeze::ObjectStoreBase::marshal(const Identity& ident,
 {
     IceInternal::InstancePtr instance = IceInternal::getInstance(communicator);
     IceInternal::BasicStream stream(instance.get(), encoding, true);
-    ident.__write(&stream);
+    stream.write(ident);
     vector<Byte>(stream.b.begin(), stream.b.end()).swap(bytes);
 }
     
@@ -351,7 +351,7 @@ Freeze::ObjectStoreBase::unmarshal(Identity& ident,
     stream.b.resize(bytes.size());
     memcpy(&stream.b[0], &bytes[0], bytes.size());
     stream.i = stream.b.begin();
-    ident.__read(&stream);
+    stream.read(ident);
 }
 
 void
@@ -366,7 +366,7 @@ Freeze::ObjectStoreBase::marshal(const ObjectRecord& v,
     stream.startWriteEncaps();
     if(keepStats)
     {
-	v.__write(&stream);
+        stream.write(v);
     }
     else
     {
@@ -395,7 +395,7 @@ Freeze::ObjectStoreBase::unmarshal(ObjectRecord& v,
     
     if(keepStats)
     {
-	v.__read(&stream);
+        stream.read(v);
     }
     else
     {