diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-10 09:52:43 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-10 09:52:43 +0200 |
| commit | ddda52695c8647afa8bf833c1e1424df0e799279 (patch) | |
| tree | 43a16df66a37ad1467519553757e7627b72af996 /cpp/src/Ice/ThreadPool.cpp | |
| parent | GCC fixes (diff) | |
| parent | Remove some more VC6 compiler fixes (diff) | |
| download | ice-ddda52695c8647afa8bf833c1e1424df0e799279.tar.bz2 ice-ddda52695c8647afa8bf833c1e1424df0e799279.tar.xz ice-ddda52695c8647afa8bf833c1e1424df0e799279.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/src/Ice/OutgoingAsync.cpp
Diffstat (limited to 'cpp/src/Ice/ThreadPool.cpp')
| -rw-r--r-- | cpp/src/Ice/ThreadPool.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp index 9155b5b5094..3f37c88b024 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> @@ -334,13 +326,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(); |