Make Wstring optional for IceE

1 files changed, 9 insertions, 4 deletions

diff --git a/cppe/src/IceE/Outgoing.cpp b/cppe/src/IceE/Outgoing.cpp
index 038a04ad02a..d2573a78784 100644
--- a/cppe/src/IceE/Outgoing.cpp
+++ b/cppe/src/IceE/Outgoing.cpp
@@ -49,7 +49,12 @@ IceInternal::Outgoing::Outgoing(Connection* connection, Reference* ref, const st
     _connection(connection),
     _reference(ref),
     _state(StateUnsent),
-    _stream(ref->getInstance().get(), ref->getInstance()->messageSizeMax())
+    _stream(ref->getInstance().get(), ref->getInstance()->messageSizeMax()
+#ifdef ICEE_HAS_WSTRING
+            , ref->getInstance()->initializationData().stringConverter,
+            ref->getInstance()->initializationData().wstringConverter
+#endif
+           )
 {
     switch(_reference->getMode())
     {
@@ -94,7 +99,7 @@ IceInternal::Outgoing::Outgoing(Connection* connection, Reference* ref, const st
 	_stream.write(_reference->getFacet());
     }
 
-    _stream.write(operation);
+    _stream.write(operation, false);
 
     _stream.write(static_cast<Byte>(mode));
 
@@ -312,7 +317,7 @@ IceInternal::Outgoing::finished(BasicStream& is)
 	    }
 
 	    string operation;
-	    _stream.read(operation);
+	    _stream.read(operation, false);
 	    
 	    RequestFailedException* ex;
 	    switch(static_cast<DispatchStatus>(status))
@@ -362,7 +367,7 @@ IceInternal::Outgoing::finished(BasicStream& is)
 	    // exception, you will have a memory leak.
 	    //
 	    string unknown;
-	    _stream.read(unknown);
+	    _stream.read(unknown, false);
 	    
 	    UnknownException* ex;
 	    switch(static_cast<DispatchStatus>(status))