diff options
| author | Jose <jose@zeroc.com> | 2012-08-16 21:54:10 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-08-16 21:54:10 +0200 |
| commit | 0333544ca90a99baa6e9dc7373eba744d4404970 (patch) | |
| tree | b8d204864002edf7d0bbe903a8bf1fc8c917c8ee /cpp/src/IceSSL/EndpointI.cpp | |
| parent | minor fixes (diff) | |
| parent | IceGridGUI updates to use latest jgoodies packages (diff) | |
| download | ice-0333544ca90a99baa6e9dc7373eba744d4404970.tar.bz2 ice-0333544ca90a99baa6e9dc7373eba744d4404970.tar.xz ice-0333544ca90a99baa6e9dc7373eba744d4404970.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/config/Make.rules.Darwin
cpp/src/Ice/ConnectionFactory.cpp
cpp/src/Ice/ConnectionI.h
Diffstat (limited to 'cpp/src/IceSSL/EndpointI.cpp')
| -rw-r--r-- | cpp/src/IceSSL/EndpointI.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp index d7a63a226ee..6e5a8bb7463 100644 --- a/cpp/src/IceSSL/EndpointI.cpp +++ b/cpp/src/IceSSL/EndpointI.cpp @@ -543,10 +543,15 @@ IceSSL::EndpointI::operator<(const Ice::LocalObject& r) const Ice::Int IceSSL::EndpointI::hashInit() const { - Int h = 0; + Int h = 5381; + IceInternal::hashAdd(h, EndpointType); IceInternal::hashAdd(h, _host); IceInternal::hashAdd(h, _port); IceInternal::hashAdd(h, _timeout); + IceInternal::hashAdd(h, _protocol.major); + IceInternal::hashAdd(h, _protocol.minor); + IceInternal::hashAdd(h, _encoding.major); + IceInternal::hashAdd(h, _encoding.minor); IceInternal::hashAdd(h, _connectionId); IceInternal::hashAdd(h, _compress); return h; |