More string converter optimizations

1 files changed, 9 insertions, 7 deletions

diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp
index 2798bf41cb7..71a97a5ebf6 100644
--- a/cpp/src/Ice/OutgoingAsync.cpp
+++ b/cpp/src/Ice/OutgoingAsync.cpp
@@ -75,13 +75,14 @@ IceInternal::OutgoingAsync::__finished(BasicStream& is)
 	    case DispatchOperationNotExist:
 	    {
 		Identity ident;
-		ident.__read(__is);
+		__is->read(ident.name, false);
+		__is->read(ident.category, false);
 		
 		//
 		// For compatibility with the old FacetPath.
 		//
 		vector<string> facetPath;
-		__is->read(facetPath);
+		__is->read(facetPath, false);
 		string facet;
 		if(!facetPath.empty())
 		{
@@ -289,19 +290,20 @@ IceInternal::OutgoingAsync::__prepare(const ObjectPrx& prx, const string& operat
 	
 	__os->writeBlob(requestHdr, sizeof(requestHdr));
 
-	ref->getIdentity().__write(__os);
+	__os->write(ref->getIdentity().name, false);
+	__os->write(ref->getIdentity().category, false);
 
 	//
 	// For compatibility with the old FacetPath.
 	//
 	if(ref->getFacet().empty())
 	{
-	    __os->write(static_cast<string*>(0), static_cast<string*>(0));
+	    __os->write(static_cast<string*>(0), static_cast<string*>(0), false);
 	}
 	else
 	{
 	    string facet = ref->getFacet();
-	    __os->write(&facet, &facet + 1);
+	    __os->write(&facet, &facet + 1, false);
 	}
 
 	__os->write(operation, false);
@@ -312,8 +314,8 @@ IceInternal::OutgoingAsync::__prepare(const ObjectPrx& prx, const string& operat
 	Context::const_iterator p;
 	for(p = context.begin(); p != context.end(); ++p)
 	{
-	    __os->write(p->first);
-	    __os->write(p->second);
+	    __os->write(p->first, false);
+	    __os->write(p->second, false);
 	}
 	
 	__os->startWriteEncaps();