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/UdpEndpointI.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/UdpEndpointI.h')
| -rw-r--r-- | cpp/src/Ice/UdpEndpointI.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/Ice/UdpEndpointI.h b/cpp/src/Ice/UdpEndpointI.h index c95cd83b18e..c82ef8aa2fb 100644 --- a/cpp/src/Ice/UdpEndpointI.h +++ b/cpp/src/Ice/UdpEndpointI.h @@ -10,8 +10,10 @@ #ifndef ICE_UDP_ENDPOINT_I_H #define ICE_UDP_ENDPOINT_I_H +#include <IceUtil/Config.h> #include <Ice/EndpointI.h> #include <Ice/EndpointFactory.h> +#include <Ice/Network.h> namespace IceInternal { @@ -49,7 +51,7 @@ public: private: virtual ::Ice::Int hashInit() const; - virtual std::vector<ConnectorPtr> connectors(const std::vector<struct sockaddr_storage>&) const; + virtual std::vector<ConnectorPtr> connectors(const std::vector<IceInternal::Address>&) const; // // All members are const, because endpoints are immutable. |