From 64bc7eef5fc343c33acd6264ed26330de7d2e3a5 Mon Sep 17 00:00:00 2001 From: Jose Date: Wed, 14 Dec 2016 22:51:50 +0100 Subject: WinRT -> UWP renames --- cpp/src/Ice/ThreadPool.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'cpp/src/Ice/ThreadPool.h') diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h index 6ff21fb606d..fbca641eb68 100644 --- a/cpp/src/Ice/ThreadPool.h +++ b/cpp/src/Ice/ThreadPool.h @@ -121,7 +121,7 @@ private: bool ioCompleted(ThreadPoolCurrent&); -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) bool startMessage(ThreadPoolCurrent&); void finishMessage(ThreadPoolCurrent&); #else @@ -160,7 +160,7 @@ private: std::set _threads; // All threads, running or not. int _inUse; // Number of threads that are currently in use. -#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT) +#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP) int _inUseIO; // Number of threads that are currently performing IO. std::vector > _handlers; std::vector >::const_iterator _nextHandler; @@ -183,7 +183,7 @@ public: return _threadPool->ioCompleted(const_cast(*this)); } -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) bool startMessage() { return _threadPool->startMessage(const_cast(*this)); @@ -211,7 +211,7 @@ private: ThreadPool::EventHandlerThreadPtr _thread; EventHandlerPtr _handler; bool _ioCompleted; -#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT) +#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP) bool _leader; #else DWORD _count; @@ -229,7 +229,7 @@ public: void destroy(); void queue(const ThreadPoolWorkItemPtr&); -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) bool startAsync(SocketOperation); bool finishAsync(SocketOperation); #endif @@ -256,7 +256,7 @@ private: // the IOCP implementation and ensures that finishMessage isn't called multiple // times. // -#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT) +#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP) template class ThreadPoolMessage { public: -- cgit v1.2.3