1 files changed, 4 insertions, 8 deletions
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
index 500629cf1c0..a475bdb69ac 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
@@ -32,13 +32,13 @@ namespace TAO
        : public ServantRetentionStrategyNonRetain
     {
     public:
-      ServantRetentionStrategyRetain (void);
+      ServantRetentionStrategyRetain ();
 
-      CORBA::ULong waiting_servant_deactivation (void) const;
+      CORBA::ULong waiting_servant_deactivation () const;
 
       virtual void strategy_init (TAO_Root_POA *poa);
 
-      virtual void strategy_cleanup(void);
+      virtual void strategy_cleanup();
 
       virtual int is_servant_in_map (PortableServer::Servant servant,
                                      bool &wait_occurred_restart_call);
@@ -85,7 +85,7 @@ namespace TAO
         const PortableServer::ObjectId &system_id,
         CORBA::Short &priority);
 
-      virtual void deactivate_all_objects (void);
+      virtual void deactivate_all_objects ();
 
       virtual PortableServer::ObjectId *servant_to_user_id (
         PortableServer::Servant servant);
@@ -139,11 +139,7 @@ namespace TAO
       TAO_Active_Object_Map * get_active_object_map() const;
 
     private:
-#if defined (ACE_HAS_CPP11)
       std::unique_ptr<TAO_Active_Object_Map> active_object_map_;
-#else
-      auto_ptr<TAO_Active_Object_Map> active_object_map_;
-#endif /* ACE_HAS_CPP11 */
       CORBA::ULong waiting_servant_deactivation_;
     };
   }