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/Incoming.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/Incoming.cpp')
| -rw-r--r-- | cpp/src/Ice/Incoming.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp index 9c0fc36f509..962749a871f 100644 --- a/cpp/src/Ice/Incoming.cpp +++ b/cpp/src/Ice/Incoming.cpp @@ -309,7 +309,7 @@ IceInternal::IncomingBase::__handleException(const std::exception& exc) assert(false); } - rfe->id.__write(&_os); + _os.write(rfe->id); // // For compatibility with the old FacetPath. @@ -548,7 +548,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre // // Read the current. // - _current.id.__read(_is); + _is->read(_current.id); // // For compatibility with the old FacetPath. |