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/Ice/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/Ice/EndpointI.cpp')
| -rw-r--r-- | cpp/src/Ice/EndpointI.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp index 0115a5f31cc..05f75b778d6 100644 --- a/cpp/src/Ice/EndpointI.cpp +++ b/cpp/src/Ice/EndpointI.cpp @@ -125,7 +125,7 @@ IceInternal::EndpointHostResolver::resolve(const string& host, int port, const E // Try to get the addresses without DNS lookup. If this doesn't // work, we retry with DNS lookup (and observer). // - vector<struct sockaddr_storage> addrs = getAddresses(host, port, _instance->protocolSupport(), false); + vector<Address> addrs = getAddresses(host, port, _instance->protocolSupport(), false); if(!addrs.empty()) { return endpoint->connectors(addrs); @@ -161,7 +161,7 @@ IceInternal::EndpointHostResolver::resolve(const string& host, int port, const E // try { - vector<struct sockaddr_storage> addrs = getAddresses(host, port, _instance->protocolSupport(), false); + vector<Address> addrs = getAddresses(host, port, _instance->protocolSupport(), false); if(!addrs.empty()) { callback->connectors(endpoint->connectors(addrs)); |