1 files changed, 19 insertions, 28 deletions

diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
index 28718985f5f..011f360b876 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
@@ -32,58 +32,49 @@ namespace TAO
      *
      * Request Processing Strategy which only uses the Active Object Map (AOM)
      */
-    class RequestProcessingStrategyAOMOnly
-      : public RequestProcessingStrategy
+    class RequestProcessingStrategyAOMOnly : public RequestProcessingStrategy
     {
     public:
-      RequestProcessingStrategyAOMOnly ();
+      RequestProcessingStrategyAOMOnly () = default;
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+      PortableServer::ServantManager_ptr get_servant_manager () override;
 
-      PortableServer::ServantManager_ptr
-      get_servant_manager ();
+      void set_servant_manager (PortableServer::ServantManager_ptr imgr) override;
 
-      void set_servant_manager (PortableServer::ServantManager_ptr imgr);
-
-      void set_servant (PortableServer::Servant servant);
-
-      PortableServer::Servant get_servant ();
+      void set_servant (PortableServer::Servant servant) override;
 
+      PortableServer::Servant get_servant () override;
 #endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
 
-      virtual
-      TAO_SERVANT_LOCATION
+      TAO_Servant_Location
       locate_servant (const PortableServer::ObjectId &system_id,
-                      PortableServer::Servant &servant);
+                      PortableServer::Servant &servant) override;
 
-      virtual
       PortableServer::Servant
       locate_servant (const char *operation,
                       const PortableServer::ObjectId &system_id,
                       TAO::Portable_Server::Servant_Upcall &servant_upcall,
                       TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-                      bool &wait_occurred_restart_call);
+                      bool &wait_occurred_restart_call) override;
 
-      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 void cleanup_servant (
+      void cleanup_servant (
         PortableServer::Servant servant,
-        const PortableServer::ObjectId &user_id);
+        const PortableServer::ObjectId &user_id) override;
 
-      virtual void etherealize_objects (CORBA::Boolean etherealize_objects);
+      void etherealize_objects (CORBA::Boolean etherealize_objects) override;
 
-      virtual PortableServer::ObjectId *servant_to_id (
-        PortableServer::Servant servant);
+      PortableServer::ObjectId *servant_to_id (PortableServer::Servant servant) override;
 
-      virtual void post_invoke_servant_cleanup(
+      void post_invoke_servant_cleanup(
         const PortableServer::ObjectId &system_id,
-        const TAO::Portable_Server::Servant_Upcall &servant_upcall);
-
-      virtual ::PortableServer::RequestProcessingPolicyValue type() const;
+        const TAO::Portable_Server::Servant_Upcall &servant_upcall) override;
     };
   }
 }