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, 12 insertions, 4 deletions

diff --git a/cpp/src/Ice/SslConnectionOpenSSLServer.cpp b/cpp/src/Ice/SslConnectionOpenSSLServer.cpp
index c9c05900ff2..54497011d7b 100644
--- a/cpp/src/Ice/SslConnectionOpenSSLServer.cpp
+++ b/cpp/src/Ice/SslConnectionOpenSSLServer.cpp
@@ -41,10 +41,18 @@ using std::dec;
 // Public Methods
 //
 
-IceSecurity::Ssl::OpenSSL::ServerConnection::ServerConnection(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::ServerConnection::ServerConnection(
+            const IceSecurity::Ssl::CertificateVerifierPtr& certificateVerifier,
+            SSL* connection,
+            const SystemPtr& system) :
+                                            Connection(certificateVerifier,
+                                                       connection,
+                                                       system)
 {
 }