Removed Stream::format method, replace with startWriteEncaps parameter

1 files changed, 12 insertions, 4 deletions

diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index 15e49a61608..34f583bb1df 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -80,14 +80,14 @@ IceInternal::IncomingBase::__adopt(IncomingBase& other)
 }
 
 BasicStream* 
-IncomingBase::__startWriteParams()
+IncomingBase::__startWriteParams(FormatType format)
 {
     if(_response)
     {
         assert(_os.b.size() == headerSize + 4); // Reply status position.
         assert(_current.encoding >= Ice::Encoding_1_0); // Encoding for reply is known.
         _os.write(static_cast<Ice::Byte>(0));
-        _os.startWriteEncaps(_current.encoding);
+        _os.startWriteEncaps(_current.encoding, format);
     }
     
     //
@@ -141,6 +141,14 @@ IncomingBase::__writeParamEncaps(const Byte* v, Ice::Int sz, bool ok)
     }
 }
 
+void 
+IncomingBase::__writeUserException(const Ice::UserException& ex, Ice::FormatType format)
+{
+    ::IceInternal::BasicStream* __os = __startWriteParams(format);
+    __os->write(ex);
+    __endWriteParams(false);
+}
+
 void
 IceInternal::IncomingBase::__warning(const Exception& ex) const
 {
@@ -203,7 +211,7 @@ IceInternal::IncomingBase::__servantLocatorFinished()
         {
             _os.b.resize(headerSize + 4); // Reply status position.
             _os.write(replyUserException);
-            _os.startWriteEncaps(_current.encoding);
+            _os.startWriteEncaps(_current.encoding, DefaultFormat);
             _os.write(ex);
             _os.endWriteEncaps();
             _connection->sendResponse(&_os, _compress);
@@ -567,7 +575,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre
                     if(_response)
                     {
                         _os.write(replyUserException);
-                        _os.startWriteEncaps(encoding);
+                        _os.startWriteEncaps(encoding, DefaultFormat);
                         _os.write(ex);
                         _os.endWriteEncaps();
                         _connection->sendResponse(&_os, _compress);