diff options
| author | Jose <jose@zeroc.com> | 2016-12-14 22:51:50 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-12-14 22:51:50 +0100 |
| commit | 64bc7eef5fc343c33acd6264ed26330de7d2e3a5 (patch) | |
| tree | 17550e0b2e3d9356b6c934154fb57e174503f146 /cpp/src/Ice/NetworkProxy.cpp | |
| parent | Windows test script fixes (diff) | |
| download | ice-64bc7eef5fc343c33acd6264ed26330de7d2e3a5.tar.bz2 ice-64bc7eef5fc343c33acd6264ed26330de7d2e3a5.tar.xz ice-64bc7eef5fc343c33acd6264ed26330de7d2e3a5.zip | |
WinRT -> UWP renames
Diffstat (limited to 'cpp/src/Ice/NetworkProxy.cpp')
| -rw-r--r-- | cpp/src/Ice/NetworkProxy.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/NetworkProxy.cpp b/cpp/src/Ice/NetworkProxy.cpp index bdcf580b8d1..b4055bad7b9 100644 --- a/cpp/src/Ice/NetworkProxy.cpp +++ b/cpp/src/Ice/NetworkProxy.cpp @@ -22,7 +22,7 @@ NetworkProxy::~NetworkProxy() // Out of line to avoid weak vtable } -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP namespace { @@ -304,8 +304,8 @@ IceInternal::createNetworkProxy(const Ice::PropertiesPtr& properties, ProtocolSu proxyHost = properties->getProperty("Ice.SOCKSProxyHost"); if(!proxyHost.empty()) { -#ifdef ICE_OS_WINRT - throw Ice::InitializationException(__FILE__, __LINE__, "SOCKS proxy not supported with WinRT"); +#ifdef ICE_OS_UWP + throw Ice::InitializationException(__FILE__, __LINE__, "SOCKS proxy not supported with UWP"); #else if(protocolSupport == EnableIPv6) { @@ -319,8 +319,8 @@ IceInternal::createNetworkProxy(const Ice::PropertiesPtr& properties, ProtocolSu proxyHost = properties->getProperty("Ice.HTTPProxyHost"); if(!proxyHost.empty()) { -#ifdef ICE_OS_WINRT - throw Ice::InitializationException(__FILE__, __LINE__, "HTTP proxy not supported with WinRT"); +#ifdef ICE_OS_UWP + throw Ice::InitializationException(__FILE__, __LINE__, "HTTP proxy not supported with UWP"); #else return new HTTPNetworkProxy(proxyHost, properties->getPropertyAsIntWithDefault("Ice.HTTPProxyPort", 1080)); #endif |