ICE-6861 - removing public stream API

1 files changed, 28 insertions, 28 deletions

diff --git a/cpp/test/Ice/invoke/BlobjectI.cpp b/cpp/test/Ice/invoke/BlobjectI.cpp
index 6ec24555023..45afab5d21e 100644
--- a/cpp/test/Ice/invoke/BlobjectI.cpp
+++ b/cpp/test/Ice/invoke/BlobjectI.cpp
@@ -15,11 +15,11 @@
 using namespace std;
 
 bool
-invokeInternal(const Ice::InputStreamPtr& in, vector<Ice::Byte>& outEncaps, const Ice::Current& current)
+invokeInternal(Ice::InputStream& in, vector<Ice::Byte>& outEncaps, const Ice::Current& current)
 {
     Ice::CommunicatorPtr communicator = current.adapter->getCommunicator();
-    Ice::OutputStreamPtr out = Ice::createOutputStream(communicator);
-    out->startEncapsulation();
+    Ice::OutputStream out(communicator);
+    out.startEncapsulation();
     if(current.operation == "opOneway")
     {
         return true;
@@ -27,46 +27,46 @@ invokeInternal(const Ice::InputStreamPtr& in, vector<Ice::Byte>& outEncaps, cons
     else if(current.operation == "opString")
     {
         string s;
-        in->startEncapsulation();
-        in->read(s);
-        in->endEncapsulation();
-        out->write(s);
-        out->write(s);
-        out->endEncapsulation();
-        out->finished(outEncaps);
+        in.startEncapsulation();
+        in.read(s);
+        in.endEncapsulation();
+        out.write(s);
+        out.write(s);
+        out.endEncapsulation();
+        out.finished(outEncaps);
         return true;
     }
     else if(current.operation == "opException")
     {
         Test::MyException ex;
-        out->writeException(ex);
-        out->endEncapsulation();
-        out->finished(outEncaps);
+        out.writeException(ex);
+        out.endEncapsulation();
+        out.finished(outEncaps);
         return false;
     }
     else if(current.operation == "shutdown")
     {
-        out->endEncapsulation();
-        out->finished(outEncaps);
+        out.endEncapsulation();
+        out.finished(outEncaps);
         communicator->shutdown();
         return true;
     }
     else if(current.operation == "ice_isA")
     {
         string s;
-        in->startEncapsulation();
-        in->read(s);
-        in->endEncapsulation();
+        in.startEncapsulation();
+        in.read(s);
+        in.endEncapsulation();
         if(s == "::Test::MyClass")
         {
-            out->write(true);
+            out.write(true);
         }
         else
         {
-            out->write(false);
+            out.write(false);
         }
-        out->endEncapsulation();
-        out->finished(outEncaps);
+        out.endEncapsulation();
+        out.finished(outEncaps);
         return true;
     }
     else
@@ -82,7 +82,7 @@ invokeInternal(const Ice::InputStreamPtr& in, vector<Ice::Byte>& outEncaps, cons
 bool
 BlobjectI::ice_invoke(const vector<Ice::Byte>& inEncaps, vector<Ice::Byte>& outEncaps, const Ice::Current& current)
 {
-    Ice::InputStreamPtr in = Ice::createInputStream(current.adapter->getCommunicator(), inEncaps);
+    Ice::InputStream in(current.adapter->getCommunicator(), current.encoding, inEncaps);
     return invokeInternal(in, outEncaps, current);
 }
 
@@ -90,7 +90,7 @@ bool
 BlobjectArrayI::ice_invoke(const pair<const Ice::Byte*, const Ice::Byte*>& inEncaps, vector<Ice::Byte>& outEncaps,
                           const Ice::Current& current)
 {
-    Ice::InputStreamPtr in = Ice::createInputStream(current.adapter->getCommunicator(), inEncaps);
+    Ice::InputStream in(current.adapter->getCommunicator(), current.encoding, inEncaps);
     return invokeInternal(in, outEncaps, current);
 }
 
@@ -101,7 +101,7 @@ BlobjectAsyncI::ice_invoke_async(vector<Ice::Byte> inEncaps,
                                  function<void (exception_ptr)>,
                                  const Ice::Current& current)
 {
-    Ice::InputStreamPtr in = Ice::createInputStream(current.adapter->getCommunicator(), inEncaps);
+    Ice::InputStream in(current.adapter->getCommunicator(), inEncaps);
     vector<Ice::Byte> outEncaps;
     bool ok = invokeInternal(in, outEncaps, current);
     response(ok, move(outEncaps));
@@ -113,7 +113,7 @@ BlobjectArrayAsyncI::ice_invoke_async(pair<const Ice::Byte*, const Ice::Byte*> i
                                       function<void (exception_ptr)>,
                                       const Ice::Current& current)
 {
-    Ice::InputStreamPtr in = Ice::createInputStream(current.adapter->getCommunicator(), inEncaps);
+    Ice::InputStream in(current.adapter->getCommunicator(), inEncaps);
     vector<Ice::Byte> outEncaps;
     bool ok = invokeInternal(in, outEncaps, current);
 #if (defined(_MSC_VER) && (_MSC_VER >= 1600))
@@ -133,7 +133,7 @@ void
 BlobjectAsyncI::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& cb, const vector<Ice::Byte>& inEncaps, 
                                 const Ice::Current& current)
 {
-    Ice::InputStreamPtr in = Ice::createInputStream(current.adapter->getCommunicator(), inEncaps);
+    Ice::InputStream in(current.adapter->getCommunicator(), current.encoding, inEncaps);
     vector<Ice::Byte> outEncaps;
     bool ok = invokeInternal(in, outEncaps, current);
     cb->ice_response(ok, outEncaps);
@@ -144,7 +144,7 @@ BlobjectArrayAsyncI::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& cb,
                                      const pair<const Ice::Byte*, const Ice::Byte*>& inEncaps,
                                      const Ice::Current& current)
 {
-    Ice::InputStreamPtr in = Ice::createInputStream(current.adapter->getCommunicator(), inEncaps);
+    Ice::InputStream in(current.adapter->getCommunicator(), current.encoding, inEncaps);
     vector<Ice::Byte> outEncaps;
     bool ok = invokeInternal(in, outEncaps, current);
 #if (defined(_MSC_VER) && (_MSC_VER >= 1600))