Merge pull request #2050 from jwillemsen/jwi-portableserverstrategysimplify

Major cleanup in PortableServer library

1 files changed, 7 insertions, 12 deletions

diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
index 420d9441072..65438cb07f7 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
@@ -33,25 +33,20 @@ namespace TAO
       : public RequestProcessingStrategy
     {
     public:
-      RequestProcessingStrategyServantManager ();
+      RequestProcessingStrategyServantManager () = default;
 
-      PortableServer::Servant get_servant ();
+      PortableServer::Servant get_servant () override;
 
-      void set_servant (PortableServer::Servant servant);
+      void set_servant (PortableServer::Servant servant) override;
 
-      void validate_servant_manager (
+      virtual void validate_servant_manager (
         PortableServer::ServantManager_ptr servant_manager);
 
-      virtual PortableServer::Servant system_id_to_servant (
-        const PortableServer::ObjectId &system_id);
+      PortableServer::Servant system_id_to_servant (const PortableServer::ObjectId &system_id) override;
 
-      virtual PortableServer::Servant id_to_servant (
-        const PortableServer::ObjectId &id);
+      PortableServer::Servant id_to_servant (const PortableServer::ObjectId &id) override;
 
-      virtual PortableServer::ObjectId *servant_to_id (
-        PortableServer::Servant servant);
-
-      virtual ::PortableServer::RequestProcessingPolicyValue type() const;
+      PortableServer::ObjectId *servant_to_id (PortableServer::Servant servant) override;
     };
   }
 }