Put back protected copy/assignment

    * TAO/tao/PortableServer/Servant_Base.cpp:
    * TAO/tao/PortableServer/Servant_Base.h:

2 files changed, 24 insertions, 8 deletions

diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 168697e5179..e0fb3cb406d 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -64,6 +64,23 @@ TAO_ServantBase::TAO_ServantBase (TAO_Operation_Table* optable)
 {
 }
 
+TAO_ServantBase::TAO_ServantBase (const TAO_ServantBase &rhs)
+  : TAO_Abstract_ServantBase ()
+  , ref_count_ (1)
+  , optable_ (rhs.optable_)
+{
+}
+
+TAO_ServantBase &
+TAO_ServantBase::operator= (const TAO_ServantBase &rhs)
+{
+  if (this != &rhs)
+  {
+    this->optable_ = rhs.optable_;
+  }
+  return *this;
+}
+
 TAO_ServantBase::~TAO_ServantBase (void)
 {
 }
diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h
index 6ada4fa3e7a..6de277edbe6 100644
--- a/TAO/tao/PortableServer/Servant_Base.h
+++ b/TAO/tao/PortableServer/Servant_Base.h
@@ -184,9 +184,15 @@ public:
 
 protected:
 
-  /// Constructor, only derived classes can be created.
+  /// Default constructor, only derived classes can be created.
   explicit TAO_ServantBase (TAO_Operation_Table* optable = 0);
 
+  /// Copy constructor, protected so no instances can be created.
+  TAO_ServantBase (const TAO_ServantBase &);
+
+  /// Assignment operator.
+  TAO_ServantBase &operator= (const TAO_ServantBase &);
+
   void synchronous_upcall_dispatch (
     TAO_ServerRequest & req,
     TAO::Portable_Server::Servant_Upcall* servant_upcall,
@@ -197,13 +203,6 @@ protected:
     TAO::Portable_Server::Servant_Upcall* servant_upcall,
     TAO_ServantBase *derived_this);
 
-private:
-  /// Copy constructor, private so no instances can be created.
-  TAO_ServantBase (const TAO_ServantBase &);
-
-  /// Assignment operator.
-  TAO_ServantBase &operator= (const TAO_ServantBase &);
-
 protected:
   /// Reference counter.
   ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> ref_count_;