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/Instance.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/Instance.cpp')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 304036dec90..7fe278d78ad 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -1063,7 +1063,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi if(instanceCount() == 1) { -#if defined(_WIN32) && !defined(ICE_OS_WINRT) +#if defined(_WIN32) && !defined(ICE_OS_UWP) WORD version = MAKEWORD(1, 1); WSADATA data; if(WSAStartup(version, &data) != 0) @@ -1208,7 +1208,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi // // Client ACM enabled by default. Server ACM disabled by default. // -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP const_cast<ImplicitContextIPtr&>(_implicitContext) = ImplicitContextI::create(_initData.properties->getProperty("Ice.ImplicitContext")); #endif @@ -1304,7 +1304,7 @@ IceInternal::Instance::~Instance() } if(instanceCount() == 0) { -#if defined(_WIN32) && !defined(ICE_OS_WINRT) +#if defined(_WIN32) && !defined(ICE_OS_UWP) WSACleanup(); #endif @@ -1660,7 +1660,7 @@ IceInternal::Instance::destroy() { _serverThreadPool->joinWithAllThreads(); } -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP if(_endpointHostResolver) { _endpointHostResolver->getThreadControl().join(); |