diff options
| author | Anthony Neal <aneal@zeroc.com> | 2002-03-05 17:28:32 +0000 |
|---|---|---|
| committer | Anthony Neal <aneal@zeroc.com> | 2002-03-05 17:28:32 +0000 |
| commit | 06ff816fe028e296da7ed8f4596c4f00d0aaf7c3 (patch) | |
| tree | bec46912989562691bdbc942997181dd0652f20d /cpp/src/Ice/SslConnectionOpenSSL.cpp | |
| parent | Big check in. Glacier client authentication (certificate verification) has (diff) | |
| download | ice-06ff816fe028e296da7ed8f4596c4f00d0aaf7c3.tar.bz2 ice-06ff816fe028e296da7ed8f4596c4f00d0aaf7c3.tar.xz ice-06ff816fe028e296da7ed8f4596c4f00d0aaf7c3.zip | |
Updates to fix a problem with multiple copies of
SslCertificateVerifierOpenSSL.h, parameters update in
test/Glacier/stater/run.py and namespace issues.
Diffstat (limited to 'cpp/src/Ice/SslConnectionOpenSSL.cpp')
| -rw-r--r-- | cpp/src/Ice/SslConnectionOpenSSL.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/cpp/src/Ice/SslConnectionOpenSSL.cpp b/cpp/src/Ice/SslConnectionOpenSSL.cpp index 3f64a2891f3..f7f5a33a4d3 100644 --- a/cpp/src/Ice/SslConnectionOpenSSL.cpp +++ b/cpp/src/Ice/SslConnectionOpenSSL.cpp @@ -163,9 +163,15 @@ IceSecurity::Ssl::OpenSSL::SslConnectionMap IceSecurity::Ssl::OpenSSL::Connectio void ::IceInternal::incRef(::IceSecurity::Ssl::OpenSSL::Connection* p) { p->__incRef(); } void ::IceInternal::decRef(::IceSecurity::Ssl::OpenSSL::Connection* p) { p->__decRef(); } -IceSecurity::Ssl::OpenSSL::Connection::Connection(const CertificateVerifierPtr& certificateVerifier, - SSL* sslConnection, - const SystemPtr& system) : +// Note: I would use a using directive of the form: +// using IceSecurity::Ssl::CertificateVerifierPtr; +// but unfortunately, it appears that this is not properly picked up. +// + +IceSecurity::Ssl::OpenSSL::Connection::Connection( + const IceSecurity::Ssl::CertificateVerifierPtr& certificateVerifier, + SSL* sslConnection, + const SystemPtr& system) : IceSecurity::Ssl::Connection(certificateVerifier), _sslConnection(sslConnection), _system(system) |