diff options
author | Jose <jose@zeroc.com> | 2016-12-14 22:51:50 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2016-12-14 22:51:50 +0100 |
commit | 64bc7eef5fc343c33acd6264ed26330de7d2e3a5 (patch) | |
tree | 17550e0b2e3d9356b6c934154fb57e174503f146 /cpp/src/Ice/TcpAcceptor.h | |
parent | Windows test script fixes (diff) | |
download | ice-64bc7eef5fc343c33acd6264ed26330de7d2e3a5.tar.bz2 ice-64bc7eef5fc343c33acd6264ed26330de7d2e3a5.tar.xz ice-64bc7eef5fc343c33acd6264ed26330de7d2e3a5.zip |
WinRT -> UWP renames
Diffstat (limited to 'cpp/src/Ice/TcpAcceptor.h')
-rw-r--r-- | cpp/src/Ice/TcpAcceptor.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/TcpAcceptor.h b/cpp/src/Ice/TcpAcceptor.h index 2d9fc24d72f..bb4b17ceb6f 100644 --- a/cpp/src/Ice/TcpAcceptor.h +++ b/cpp/src/Ice/TcpAcceptor.h @@ -15,7 +15,7 @@ #include <Ice/Acceptor.h> #include <Ice/Network.h> -#if defined(ICE_OS_WINRT) +#if defined(ICE_OS_UWP) #include <deque> #endif @@ -29,13 +29,13 @@ class TcpAcceptor : public Acceptor, public NativeInfo public: virtual NativeInfoPtr getNativeInfo(); -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) virtual AsyncInfo* getAsyncInfo(SocketOperation); #endif virtual void close(); virtual EndpointIPtr listen(); -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) virtual void startAccept(); virtual void finishAccept(); #endif @@ -63,7 +63,7 @@ private: int _acceptError; std::vector<char> _acceptBuf; AsyncInfo _info; -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) IceUtil::Mutex _mutex; bool _acceptPending; std::deque<Windows::Networking::Sockets::StreamSocket^> _accepted; |