diff options
| author | Jose <jose@zeroc.com> | 2014-11-27 10:32:38 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-11-27 10:32:38 +0100 |
| commit | 4c45d03684d7807c64879f809b80093d4e2d432c (patch) | |
| tree | 2b65472bc5a6d70a085f2118ce4d00969f1d4b34 /cpp/src/Ice/IPEndpointI.cpp | |
| parent | Removed dead code (sync. connection establishment code) (diff) | |
| download | ice-4c45d03684d7807c64879f809b80093d4e2d432c.tar.bz2 ice-4c45d03684d7807c64879f809b80093d4e2d432c.tar.xz ice-4c45d03684d7807c64879f809b80093d4e2d432c.zip | |
WinRT build fixes
Diffstat (limited to 'cpp/src/Ice/IPEndpointI.cpp')
| -rw-r--r-- | cpp/src/Ice/IPEndpointI.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/cpp/src/Ice/IPEndpointI.cpp b/cpp/src/Ice/IPEndpointI.cpp index 306f975c879..f537061ae72 100644 --- a/cpp/src/Ice/IPEndpointI.cpp +++ b/cpp/src/Ice/IPEndpointI.cpp @@ -696,16 +696,10 @@ IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& insta { } -vector<ConnectorPtr> -IceInternal::EndpointHostResolver::resolve(const string& host, int port, Ice::EndpointSelectionType selType, - const IPEndpointIPtr& endpoint) -{ - return endpoint->connectors(getAddresses(host, port, _instance->protocolSupport(), selType, - _instance->preferIPv6(), false), _instance->networkProxy()); -} void -IceInternal::EndpointHostResolver::resolve(const string&, int, +IceInternal::EndpointHostResolver::resolve(const string& host, + int port, Ice::EndpointSelectionType selType, const IPEndpointIPtr& endpoint, const EndpointI_connectorsPtr& callback) @@ -713,7 +707,12 @@ IceInternal::EndpointHostResolver::resolve(const string&, int, // // No DNS lookup support with WinRT. // - callback->connectors(endpoint->connectors(selType)); + callback->connectors(endpoint->connectors(getAddresses(host, port, + _instance->protocolSupport(), + selType, + _instance->preferIPv6(), + false), + _instance->networkProxy())); } void |