diff options
author | Bernard Normier <bernard@zeroc.com> | 2018-10-26 17:17:11 -0400 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2018-10-26 17:17:11 -0400 |
commit | 42c905a3ca29a1e911e7def9c2d9d9b8e95383cd (patch) | |
tree | 1b704d084e39c0acd15859f2dd258eff7aaa7fc6 /cpp/src/IceSSL/EndpointI.cpp | |
parent | Do not use time.clock() with Python >= 3.3 as it is deprecated (diff) | |
download | ice-42c905a3ca29a1e911e7def9c2d9d9b8e95383cd.tar.bz2 ice-42c905a3ca29a1e911e7def9c2d9d9b8e95383cd.tar.xz ice-42c905a3ca29a1e911e7def9c2d9d9b8e95383cd.zip |
Extra C++ warning flags with clang and g++.
Fixes 223.
Diffstat (limited to 'cpp/src/IceSSL/EndpointI.cpp')
-rw-r--r-- | cpp/src/IceSSL/EndpointI.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp index be21e7dade7..c59f8464ca1 100644 --- a/cpp/src/IceSSL/EndpointI.cpp +++ b/cpp/src/IceSSL/EndpointI.cpp @@ -342,36 +342,36 @@ IceSSL::EndpointI::operator<(const Ice::LocalObject& r) const } bool -IceSSL::EndpointI::checkOption(const string& option, const string& argument, const string& endpoint) +IceSSL::EndpointI::checkOption(const string& /*option*/, const string& /*argument*/, const string& /*endpoint*/) { return false; } IceSSL::EndpointFactoryI::EndpointFactoryI(const InstancePtr& instance, Short type) : - IceInternal::EndpointFactoryWithUnderlying(instance, type), _instance(instance.get()) + IceInternal::EndpointFactoryWithUnderlying(instance, type), _sslInstance(instance.get()) { } void IceSSL::EndpointFactoryI::destroy() { - _instance = 0; + _sslInstance = 0; } IceInternal::EndpointFactoryPtr IceSSL::EndpointFactoryI::cloneWithUnderlying(const IceInternal::ProtocolInstancePtr& instance, Short underlying) const { - return new EndpointFactoryI(new Instance(_instance->engine(), instance->type(), instance->protocol()), underlying); + return new EndpointFactoryI(new Instance(_sslInstance->engine(), instance->type(), instance->protocol()), underlying); } IceInternal::EndpointIPtr IceSSL::EndpointFactoryI::createWithUnderlying(const IceInternal::EndpointIPtr& underlying, vector<string>&, bool) const { - return ICE_MAKE_SHARED(EndpointI, _instance, underlying); + return ICE_MAKE_SHARED(EndpointI, _sslInstance, underlying); } IceInternal::EndpointIPtr -IceSSL::EndpointFactoryI::readWithUnderlying(const IceInternal::EndpointIPtr& underlying, Ice::InputStream* s) const +IceSSL::EndpointFactoryI::readWithUnderlying(const IceInternal::EndpointIPtr& underlying, Ice::InputStream*) const { - return ICE_MAKE_SHARED(EndpointI, _instance, underlying); + return ICE_MAKE_SHARED(EndpointI, _sslInstance, underlying); } |