Updates to fix a problem with multiple copies of

    SslCertificateVerifierOpenSSL.h, parameters update in
    test/Glacier/stater/run.py and namespace issues.

1 files changed, 11 insertions, 4 deletions

diff --git a/cpp/src/Ice/SslConnectionOpenSSLClient.cpp b/cpp/src/Ice/SslConnectionOpenSSLClient.cpp
index 8937baeae53..45917272ceb 100644
--- a/cpp/src/Ice/SslConnectionOpenSSLClient.cpp
+++ b/cpp/src/Ice/SslConnectionOpenSSLClient.cpp
@@ -39,10 +39,17 @@ using std::dec;
 // Public Methods
 //
 
-IceSecurity::Ssl::OpenSSL::ClientConnection::ClientConnection(const CertificateVerifierPtr& certificateVerifier,
-                                                              SSL* connection,
-                                                              const SystemPtr& system) :
-                                            Connection(certificateVerifier, connection, 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::ClientConnection::ClientConnection(
+            const IceSecurity::Ssl::CertificateVerifierPtr& certificateVerifier,
+            SSL* connection,
+            const SystemPtr& system) :
+                                            Connection(certificateVerifier,
+                                                       connection, system)
 {
 }