diff options
| author | Jose <jose@zeroc.com> | 2012-07-13 00:18:06 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-07-13 00:18:06 +0200 |
| commit | 70802b63320582f0afa8229659ea9fe4a21d02ec (patch) | |
| tree | eb455947cc774cc558f96b8d7c78373d2a6f1c2b /cpp/src/Ice/TcpConnector.cpp | |
| parent | ICE-4839 - Glacier2 sessionHelper IceSSL plug-in (diff) | |
| download | ice-70802b63320582f0afa8229659ea9fe4a21d02ec.tar.bz2 ice-70802b63320582f0afa8229659ea9fe4a21d02ec.tar.xz ice-70802b63320582f0afa8229659ea9fe4a21d02ec.zip | |
WinRT support
Diffstat (limited to 'cpp/src/Ice/TcpConnector.cpp')
| -rw-r--r-- | cpp/src/Ice/TcpConnector.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/TcpConnector.cpp b/cpp/src/Ice/TcpConnector.cpp index e349fac992e..673a5d3e1ed 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; @@ -117,11 +117,11 @@ 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, - Ice::Int timeout, const string& connectionId) : +IceInternal::TcpConnector::TcpConnector(const InstancePtr& instance, const Address& addr, Ice::Int timeout, + const string& connectionId) : _instance(instance), _traceLevels(instance->traceLevels()), _logger(instance->initializationData().logger), |