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/TcpEndpointI.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/TcpEndpointI.cpp')
| -rw-r--r-- | cpp/src/Ice/TcpEndpointI.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/TcpEndpointI.cpp b/cpp/src/Ice/TcpEndpointI.cpp index 311e4edbaa4..4baa8fed6cb 100644 --- a/cpp/src/Ice/TcpEndpointI.cpp +++ b/cpp/src/Ice/TcpEndpointI.cpp @@ -192,8 +192,8 @@ IceInternal::TcpEndpointI::TcpEndpointI(BasicStream* s) : s->read(const_cast<bool&>(_compress)); if(s->getReadEncoding() > Ice::Encoding_1_0) { - const_cast<Ice::ProtocolVersion&>(_protocol).__read(s); - const_cast<Ice::EncodingVersion&>(_encoding).__read(s); + s->read(const_cast<Ice::ProtocolVersion&>(_protocol)); + s->read(const_cast<Ice::EncodingVersion&>(_encoding)); } else { @@ -214,8 +214,8 @@ IceInternal::TcpEndpointI::streamWrite(BasicStream* s) const s->write(_compress); if(s->getWriteEncoding() > Ice::Encoding_1_0) { - _protocol.__write(s); - _encoding.__write(s); + s->write(_protocol); + s->write(_encoding); } s->endWriteEncaps(); } |