diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-12-26 11:25:19 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-12-26 11:25:19 -0500 |
| commit | 75911e425d3cba4c0254e7dd2636c115a7a91053 (patch) | |
| tree | a7cc1d638bc3cca65866785eef6217a4f77420ce /cpp/src/IceSSL/EndpointI.cpp | |
| parent | mingw builds now use the same COMPSUFFIX format as VC++ builds. (diff) | |
| download | ice-75911e425d3cba4c0254e7dd2636c115a7a91053.tar.bz2 ice-75911e425d3cba4c0254e7dd2636c115a7a91053.tar.xz ice-75911e425d3cba4c0254e7dd2636c115a7a91053.zip | |
Fixed ICE-5079: Replaced IceInternal::Address by a union to avoid reinterpret_cast and warnings
Diffstat (limited to 'cpp/src/IceSSL/EndpointI.cpp')
| -rw-r--r-- | cpp/src/IceSSL/EndpointI.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp index a433b3259d1..74818abb5a1 100644 --- a/cpp/src/IceSSL/EndpointI.cpp +++ b/cpp/src/IceSSL/EndpointI.cpp @@ -12,7 +12,6 @@ #include <IceSSL/ConnectorI.h> #include <IceSSL/TransceiverI.h> #include <IceSSL/Instance.h> -#include <Ice/Network.h> #include <Ice/BasicStream.h> #include <Ice/LocalException.h> #include <Ice/DefaultsAndOverrides.h> @@ -534,7 +533,7 @@ IceSSL::EndpointI::hashInit() const } vector<IceInternal::ConnectorPtr> -IceSSL::EndpointI::connectors(const vector<struct sockaddr_storage>& addresses) const +IceSSL::EndpointI::connectors(const vector<IceInternal::Address>& addresses) const { vector<IceInternal::ConnectorPtr> connectors; for(unsigned int i = 0; i < addresses.size(); ++i) |