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.h | |
| 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.h')
| -rw-r--r-- | cpp/src/Ice/UdpConnector.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cpp/src/Ice/UdpConnector.h b/cpp/src/Ice/UdpConnector.h index 31ec11f8b8a..26cedca2e62 100644 --- a/cpp/src/Ice/UdpConnector.h +++ b/cpp/src/Ice/UdpConnector.h @@ -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. @@ -11,9 +11,8 @@ #define ICE_UDP_CONNECTOR_H #include <Ice/TransceiverF.h> -#include <Ice/InstanceF.h> +#include <Ice/ProtocolInstanceF.h> #include <Ice/Connector.h> -#include <Ice/Protocol.h> #include <Ice/Network.h> namespace IceInternal @@ -34,12 +33,12 @@ public: private: - UdpConnector(const InstancePtr&, const Address&, const std::string&, int, const std::string&); + UdpConnector(const ProtocolInstancePtr&, const Address&, const std::string&, int, const std::string&); virtual ~UdpConnector(); friend class UdpEndpointI; - const InstancePtr _instance; + const ProtocolInstancePtr _instance; const Address _addr; const std::string _mcastInterface; const int _mcastTtl; |