diff options
| author | Jose <jose@zeroc.com> | 2012-07-17 16:53:05 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-07-17 16:53:05 +0200 |
| commit | 9e833a51504b14ac852863dcad59a51e6025ce79 (patch) | |
| tree | 6ca0297b6e6575fe4c6b2d48b606fef8132b9e5a /cpp/src/Ice/TcpConnector.h | |
| parent | implementing optional params in Java (diff) | |
| parent | WinRT support (diff) | |
| download | ice-9e833a51504b14ac852863dcad59a51e6025ce79.tar.bz2 ice-9e833a51504b14ac852863dcad59a51e6025ce79.tar.xz ice-9e833a51504b14ac852863dcad59a51e6025ce79.zip | |
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
Diffstat (limited to 'cpp/src/Ice/TcpConnector.h')
| -rw-r--r-- | cpp/src/Ice/TcpConnector.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/cpp/src/Ice/TcpConnector.h b/cpp/src/Ice/TcpConnector.h index 33102409687..341696087ef 100644 --- a/cpp/src/Ice/TcpConnector.h +++ b/cpp/src/Ice/TcpConnector.h @@ -16,12 +16,7 @@ #include <Ice/TraceLevelsF.h> #include <Ice/LoggerF.h> #include <Ice/Connector.h> - -#ifdef _WIN32 -# include <winsock2.h> -#else -# include <sys/socket.h> -#endif +#include <Ice/Network.h> namespace IceInternal { @@ -41,7 +36,7 @@ public: private: - TcpConnector(const InstancePtr&, const struct sockaddr_storage&, Ice::Int, const Ice::ProtocolVersion&, + TcpConnector(const InstancePtr&, const Address&, Ice::Int, const Ice::ProtocolVersion&, const Ice::EncodingVersion&, const std::string&); virtual ~TcpConnector(); friend class TcpEndpointI; @@ -49,7 +44,7 @@ private: const InstancePtr _instance; const TraceLevelsPtr _traceLevels; const ::Ice::LoggerPtr _logger; - const struct sockaddr_storage _addr; + const Address _addr; const Ice::Int _timeout; const Ice::ProtocolVersion _protocol; const Ice::EncodingVersion _encoding; |