diff options
Diffstat (limited to 'cpp/src/Ice/TcpConnector.cpp')
| -rw-r--r-- | cpp/src/Ice/TcpConnector.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/TcpConnector.cpp b/cpp/src/Ice/TcpConnector.cpp index 14f0ca81857..a3211c28eb7 100644 --- a/cpp/src/Ice/TcpConnector.cpp +++ b/cpp/src/Ice/TcpConnector.cpp @@ -31,7 +31,7 @@ IceInternal::TcpConnector::connect() try { - TransceiverPtr transceiver = new TcpTransceiver(_instance, createSocket(false, _addr.ss_family), false); + TransceiverPtr transceiver = new TcpTransceiver(_instance, createSocket(false, _addr), false); dynamic_cast<TcpTransceiver*>(transceiver.get())->connect(_addr); return transceiver; } @@ -71,7 +71,7 @@ IceInternal::TcpConnector::operator==(const Connector& r) const { return false; } - + if(_timeout != p->_timeout) { return false; @@ -145,10 +145,10 @@ IceInternal::TcpConnector::operator<(const Connector& r) const { return false; } - return compareAddress(_addr, p->_addr) == -1; + return compareAddress(_addr, p->_addr) < 0; } -IceInternal::TcpConnector::TcpConnector(const InstancePtr& instance, const struct sockaddr_storage& addr, +IceInternal::TcpConnector::TcpConnector(const InstancePtr& instance, const Address& addr, Ice::Int timeout, const Ice::ProtocolVersion& protocol, const Ice::EncodingVersion& encoding, const string& connectionId) : _instance(instance), |