diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-09-02 12:58:35 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-09-02 12:58:35 -0230 |
| commit | 7b3198c81431c2491afa128f78f4b314eeaa358b (patch) | |
| tree | 9f2d72fa96501340566fe29a336b356b497da693 /cpp/src/Ice/Selector.cpp | |
| parent | 4238 - Java test suite and ant options. (diff) | |
| download | ice-7b3198c81431c2491afa128f78f4b314eeaa358b.tar.bz2 ice-7b3198c81431c2491afa128f78f4b314eeaa358b.tar.xz ice-7b3198c81431c2491afa128f78f4b314eeaa358b.zip | |
Added Advanced Installer third party installer projects for VC6 and VC9
Fixed some VC6 compile errors
Diffstat (limited to 'cpp/src/Ice/Selector.cpp')
| -rw-r--r-- | cpp/src/Ice/Selector.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/cpp/src/Ice/Selector.cpp b/cpp/src/Ice/Selector.cpp index fefcca7a540..aeb68e92006 100644 --- a/cpp/src/Ice/Selector.cpp +++ b/cpp/src/Ice/Selector.cpp @@ -76,7 +76,13 @@ Selector::update(EventHandler* handler, SocketOperation remove, SocketOperation if(info) { - if(!PostQueuedCompletionStatus(_handle, 0, reinterpret_cast<ULONG_PTR>(handler), 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 + )) { Ice::SocketException ex(__FILE__, __LINE__); ex.error = GetLastError(); @@ -119,7 +125,11 @@ Selector::getNextHandler(SocketOperation& status, int timeout) } } +#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(); @@ -127,7 +137,11 @@ 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; |