summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/UdpEndpointI.cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2013-04-04 16:02:42 -0700
committerMark Spruiell <mes@zeroc.com>2013-04-04 16:02:42 -0700
commit9cb665138c7d2422739e32b40a249c64fd3b6cd5 (patch)
tree94759d916599ca08761b98580185a230744ac67a /cpp/src/Ice/UdpEndpointI.cpp
parentx64 VC10 icexml35d.dll was linked to wrong file (diff)
downloadice-9cb665138c7d2422739e32b40a249c64fd3b6cd5.tar.bz2
ice-9cb665138c7d2422739e32b40a249c64fd3b6cd5.tar.xz
ice-9cb665138c7d2422739e32b40a249c64fd3b6cd5.zip
* SOCKS support for C++
* Minor cleanup in C# * Unity fixes
Diffstat (limited to 'cpp/src/Ice/UdpEndpointI.cpp')
-rw-r--r--cpp/src/Ice/UdpEndpointI.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/cpp/src/Ice/UdpEndpointI.cpp b/cpp/src/Ice/UdpEndpointI.cpp
index 56828588a2d..f36d54ece5c 100644
--- a/cpp/src/Ice/UdpEndpointI.cpp
+++ b/cpp/src/Ice/UdpEndpointI.cpp
@@ -491,6 +491,17 @@ IceInternal::UdpEndpointI::equivalent(const EndpointIPtr& endpoint) const
return udpEndpointI->_host == _host && udpEndpointI->_port == _port;
}
+vector<ConnectorPtr>
+IceInternal::UdpEndpointI::connectors(const vector<Address>& addresses, const NetworkProxyPtr&) const
+{
+ vector<ConnectorPtr> connectors;
+ for(unsigned int i = 0; i < addresses.size(); ++i)
+ {
+ connectors.push_back(new UdpConnector(_instance, addresses[i], _mcastInterface, _mcastTtl, _connectionId));
+ }
+ return connectors;
+}
+
bool
IceInternal::UdpEndpointI::operator==(const LocalObject& r) const
{
@@ -643,17 +654,6 @@ IceInternal::UdpEndpointI::hashInit() const
return h;
}
-vector<ConnectorPtr>
-IceInternal::UdpEndpointI::connectors(const vector<Address>& addresses) const
-{
- vector<ConnectorPtr> connectors;
- for(unsigned int i = 0; i < addresses.size(); ++i)
- {
- connectors.push_back(new UdpConnector(_instance, addresses[i], _mcastInterface, _mcastTtl, _connectionId));
- }
- return connectors;
-}
-
IceInternal::UdpEndpointFactory::UdpEndpointFactory(const InstancePtr& instance)
: _instance(instance)