1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/Ice/EventHandler.cpp b/cpp/src/Ice/EventHandler.cpp
index 4d1bf821782..78827685267 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),
     _pending(SocketOperationNone),
     _started(SocketOperationNone),
+    _completed(SocketOperationNone),
     _finish(false),
 #else
     _disabled(SocketOperationNone),
 #endif
-    _hasMoreData(false),
+    _ready(SocketOperationNone),
     _registered(SocketOperationNone)
 {
 }