diff options
Diffstat (limited to 'cpp/src/Ice/ThreadPool.cpp')
| -rw-r--r-- | cpp/src/Ice/ThreadPool.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp index 288377987db..8e79614c66e 100644 --- a/cpp/src/Ice/ThreadPool.cpp +++ b/cpp/src/Ice/ThreadPool.cpp @@ -7,14 +7,6 @@ // // ********************************************************************** -// -// The following is required to bring in some definitions. Don't -// define with Metro Style apps. -// -#if defined(_WIN32) && !defined(_WIN32_WINNT) && WINAPI_FAMILY != 0x02 -# define _WIN32_WINNT 0x0501 -#endif - #include <Ice/ThreadPool.h> #include <IceUtil/DisableWarnings.h> #include <Ice/EventHandler.h> @@ -333,13 +325,7 @@ void IceInternal::ThreadPoolWorkQueue::postMessage() { #if defined(ICE_USE_IOCP) - if(!PostQueuedCompletionStatus(_selector.getIOCPHandle(), 0, reinterpret_cast<ULONG_PTR>(this), -# if defined(_MSC_VER) && (_MSC_VER < 1300) // COMPILER FIX: VC60 - reinterpret_cast<LPOVERLAPPED>(&_info) -# else - &_info -# endif - )) + if(!PostQueuedCompletionStatus(_selector.getIOCPHandle(), 0, reinterpret_cast<ULONG_PTR>(this), &_info)) { SocketException ex(__FILE__, __LINE__); ex.error = GetLastError(); @@ -1162,7 +1148,7 @@ IceInternal::ThreadPool::EventHandlerThread::run() ThreadPoolCurrent::ThreadPoolCurrent(const InstancePtr& instance, const ThreadPoolPtr& threadPool) : operation(SocketOperationNone), - stream(instance.get()), + stream(instance.get(), Ice::currentProtocolEncoding), _threadPool(threadPool.get()), _ioCompleted(false) #if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT) |