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.cpp | |
| 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.cpp')
| -rw-r--r-- | cpp/src/Ice/UdpConnector.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cpp/src/Ice/UdpConnector.cpp b/cpp/src/Ice/UdpConnector.cpp index c12af491135..29782122b53 100644 --- a/cpp/src/Ice/UdpConnector.cpp +++ b/cpp/src/Ice/UdpConnector.cpp @@ -8,9 +8,9 @@ // ********************************************************************** #include <Ice/UdpConnector.h> + #include <Ice/UdpTransceiver.h> #include <Ice/UdpEndpointI.h> -#include <Ice/Network.h> #include <Ice/LocalException.h> using namespace std; @@ -43,7 +43,6 @@ IceInternal::UdpConnector::operator==(const Connector& r) const { return false; } - if(compareAddress(_addr, p->_addr) != 0) { return false; @@ -136,12 +135,10 @@ IceInternal::UdpConnector::operator<(const Connector& r) const { return false; } - return compareAddress(_addr, p->_addr) == -1; } - -IceInternal::UdpConnector::UdpConnector(const InstancePtr& instance, const struct sockaddr_storage& addr, +IceInternal::UdpConnector::UdpConnector(const InstancePtr& instance, const Address& addr, const string& mcastInterface, int mcastTtl, const Ice::ProtocolVersion& protocol, const Ice::EncodingVersion& encoding, const std::string& connectionId) : |