1 files changed, 5 insertions, 3 deletions
diff --git a/cpp/src/Ice/EventHandler.cpp b/cpp/src/Ice/EventHandler.cpp
index b8da77ab666..39dbfaff523 100644
--- a/cpp/src/Ice/EventHandler.cpp
+++ b/cpp/src/Ice/EventHandler.cpp
@@ -14,18 +14,20 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(EventHandler* p) { return p; }
+#endif
 
 IceInternal::EventHandler::EventHandler() :
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
-    _ready(SocketOperationNone),
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
     _pending(SocketOperationNone),
     _started(SocketOperationNone),
+    _completed(SocketOperationNone),
     _finish(false),
 #else
     _disabled(SocketOperationNone),
 #endif
-    _hasMoreData(false),
+    _ready(SocketOperationNone),
     _registered(SocketOperationNone)
 {
 }