diff options
Diffstat (limited to 'cpp/src/Ice/Outgoing.cpp')
| -rw-r--r-- | cpp/src/Ice/Outgoing.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp index f14425f5a21..54bb64d61f6 100644 --- a/cpp/src/Ice/Outgoing.cpp +++ b/cpp/src/Ice/Outgoing.cpp @@ -73,19 +73,20 @@ IceInternal::Outgoing::Outgoing(ConnectionI* connection, Reference* ref, const s try { - _reference->getIdentity().__write(&_os); + _os.write(_reference->getIdentity().name, false); + _os.write(_reference->getIdentity().category, false); // // For compatibility with the old FacetPath. // if(_reference->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 = _reference->getFacet(); - _os.write(&facet, &facet + 1); + _os.write(&facet, &facet + 1, false); } _os.write(operation, false); @@ -96,8 +97,8 @@ IceInternal::Outgoing::Outgoing(ConnectionI* connection, Reference* ref, const s 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); } // @@ -340,13 +341,14 @@ IceInternal::Outgoing::finished(BasicStream& is) // exception, you will have a memory leak. // 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()) { |