diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-11-13 10:17:27 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-11-13 10:17:27 +0100 |
| commit | 99b44d083eeee5583adfe642081a827224fa1309 (patch) | |
| tree | 46bb3af634cbd5d90b9e5d46099f4e0e85f70ec6 /cpp/src/Ice/OpaqueEndpointI.cpp | |
| parent | Cosmetic updates to IceGrid Admin connection wizard (diff) | |
| download | ice-99b44d083eeee5583adfe642081a827224fa1309.tar.bz2 ice-99b44d083eeee5583adfe642081a827224fa1309.tar.xz ice-99b44d083eeee5583adfe642081a827224fa1309.zip | |
Fixed ICE-4927: fixed proxy encoding to marshal protocol/encoding version instead of encoding it in endpoints
Diffstat (limited to 'cpp/src/Ice/OpaqueEndpointI.cpp')
| -rw-r--r-- | cpp/src/Ice/OpaqueEndpointI.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/OpaqueEndpointI.cpp b/cpp/src/Ice/OpaqueEndpointI.cpp index 5b3bedbaedd..10b16984b56 100644 --- a/cpp/src/Ice/OpaqueEndpointI.cpp +++ b/cpp/src/Ice/OpaqueEndpointI.cpp @@ -25,7 +25,7 @@ const Ice::EncodingVersion Encoding_0_0 = { 0, 0 }; } IceInternal::OpaqueEndpointI::OpaqueEndpointI(const string& str) : - EndpointI(Protocol_0_0, Encoding_0_0, ""), + EndpointI(""), _rawEncoding(Ice::currentEncoding) { const string delim = " \t\n\r"; @@ -183,7 +183,7 @@ IceInternal::OpaqueEndpointI::OpaqueEndpointI(const string& str) : } IceInternal::OpaqueEndpointI::OpaqueEndpointI(Short type, BasicStream* s) : - EndpointI(Protocol_0_0, Encoding_0_0, ""), + EndpointI(""), _type(type) { _rawEncoding = s->startReadEncaps(); @@ -247,7 +247,7 @@ private: // COMPILERFIX: inlining this constructor causes crashes with gcc 4.0.1. // InfoI::InfoI(Ice::Short type, const Ice::EncodingVersion& rawEncoding, const Ice::ByteSeq& rawBytes) : - Ice::OpaqueEndpointInfo(Protocol_0_0, Encoding_0_0, -1, false, rawEncoding, rawBytes), + Ice::OpaqueEndpointInfo(-1, false, rawEncoding, rawBytes), _type(type) { } |