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/UdpConnector.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/UdpConnector.h')
| -rw-r--r-- | cpp/src/Ice/UdpConnector.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/cpp/src/Ice/UdpConnector.h b/cpp/src/Ice/UdpConnector.h index 2c543b3f67d..148c767407b 100644 --- a/cpp/src/Ice/UdpConnector.h +++ b/cpp/src/Ice/UdpConnector.h @@ -14,12 +14,7 @@ #include <Ice/InstanceF.h> #include <Ice/Connector.h> #include <Ice/Protocol.h> - -#ifdef _WIN32 -# include <winsock2.h> -#else -# include <sys/socket.h> // For struct sockaddr_storage -#endif +#include <Ice/Network.h> namespace IceInternal { @@ -39,13 +34,14 @@ public: private: - UdpConnector(const InstancePtr&, const struct sockaddr_storage&, const std::string&, int, + UdpConnector(const InstancePtr&, const Address&, const std::string&, int, const Ice::ProtocolVersion&, const Ice::EncodingVersion&, const std::string&); + virtual ~UdpConnector(); friend class UdpEndpointI; const InstancePtr _instance; - struct sockaddr_storage _addr; + const Address _addr; const std::string _mcastInterface; const int _mcastTtl; const Ice::ProtocolVersion _protocol; @@ -54,5 +50,4 @@ private: }; } - #endif |