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/ConnectorI.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/ConnectorI.cpp')
| -rw-r--r-- | cpp/src/IceSSL/ConnectorI.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/IceSSL/ConnectorI.cpp b/cpp/src/IceSSL/ConnectorI.cpp index c881e5574f6..9994ff898fe 100644 --- a/cpp/src/IceSSL/ConnectorI.cpp +++ b/cpp/src/IceSSL/ConnectorI.cpp @@ -15,7 +15,6 @@ #include <Ice/Communicator.h> #include <Ice/LocalException.h> #include <Ice/LoggerUtil.h> -#include <Ice/Network.h> using namespace std; using namespace Ice; @@ -130,7 +129,7 @@ IceSSL::ConnectorI::operator<(const IceInternal::Connector& r) const return IceInternal::compareAddress(_addr, p->_addr) == -1; } -IceSSL::ConnectorI::ConnectorI(const InstancePtr& instance, const string& host, const struct sockaddr_storage& addr, +IceSSL::ConnectorI::ConnectorI(const InstancePtr& instance, const string& host, const IceInternal::Address& addr, Ice::Int timeout, const string& connectionId) : _instance(instance), _logger(instance->communicator()->getLogger()), |