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/include/IceUtil/Thread.h | |
| 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/include/IceUtil/Thread.h')
| -rw-r--r-- | cpp/include/IceUtil/Thread.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/include/IceUtil/Thread.h b/cpp/include/IceUtil/Thread.h index f1dd851aa84..2431038a53e 100644 --- a/cpp/include/IceUtil/Thread.h +++ b/cpp/include/IceUtil/Thread.h @@ -15,7 +15,7 @@ #include <IceUtil/Handle.h> #include <IceUtil/Mutex.h> -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP # include <memory> # include <thread> #endif @@ -35,7 +35,7 @@ public: // ThreadControl(); -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP ThreadControl(const std::shared_ptr<std::thread>&); #elif defined(_WIN32) ThreadControl(HANDLE, DWORD); @@ -80,7 +80,7 @@ public: // id() returns the Thread ID on Windows and the underlying pthread_t // on POSIX platforms. // -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP typedef std::thread::id ID; #elif defined(_WIN32) typedef DWORD ID; @@ -94,7 +94,7 @@ public: private: -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP std::shared_ptr<std::thread> _thread; std::thread::id _id; #elif defined(_WIN32) @@ -152,7 +152,7 @@ protected: bool _started; bool _running; -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP std::shared_ptr<std::thread> _thread; #elif defined(_WIN32) HANDLE _handle; |