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, 5 insertions, 4 deletions

diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp
index ebc0dff0842..6b2b9b0a55b 100644
--- a/cpp/src/IceSSL/EndpointI.cpp
+++ b/cpp/src/IceSSL/EndpointI.cpp
@@ -16,6 +16,7 @@
 #include <Ice/BasicStream.h>
 #include <Ice/LocalException.h>
 #include <Ice/DefaultsAndOverrides.h>
+#include <Ice/Object.h>
 #include <Ice/HashUtil.h>
 
 using namespace std;
@@ -192,8 +193,8 @@ IceSSL::EndpointI::EndpointI(const InstancePtr& instance, IceInternal::BasicStre
     s->read(const_cast<bool&>(_compress));
     if(s->getReadEncoding() > Ice::Encoding_1_0)
     {
-        const_cast<Ice::ProtocolVersion&>(_protocol).__read(s);
-        const_cast<Ice::EncodingVersion&>(_encoding).__read(s);
+        s->read(const_cast<Ice::ProtocolVersion&>(_protocol));
+        s->read(const_cast<Ice::EncodingVersion&>(_encoding));
     }
     else
     {
@@ -214,8 +215,8 @@ IceSSL::EndpointI::streamWrite(IceInternal::BasicStream* s) const
     s->write(_compress);
     if(s->getWriteEncoding() > Ice::Encoding_1_0)
     {
-        _protocol.__write(s);
-        _encoding.__write(s);
+        s->write(_protocol);
+        s->write(_encoding);
     }
     s->endWriteEncaps();
 }