Merge branch 'master' into encoding11

Conflicts:
	CHANGES
	cpp/src/Ice/EndpointI.cpp
	cpp/src/Ice/TcpConnector.cpp
	cpp/src/Ice/TcpConnector.h
	cpp/src/Ice/UdpConnector.cpp
	cpp/src/Ice/UdpConnector.h

1 files changed, 33 insertions, 3 deletions

diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp
index ce5d8522484..3543f84ffde 100644
--- a/cpp/src/Ice/EndpointI.cpp
+++ b/cpp/src/Ice/EndpointI.cpp
@@ -10,7 +10,6 @@
 #include <Ice/EndpointI.h>
 #include <Ice/Instance.h>
 #include <Ice/LocalException.h>
-#include <Ice/Network.h>
 #include <Ice/PropertiesI.h>
 #include <Ice/LoggerUtil.h>
 #include <IceUtil/MutexPtrLock.h>
@@ -70,7 +69,7 @@ IceInternal::EndpointI::ice_getHash() const
 }
 
 vector<ConnectorPtr>
-IceInternal::EndpointI::connectors(const vector<struct sockaddr_storage>& addrs) const
+IceInternal::EndpointI::connectors(const vector<Address>& addrs) const
 {
     //
     // This method must be extended by endpoints which use the EndpointHostResolver to create
@@ -145,6 +144,8 @@ IceInternal::EndpointI::parseOption(const string& option, const string& arg, con
     }
 }
 
+#ifndef ICE_OS_WINRT
+
 IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& instance) :
     IceUtil::Thread("Ice endpoint host resolver thread"),
     _instance(instance),
@@ -178,7 +179,7 @@ IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& insta
 void
 IceInternal::EndpointHostResolver::resolve(const string& host, int port, const EndpointIPtr& endpoint,
                                            const EndpointI_connectorsPtr& callback)
-{ 
+{
     //
     // Try to get the addresses without DNS lookup. If this doesn't work, we queue a resolve
     // entry and the thread will take care of getting the endpoint addresses.
@@ -261,3 +262,32 @@ IceInternal::EndpointHostResolver::run()
     }
     _queue.clear();
 }
+
+#else
+
+IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& instance)
+{
+}
+
+void
+IceInternal::EndpointHostResolver::resolve(const string&, int,
+                                           const EndpointIPtr& endpoint, 
+                                           const EndpointI_connectorsPtr& callback)
+{
+    //
+    // No DNS lookup support with WinRT.
+    //
+    callback->connectors(endpoint->connectors());
+}
+
+void
+IceInternal::EndpointHostResolver::destroy()
+{
+}
+
+void
+IceInternal::EndpointHostResolver::run()
+{
+}
+
+#endif