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/UdpEndpointI.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/UdpEndpointI.cpp')
| -rw-r--r-- | cpp/src/Ice/UdpEndpointI.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/UdpEndpointI.cpp b/cpp/src/Ice/UdpEndpointI.cpp index c20a430bbe6..4be1d98bd77 100644 --- a/cpp/src/Ice/UdpEndpointI.cpp +++ b/cpp/src/Ice/UdpEndpointI.cpp @@ -218,8 +218,8 @@ IceInternal::UdpEndpointI::UdpEndpointI(BasicStream* s) : s->startReadEncaps(); s->read(const_cast<string&>(_host), false); s->read(const_cast<Int&>(_port)); - 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)); // Not transmitted. //s->read(const_cast<bool&>(_connect)); s->read(const_cast<bool&>(_compress)); @@ -233,8 +233,8 @@ IceInternal::UdpEndpointI::streamWrite(BasicStream* s) const s->startWriteEncaps(); s->write(_host, false); s->write(_port); - _protocol.__write(s); - _encoding.__write(s); + s->write(_protocol); + s->write(_encoding); // Not transmitted. //s->write(_connect); s->write(_compress); |