From cdcffbcc3c3c052afdeb772ff0167e7a90b525bb Mon Sep 17 00:00:00 2001
From: Mark Spruiell <mes@zeroc.com>
Date: Wed, 19 Mar 2014 12:45:55 -0700
Subject: merging javascript branch

---
 cpp/src/Ice/Network.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'cpp/src/Ice/Network.h')

diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h
index 247b2331a87..b967074a229 100644
--- a/cpp/src/Ice/Network.h
+++ b/cpp/src/Ice/Network.h
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -178,6 +178,8 @@ public:
     //
 #if defined(ICE_USE_IOCP)
     virtual AsyncInfo* getAsyncInfo(SocketOperation) = 0;
+    void initialize(HANDLE, ULONG_PTR);
+    void completed(SocketOperation operation);
 #elif defined(ICE_OS_WINRT)
     virtual void setCompletedHandler(SocketOperationCompletedHandler^) = 0;
 #endif
@@ -185,6 +187,11 @@ public:
 protected:
 
     SOCKET _fd;
+
+#if defined(ICE_USE_IOCP)
+    HANDLE _handle;
+    ULONG_PTR _key;
+#endif
 };
 typedef IceUtil::Handle<NativeInfo> NativeInfoPtr;
 
-- 
cgit v1.2.3