Conflict fixes from previous commit

1 files changed, 9 insertions, 7 deletions

diff --git a/cpp/test/Ice/optional/AllTests.cpp b/cpp/test/Ice/optional/AllTests.cpp
index 0caeaf6704c..f35db9c9083 100644
--- a/cpp/test/Ice/optional/AllTests.cpp
+++ b/cpp/test/Ice/optional/AllTests.cpp
@@ -665,13 +665,15 @@ allTests(const Ice::CommunicatorPtr& communicator, bool)
 
     initial->opVoid();
 
-    out = Ice::createOutputStream(communicator);
-    out->startEncapsulation();
-    out->write(1, IceUtil::Optional<int>(15));
-    out->write(2, IceUtil::Optional<string>("test"));
-    out->endEncapsulation();
-    out->finished(inEncaps);
-    test(initial->ice_invoke("opVoid", Ice::Normal, inEncaps, outEncaps));
+    {
+        Ice::OutputStream out(communicator);
+        out.startEncapsulation();
+        out.write(1, IceUtil::Optional<int>(15));
+        out.write(2, IceUtil::Optional<string>("test"));
+        out.endEncapsulation();
+        out.finished(inEncaps);
+        test(initial->ice_invoke("opVoid", Ice::Normal, inEncaps, outEncaps));
+    }
 
     cout << "ok" << endl;