diff options
| author | Mark Spruiell <mes@zeroc.com> | 2014-03-19 12:45:55 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2014-03-19 12:45:55 -0700 |
| commit | cdcffbcc3c3c052afdeb772ff0167e7a90b525bb (patch) | |
| tree | 4f16ee41ef7d33394c44e9db81e4d6cd89908250 /cpp/src/Ice/UdpConnector.cpp | |
| parent | fixing testicedist.py for 5487 (diff) | |
| download | ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.tar.bz2 ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.tar.xz ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.zip | |
merging javascript branch
Diffstat (limited to 'cpp/src/Ice/UdpConnector.cpp')
| -rw-r--r-- | cpp/src/Ice/UdpConnector.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/UdpConnector.cpp b/cpp/src/Ice/UdpConnector.cpp index 3ce4e52e580..de3c38175bf 100644 --- a/cpp/src/Ice/UdpConnector.cpp +++ b/cpp/src/Ice/UdpConnector.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -8,7 +8,7 @@ // ********************************************************************** #include <Ice/UdpConnector.h> - +#include <Ice/ProtocolInstance.h> #include <Ice/UdpTransceiver.h> #include <Ice/UdpEndpointI.h> #include <Ice/LocalException.h> @@ -26,7 +26,7 @@ IceInternal::UdpConnector::connect() Short IceInternal::UdpConnector::type() const { - return UDPEndpointType; + return _instance->type(); } string @@ -110,7 +110,7 @@ IceInternal::UdpConnector::operator<(const Connector& r) const return compareAddress(_addr, p->_addr) == -1; } -IceInternal::UdpConnector::UdpConnector(const InstancePtr& instance, const Address& addr, +IceInternal::UdpConnector::UdpConnector(const ProtocolInstancePtr& instance, const Address& addr, const string& mcastInterface, int mcastTtl, const std::string& connectionId) : _instance(instance), _addr(addr), |