diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-10-11 14:44:58 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-10-11 14:44:58 -0400 |
| commit | 027e0fe8d3d1a6c4cf2f6ba2e80016c102943ebe (patch) | |
| tree | 5a17059ea764321a0b6e43f1083dcd6c7db363f1 /cpp/src/Ice/Outgoing.cpp | |
| parent | ICE-4829 - Certificate failure on W2003 (diff) | |
| download | ice-027e0fe8d3d1a6c4cf2f6ba2e80016c102943ebe.tar.bz2 ice-027e0fe8d3d1a6c4cf2f6ba2e80016c102943ebe.tar.xz ice-027e0fe8d3d1a6c4cf2f6ba2e80016c102943ebe.zip | |
Partial fix for ICE-4869: C++ stream read/write for structs (and structs-as-class)
is now generated as templates.
Removed most slice2cpp --stream uses (but not all)
Also fixed various build failures on Solaris.
Diffstat (limited to 'cpp/src/Ice/Outgoing.cpp')
| -rw-r--r-- | cpp/src/Ice/Outgoing.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp index 44571200fdf..3e4d24a563b 100644 --- a/cpp/src/Ice/Outgoing.cpp +++ b/cpp/src/Ice/Outgoing.cpp @@ -112,7 +112,7 @@ IceInternal::Outgoing::Outgoing(RequestHandler* handler, const string& operation try { - _handler->getReference()->getIdentity().__write(&_os); + _os.write(_handler->getReference()->getIdentity()); // // For compatibility with the old FacetPath. @@ -402,7 +402,7 @@ IceInternal::Outgoing::finished(BasicStream& is) // exception, you will have a memory leak. // Identity ident; - ident.__read(&_is); + _is.read(ident); // // For compatibility with the old FacetPath. |