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, 12 insertions, 8 deletions

diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h
index 9f3e4c500bb..02b194cd9e1 100644
--- a/cpp/src/Ice/EndpointI.h
+++ b/cpp/src/Ice/EndpointI.h
@@ -10,6 +10,7 @@
 #ifndef ICE_ENDPOINT_I_H
 #define ICE_ENDPOINT_I_H
 
+#include <IceUtil/Config.h>
 #include <IceUtil/Shared.h>
 #include <IceUtil/Thread.h>
 #include <IceUtil/Monitor.h>
@@ -20,15 +21,12 @@
 #include <Ice/ConnectorF.h>
 #include <Ice/AcceptorF.h>
 #include <Ice/Protocol.h>
+#include <Ice/Network.h>
 
-#ifdef _WIN32
-#   include <winsock2.h>
-#else
-#   include <sys/socket.h> // For struct sockaddr_storage
+#ifndef ICE_OS_WINRT
+#   include <deque>
 #endif
 
-#include <deque>
-
 namespace IceInternal
 {
 
@@ -154,8 +152,8 @@ public:
     virtual ::Ice::Int ice_getHash() const;
 
 protected:
-
-    virtual std::vector<ConnectorPtr> connectors(const std::vector<struct sockaddr_storage>&) const;
+    
+    virtual std::vector<ConnectorPtr> connectors(const std::vector<Address>&) const;
     friend class EndpointHostResolver;
 
     EndpointI(const Ice::ProtocolVersion&, const Ice::EncodingVersion&);
@@ -184,7 +182,11 @@ inline bool operator<(const EndpointI& l, const EndpointI& r)
     return static_cast<const ::Ice::LocalObject&>(l) < static_cast<const ::Ice::LocalObject&>(r);
 }
 
+#ifndef ICE_OS_WINRT
 class ICE_API EndpointHostResolver : public IceUtil::Thread, public IceUtil::Monitor<IceUtil::Mutex>
+#else
+class ICE_API EndpointHostResolver : public IceUtil::Shared
+#endif
 {
 public:
 
@@ -197,6 +199,7 @@ public:
 
 private:
 
+#ifndef ICE_OS_WINRT
     struct ResolveEntry
     {
         std::string host;
@@ -208,6 +211,7 @@ private:
     const InstancePtr _instance;
     bool _destroyed;
     std::deque<ResolveEntry> _queue;
+#endif
 };
 
 }