diff options
author | Jose <jose@zeroc.com> | 2012-07-13 00:18:06 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2012-07-13 00:18:06 +0200 |
commit | 70802b63320582f0afa8229659ea9fe4a21d02ec (patch) | |
tree | eb455947cc774cc558f96b8d7c78373d2a6f1c2b /cpp/src/Ice/ConnectionFactory.cpp | |
parent | ICE-4839 - Glacier2 sessionHelper IceSSL plug-in (diff) | |
download | ice-70802b63320582f0afa8229659ea9fe4a21d02ec.tar.bz2 ice-70802b63320582f0afa8229659ea9fe4a21d02ec.tar.xz ice-70802b63320582f0afa8229659ea9fe4a21d02ec.zip |
WinRT support
Diffstat (limited to 'cpp/src/Ice/ConnectionFactory.cpp')
-rwxr-xr-x | cpp/src/Ice/ConnectionFactory.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp index 0073c442dca..21e642ce572 100755 --- a/cpp/src/Ice/ConnectionFactory.cpp +++ b/cpp/src/Ice/ConnectionFactory.cpp @@ -1309,7 +1309,7 @@ IceInternal::IncomingConnectionFactory::flushAsyncBatchRequests(const Communicat } } -#ifdef ICE_USE_IOCP +#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) bool IceInternal::IncomingConnectionFactory::startAsync(SocketOperation) { @@ -1657,13 +1657,13 @@ IceInternal::IncomingConnectionFactory::setState(State state) state = StateFinished; } -#ifdef ICE_USE_IOCP +#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) // - // With IOCP, we close the acceptor now to cancel all the pending asynchronous - // operations. It's important to wait for the pending asynchronous operations - // to return before ConnectionI::finished(). Otherwise, if there was a pending - // message waiting to be sent, the connection wouldn't know whether or not the - // send failed or succeeded, potentially breaking at-most-once semantics. + // With IOCP and WinRT, we close the acceptor now to cancel all the pending + // asynchronous operations. It's important to wait for the pending asynchronous + // operations to return before ConnectionI::finished(). Otherwise, if there was + // a pending message waiting to be sent, the connection wouldn't know whether + // or not the send failed or succeeded, potentially breaking at-most-once semantics. // if(_acceptor) { @@ -1685,7 +1685,7 @@ IceInternal::IncomingConnectionFactory::setState(State state) case StateFinished: { assert(_state == StateClosed); -#ifndef ICE_USE_IOCP +#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT) if(_acceptor) { _acceptor->close(); |