diff options
| author | Jose <jose@zeroc.com> | 2012-08-09 22:50:03 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-08-09 22:50:03 +0200 |
| commit | 766f8cb53b45b19036c478ef16d54fc5eba155de (patch) | |
| tree | 632da020f5d90dd205fed229aeadc063b12a6a1b /cpp/src/IceUtil/Cond.cpp | |
| parent | Merge branch 'encoding11' of ssh://git/home/git/ice into encoding11 (diff) | |
| download | ice-766f8cb53b45b19036c478ef16d54fc5eba155de.tar.bz2 ice-766f8cb53b45b19036c478ef16d54fc5eba155de.tar.xz ice-766f8cb53b45b19036c478ef16d54fc5eba155de.zip | |
Remove ICE_OS_WINRT ifdefs in Cond.cpp
Diffstat (limited to 'cpp/src/IceUtil/Cond.cpp')
| -rw-r--r-- | cpp/src/IceUtil/Cond.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/cpp/src/IceUtil/Cond.cpp b/cpp/src/IceUtil/Cond.cpp index 6cfa0700838..e63405e7184 100644 --- a/cpp/src/IceUtil/Cond.cpp +++ b/cpp/src/IceUtil/Cond.cpp @@ -42,11 +42,7 @@ IceUtil::Cond::broadcast() IceUtilInternal::Semaphore::Semaphore(long initial) { -#ifndef ICE_OS_WINRT _sem = CreateSemaphore(0, initial, 0x7fffffff, 0); -#else - _sem = CreateSemaphoreExW(0, initial, 0x7fffffff, 0, 0, SEMAPHORE_ALL_ACCESS); -#endif if(_sem == INVALID_HANDLE_VALUE) { throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError()); @@ -61,11 +57,7 @@ IceUtilInternal::Semaphore::~Semaphore() void IceUtilInternal::Semaphore::wait() const { -#ifndef ICE_OS_WINRT DWORD rc = WaitForSingleObject(_sem, INFINITE); -#else - DWORD rc = WaitForSingleObjectEx(_sem, INFINITE, true); -#endif if(rc != WAIT_OBJECT_0) { throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError()); @@ -81,11 +73,7 @@ IceUtilInternal::Semaphore::timedWait(const IceUtil::Time& timeout) const throw IceUtil::InvalidTimeoutException(__FILE__, __LINE__, timeout); } -#ifndef ICE_OS_WINRT DWORD rc = WaitForSingleObject(_sem, static_cast<DWORD>(msTimeout)); -#else - DWORD rc = WaitForSingleObjectEx(_sem, static_cast<DWORD>(msTimeout), true); -#endif if(rc != WAIT_TIMEOUT && rc != WAIT_OBJECT_0) { throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError()); |