- Merge IPv6 support from Dwayne's branch.

- Reviewed and fixed IPv6 bugs.
- Fixed bug in the outgoing connection factory where an assert could be
  triggered if the proxy contained identical endpoints

1 files changed, 3 insertions, 3 deletions

diff --git a/cpp/src/Ice/TcpConnector.h b/cpp/src/Ice/TcpConnector.h
index 2147f30cccc..28c42c064b8 100644
--- a/cpp/src/Ice/TcpConnector.h
+++ b/cpp/src/Ice/TcpConnector.h
@@ -19,7 +19,7 @@
 #ifdef _WIN32
 #   include <winsock2.h>
 #else
-#   include <netinet/in.h> // For struct sockaddr_in
+#   include <netinet/in.h> // For struct sockaddr_storage
 #endif
 
 namespace IceInternal
@@ -40,14 +40,14 @@ public:
 
 private:
     
-    TcpConnector(const InstancePtr&, const struct sockaddr_in&, Ice::Int, const std::string&);
+    TcpConnector(const InstancePtr&, const struct sockaddr_storage&, Ice::Int, const std::string&);
     virtual ~TcpConnector();
     friend class TcpEndpointI;
 
     const InstancePtr _instance;
     const TraceLevelsPtr _traceLevels;
     const ::Ice::LoggerPtr _logger;
-    struct sockaddr_in _addr;
+    struct sockaddr_storage _addr;
     const Ice::Int _timeout;
     const std::string _connectionId;
 };