3 files changed, 9 insertions, 6 deletions
diff --git a/cpp/src/Ice/LoggerAdminI.cpp b/cpp/src/Ice/LoggerAdminI.cpp
index 4ce2cd073e2..0aedc517a18 100644
--- a/cpp/src/Ice/LoggerAdminI.cpp
+++ b/cpp/src/Ice/LoggerAdminI.cpp
@@ -321,9 +321,9 @@ LoggerAdminI::LoggerAdminI(const PropertiesPtr& props) :
     _maxLogCount(props->getPropertyAsIntWithDefault("Ice.Admin.Logger.KeepLogs", 100)),
     _traceCount(0),
     _maxTraceCount(props->getPropertyAsIntWithDefault("Ice.Admin.Logger.KeepTraces", 100)),
-    _traceLevel(props->getPropertyAsInt("Ice.Trace.Admin.Logger")),
-    _remoteCallCompleted(newCallback(this, &LoggerAdminI::remoteCallCompleted))
+    _traceLevel(props->getPropertyAsInt("Ice.Trace.Admin.Logger"))
 {
+    const_cast<CallbackPtr&>(_remoteCallCompleted) = newCallback(this, &LoggerAdminI::remoteCallCompleted);
     _oldestLog = _queue.end();
     _oldestTrace = _queue.end();
 }
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index 0ad8aa6cefa..823529753a7 100644
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -51,6 +51,12 @@
 #  include <sys/sockio.h>
 #endif
 
+#if defined(_WIN32)
+#   ifndef SIO_LOOPBACK_FAST_PATH
+#       define SIO_LOOPBACK_FAST_PATH _WSAIOW(IOC_VENDOR,16)
+#   endif
+#endif
+
 #if defined(__MINGW32__)
 //
 // Work-around for missing definitions in MinGW Windows headers
@@ -58,9 +64,6 @@
 #   ifndef IPV6_V6ONLY
 #       define IPV6_V6ONLY 27
 #   endif
-#   ifndef SIO_LOOPBACK_FAST_PATH
-#       define SIO_LOOPBACK_FAST_PATH _WSAIOW(IOC_VENDOR,16)
-#   endif
 
 extern "C"
 {
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 9878f540035..87baa329e8d 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -482,7 +482,7 @@ IceProxy::Ice::Object::begin_ice_getConnection(
     {
     public:
 
-        Cpp11CB(const ::IceInternal::Function<void (const ::Ice::ConnectionPtr&)>& responseFunc,
+        Cpp11CB(const ::std::function<void (const ::Ice::ConnectionPtr&)>& responseFunc,
                 const ::std::function<void (const ::Ice::Exception&)>& exceptionFunc) :
             ::IceInternal::Cpp11FnCallbackNC(exceptionFunc, nullptr),
             _response(responseFunc)