1 files changed, 7 insertions, 15 deletions

diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp
index d637c925fb3..a5bfa8c4af8 100644
--- a/cpp/src/Ice/OutgoingAsync.cpp
+++ b/cpp/src/Ice/OutgoingAsync.cpp
@@ -7,6 +7,7 @@
 //
 // **********************************************************************
 
+#include <IceUtil/DisableWarnings.h>
 #include <Ice/OutgoingAsync.h>
 #include <Ice/Object.h>
 #include <Ice/ConnectionI.h>
@@ -102,8 +103,8 @@ Ice::AsyncResult::AsyncResult(const CommunicatorPtr& communicator,
     _operation(op),
     _callback(del),
     _cookie(cookie),
-    _is(instance.get()),
-    _os(instance.get()),
+    _is(instance.get(), Ice::currentProtocolEncoding),
+    _os(instance.get(), Ice::currentProtocolEncoding),
     _state(0),
     _sentSynchronously(false),
     _exception(0)
@@ -411,7 +412,8 @@ IceInternal::OutgoingAsync::OutgoingAsync(const ObjectPrx& prx,
                                           const CallbackBasePtr& delegate,
                                           const Ice::LocalObjectPtr& cookie) :
     AsyncResult(prx->ice_getCommunicator(), prx->__reference()->getInstance(), operation, delegate, cookie),
-    _proxy(prx)
+    _proxy(prx),
+    _encoding(prx->__reference()->getEncoding())
 {
 }
 
@@ -459,7 +461,7 @@ IceInternal::OutgoingAsync::__prepare(const std::string& operation, OperationMod
         //
         // Explicit context
         //
-        __writeContext(&_os, *context);
+        _os.write(*context);
     }
     else
     {
@@ -470,15 +472,13 @@ IceInternal::OutgoingAsync::__prepare(const std::string& operation, OperationMod
         const Context& prxContext = ref->getContext()->getValue();
         if(implicitContext == 0)
         {
-            __writeContext(&_os, prxContext);
+            _os.write(prxContext);
         }
         else
         {
             implicitContext->write(prxContext, &_os);
         }
     }
-
-    _os.startWriteEncaps();
 }
 
 bool
@@ -515,11 +515,7 @@ IceInternal::OutgoingAsync::__sent(Ice::ConnectionI* connection)
 void
 IceInternal::OutgoingAsync::__sent()
 {
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
-    AsyncResult::__sent();
-#else
     ::Ice::AsyncResult::__sent();
-#endif
 }
 
 void
@@ -880,11 +876,7 @@ IceInternal::BatchOutgoingAsync::__sent(Ice::ConnectionI* connection)
 void
 IceInternal::BatchOutgoingAsync::__sent()
 {
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
-    AsyncResult::__sent();
-#else
     ::Ice::AsyncResult::__sent();
-#endif
 }
 
 void