1 files changed, 3 insertions, 17 deletions
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
index efcd7935078..292e13dfcd2 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
@@ -26,13 +26,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    ServantRetentionStrategyRetain::ServantRetentionStrategyRetain () :
-      ServantRetentionStrategyNonRetain (),
-      active_object_map_ (),
-      waiting_servant_deactivation_ (0)
-    {
-    }
-
     void
     ServantRetentionStrategyRetain::strategy_init (TAO_Root_POA *poa)
     {
@@ -234,7 +227,7 @@ namespace TAO
         }
     }
 
-    TAO_SERVANT_LOCATION
+    TAO_Servant_Location
     ServantRetentionStrategyRetain::servant_present (
       const PortableServer::ObjectId &system_id,
       PortableServer::Servant &servant)
@@ -256,11 +249,11 @@ namespace TAO
       if (result == 0)
         {
           // Success
-          return TAO_SERVANT_FOUND;
+          return TAO_Servant_Location::Found;
         }
       else
         {
-          return TAO_SERVANT_NOT_FOUND;
+          return TAO_Servant_Location::Not_Found;
         }
     }
 
@@ -961,13 +954,6 @@ namespace TAO
       return this->active_object_map_->remaining_activations (servant);
     }
 
-
-    ::PortableServer::ServantRetentionPolicyValue
-    ServantRetentionStrategyRetain::type() const
-    {
-      return ::PortableServer::RETAIN;
-    }
-
     TAO_Active_Object_Map *
     ServantRetentionStrategyRetain::get_active_object_map() const
     {