diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-02-11 16:07:16 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-02-11 16:07:16 +0100 |
| commit | 0a52973ce569827357cfa9ac0a2e96c09ffbf7cc (patch) | |
| tree | f219b25bebeca4f1e9e58e7174fe7870675b6246 /cpp/src/IceSSL/EndpointI.cpp | |
| parent | Add Makefile.mak rule to register assemblies in source dir. (diff) | |
| download | ice-0a52973ce569827357cfa9ac0a2e96c09ffbf7cc.tar.bz2 ice-0a52973ce569827357cfa9ac0a2e96c09ffbf7cc.tar.xz ice-0a52973ce569827357cfa9ac0a2e96c09ffbf7cc.zip | |
Fixed ICE-5215: IPv6 support enabled by default
Diffstat (limited to 'cpp/src/IceSSL/EndpointI.cpp')
| -rw-r--r-- | cpp/src/IceSSL/EndpointI.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp index 74818abb5a1..773f39a96a4 100644 --- a/cpp/src/IceSSL/EndpointI.cpp +++ b/cpp/src/IceSSL/EndpointI.cpp @@ -361,15 +361,16 @@ IceSSL::EndpointI::transceiver(IceInternal::EndpointIPtr& endp) const } vector<IceInternal::ConnectorPtr> -IceSSL::EndpointI::connectors() const +IceSSL::EndpointI::connectors(Ice::EndpointSelectionType selType) const { - return _instance->endpointHostResolver()->resolve(_host, _port, const_cast<EndpointI*>(this)); + return _instance->endpointHostResolver()->resolve(_host, _port, selType, const_cast<EndpointI*>(this)); } void -IceSSL::EndpointI::connectors_async(const IceInternal::EndpointI_connectorsPtr& callback) const +IceSSL::EndpointI::connectors_async(Ice::EndpointSelectionType selType, + const IceInternal::EndpointI_connectorsPtr& callback) const { - _instance->endpointHostResolver()->resolve(_host, _port, const_cast<EndpointI*>(this), callback); + _instance->endpointHostResolver()->resolve(_host, _port, selType, const_cast<EndpointI*>(this), callback); } IceInternal::AcceptorPtr |