diff options
Diffstat (limited to 'cpp/src/Ice/Selector.cpp')
-rw-r--r-- | cpp/src/Ice/Selector.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/cpp/src/Ice/Selector.cpp b/cpp/src/Ice/Selector.cpp index aadf85a1114..1bcaed5b087 100644 --- a/cpp/src/Ice/Selector.cpp +++ b/cpp/src/Ice/Selector.cpp @@ -161,13 +161,7 @@ Selector::update(EventHandler* handler, SocketOperation remove, SocketOperation if(info) { - if(!PostQueuedCompletionStatus(_handle, 0, reinterpret_cast<ULONG_PTR>(handler), -#if defined(_MSC_VER) && (_MSC_VER < 1300) // COMPILER FIX: VC60 - reinterpret_cast<LPOVERLAPPED>(info) -#else - info -#endif - )) + if(!PostQueuedCompletionStatus(_handle, 0, reinterpret_cast<ULONG_PTR>(handler), info)) { Ice::SocketException ex(__FILE__, __LINE__); ex.error = GetLastError(); @@ -209,12 +203,7 @@ Selector::getNextHandler(SocketOperation& status, int timeout) abort(); } } - -#if defined(_MSC_VER) && (_MSC_VER < 1300) // COMPILER FIX: VC60 - AsyncInfo* info = reinterpret_cast<AsyncInfo*>(ol); -#else AsyncInfo* info = static_cast<AsyncInfo*>(ol); -#endif status = info->status; info->count = SOCKET_ERROR; info->error = WSAGetLastError(); @@ -222,11 +211,7 @@ Selector::getNextHandler(SocketOperation& status, int timeout) } assert(ol); -#if defined(_MSC_VER) && (_MSC_VER < 1300) // COMPILER FIX: VC60 - AsyncInfo* info = reinterpret_cast<AsyncInfo*>(ol); -#else AsyncInfo* info = static_cast<AsyncInfo*>(ol); -#endif status = info->status; info->count = count; info->error = 0; |