ChangeLogTag:Thu May 25 17:39:57 2000 Ossama Othman <ossama@uci.edu>

2 files changed, 7 insertions, 32 deletions

diff --git a/ace/SSL/SSL_SOCK_Stream.h b/ace/SSL/SSL_SOCK_Stream.h
index b509b176d3d..2fb44eb8031 100644
--- a/ace/SSL/SSL_SOCK_Stream.h
+++ b/ace/SSL/SSL_SOCK_Stream.h
@@ -60,11 +60,6 @@ public:
   // @@ The user must currently ensure that assignment or copy
   //    operations are atomic!
 
-  void operator= (const ACE_SSL_SOCK_Stream &);
-  // Assignment operator
-
-  ACE_SSL_SOCK_Stream (const ACE_SSL_SOCK_Stream &);
-  // Copy constructor
 
   ~ACE_SSL_SOCK_Stream (void);
   // Destructor
@@ -224,14 +219,19 @@ public:
   // access this method since some state in the underlying <ssl_> data
   // structure is set during SSL connection establishment.
 
-protected:
-
   SSL *ssl (void) const;
   // Return a pointer to the underlying SSL structure.
 
+protected:
+
   ACE_SOCK_Stream & peer (void);
   // Return the underlying <ACE_SOCK_Stream> which SSL runs atop of.
 
+private:
+
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_SSL_SOCK_Stream &))
+  ACE_UNIMPLEMENTED_FUNC (ACE_SSL_SOCK_Stream (const ACE_SSL_SOCK_Stream &))
+
 protected:
 
   SSL *ssl_;
diff --git a/ace/SSL/SSL_SOCK_Stream.i b/ace/SSL/SSL_SOCK_Stream.i
index 0e63027ad16..cb57f7b17b3 100644
--- a/ace/SSL/SSL_SOCK_Stream.i
+++ b/ace/SSL/SSL_SOCK_Stream.i
@@ -44,31 +44,6 @@ ACE_SSL_SOCK_Stream::ACE_SSL_SOCK_Stream (ACE_SSL_Context *context)
                     0);
 }
 
-ASYS_INLINE void
-ACE_SSL_SOCK_Stream::operator= (const ACE_SSL_SOCK_Stream &stream)
-{
-  // NOT thread safe!
-
-  ::SSL_free (this->ssl_);
-
-  // @@ What do we do if SSL_dup() fails, i.e. returns NULL?
-  this->ssl_ = ::SSL_dup (stream.ssl_);
-
-  this->set_handle (stream.get_handle ());
-}
-
-ASYS_INLINE
-ACE_SSL_SOCK_Stream::ACE_SSL_SOCK_Stream (const ACE_SSL_SOCK_Stream &stream)
-  : ACE_SSL_SOCK (),
-    ssl_ (0),
-    stream_ ()
-{
-  // NOT thread safe!
-
-  *this = stream;
-}
-
-
 ASYS_INLINE
 ACE_SSL_SOCK_Stream::~ACE_SSL_SOCK_Stream (void)
 {