diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-08-11 10:42:04 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-08-11 10:42:04 +0200 |
| commit | 12f8959ad8d0843a55dd309f087dd1f8a5dda88f (patch) | |
| tree | 5186165ce0e0b4bb432a9e70314e597563bb8c56 /cpp/src/Ice/Network.h | |
| parent | Updates branch description (diff) | |
| download | ice-12f8959ad8d0843a55dd309f087dd1f8a5dda88f.tar.bz2 ice-12f8959ad8d0843a55dd309f087dd1f8a5dda88f.tar.xz ice-12f8959ad8d0843a55dd309f087dd1f8a5dda88f.zip | |
Fixed ICE-6695, Ice for WinRT hang on Windows 10
Diffstat (limited to 'cpp/src/Ice/Network.h')
| -rw-r--r-- | cpp/src/Ice/Network.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h index f90e3d6da61..32182784a6d 100644 --- a/cpp/src/Ice/Network.h +++ b/cpp/src/Ice/Network.h @@ -152,6 +152,16 @@ enum SocketOperation }; // +// On WinRT, wait only for read to return, on IOCP/Win32 wait for +// both pending read and write operations to complete (#ICE-6695). +// +#if defined(ICE_OS_WINRT) +const int SocketOperationWaitForClose = 1; +#elif defined(ICE_USE_IOCP) +const int SocketOperationWaitForClose = 3; +#endif + +// // AsyncInfo struct for Windows IOCP or WinRT holds the result of // asynchronous operations after it completed. // |