diff options
| author | Jose <jose@zeroc.com> | 2012-07-17 16:53:05 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-07-17 16:53:05 +0200 |
| commit | 9e833a51504b14ac852863dcad59a51e6025ce79 (patch) | |
| tree | 6ca0297b6e6575fe4c6b2d48b606fef8132b9e5a /cpp/src/Ice/EventHandler.cpp | |
| parent | implementing optional params in Java (diff) | |
| parent | WinRT support (diff) | |
| download | ice-9e833a51504b14ac852863dcad59a51e6025ce79.tar.bz2 ice-9e833a51504b14ac852863dcad59a51e6025ce79.tar.xz ice-9e833a51504b14ac852863dcad59a51e6025ce79.zip | |
Merge branch 'master' into encoding11
Conflicts:
CHANGES
cpp/src/Ice/EndpointI.cpp
cpp/src/Ice/TcpConnector.cpp
cpp/src/Ice/TcpConnector.h
cpp/src/Ice/UdpConnector.cpp
cpp/src/Ice/UdpConnector.h
Diffstat (limited to 'cpp/src/Ice/EventHandler.cpp')
| -rw-r--r-- | cpp/src/Ice/EventHandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/EventHandler.cpp b/cpp/src/Ice/EventHandler.cpp index 48444ebe477..12c796843c4 100644 --- a/cpp/src/Ice/EventHandler.cpp +++ b/cpp/src/Ice/EventHandler.cpp @@ -17,7 +17,7 @@ using namespace IceInternal; IceUtil::Shared* IceInternal::upCast(EventHandler* p) { return p; } IceInternal::EventHandler::EventHandler() : -#ifdef ICE_USE_IOCP +#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) _pending(SocketOperationNone), _ready(SocketOperationNone), _started(SocketOperationNone), |