1 files changed, 9 insertions, 14 deletions
diff --git a/cpp/src/IceSSL/ContextOpenSSLServer.h b/cpp/src/IceSSL/ContextOpenSSLServer.h
index af3ff8e6da1..4e73f81e845 100644
--- a/cpp/src/IceSSL/ContextOpenSSLServer.h
+++ b/cpp/src/IceSSL/ContextOpenSSLServer.h
@@ -8,39 +8,34 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_CONTEXT_OPENSSL_SERVER_H
-#define ICE_SSL_CONTEXT_OPENSSL_SERVER_H
+#ifndef ICESSL_SERVER_CONTEXT_H
+#define ICESSL_SERVER_CONTEXT_H
 
 #include <IceSSL/ContextOpenSSL.h>
 
 namespace IceSSL
 {
 
-namespace OpenSSL
-{
-
 class ServerContext : public Context
 {
 public:
 
-    virtual void configure(const IceSSL::GeneralConfig&,
-                           const IceSSL::CertificateAuthority&,
-                           const IceSSL::BaseCertificates&);
+    virtual void configure(const GeneralConfig&,
+                           const CertificateAuthority&,
+                           const BaseCertificates&);
 
     // Takes a socket fd as the first parameter.
-    virtual IceSSL::ConnectionPtr createConnection(int, const IceSSL::PluginBaseIPtr&);
+    virtual SslTransceiverPtr createTransceiver(int, const PluginBaseIPtr&);
 
 protected:
 
-    ServerContext(const IceSSL::TraceLevelsPtr&, const Ice::LoggerPtr&, const Ice::PropertiesPtr&);
+    ServerContext(const TraceLevelsPtr&, const Ice::LoggerPtr&, const Ice::PropertiesPtr&);
 
-    virtual void loadCertificateAuthority(const IceSSL::CertificateAuthority& certAuth);
+    virtual void loadCertificateAuthority(const CertificateAuthority& certAuth);
 
-    friend class IceSSL::OpenSSL::PluginI;
+    friend class OpenSSL::PluginI;
 };
 
 }
 
-}
-
 #endif