2 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index 8a6e1cdc519..3796c6cf480 100644
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -1438,7 +1438,7 @@ IceInternal::getLocalAddresses()
     vector<struct sockaddr_in> result;
     try
     {
-        SOCKET fd = createSocket();
+        SOCKET fd = createSocket(false);
 
         vector<unsigned char> buffer;
         buffer.resize(1024);
diff --git a/cpp/src/Ice/UnknownEndpointI.cpp b/cpp/src/Ice/UnknownEndpointI.cpp
index 38aff132f81..8f19857a644 100644
--- a/cpp/src/Ice/UnknownEndpointI.cpp
+++ b/cpp/src/Ice/UnknownEndpointI.cpp
@@ -119,6 +119,8 @@ vector<EndpointIPtr>
 IceInternal::UnknownEndpointI::expand() const
 {
     assert(false);
+    vector<EndpointIPtr> ret;
+    return ret;
 }
 
 bool