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, 3 insertions, 3 deletions

diff --git a/cpp/src/Ice/ProxyFactory.cpp b/cpp/src/Ice/ProxyFactory.cpp
index a831145fedf..c28520afcd6 100644
--- a/cpp/src/Ice/ProxyFactory.cpp
+++ b/cpp/src/Ice/ProxyFactory.cpp
@@ -73,7 +73,7 @@ ObjectPrx
 IceInternal::ProxyFactory::streamToProxy(BasicStream* s) const
 {
     Identity ident;
-    ident.__read(s);
+    s->read(ident);
 
     ReferencePtr ref = _instance->referenceFactory()->create(ident, s);
     return referenceToProxy(ref);
@@ -84,13 +84,13 @@ IceInternal::ProxyFactory::proxyToStream(const ObjectPrx& proxy, BasicStream* s)
 {
     if(proxy)
     {
-        proxy->__reference()->getIdentity().__write(s);
+        s->write(proxy->__reference()->getIdentity());
         proxy->__reference()->streamWrite(s);
     }
     else
     {
         Identity ident;
-        ident.__write(s);
+        s->write(ident);
     }
 }