diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2023-02-14 09:05:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-14 09:05:54 +0100 |
commit | 54406e2ff1e39a3245d04253648153d5f4751938 (patch) | |
tree | 2c92b2450e6872403cdd50b43ff764da236ffb12 /TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h | |
parent | 69fbec6c475060cf01a710a3d7ed6e756538858c (diff) | |
parent | d19030946af88f57a4b2b29af9228cbbf0386a71 (diff) | |
download | ATCD-54406e2ff1e39a3245d04253648153d5f4751938.tar.gz |
Merge pull request #2050 from jwillemsen/jwi-portableserverstrategysimplify
Major cleanup in PortableServer library
Diffstat (limited to 'TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h')
-rw-r--r-- | TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h index c7675ae80a0..7d41bcf6b6f 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h @@ -34,34 +34,34 @@ namespace TAO : public RequestProcessingStrategyServantManager { public: - RequestProcessingStrategyServantActivator (); + RequestProcessingStrategyServantActivator () = default; - virtual void strategy_cleanup(); + void strategy_cleanup() override; - PortableServer::ServantManager_ptr get_servant_manager (); + PortableServer::ServantManager_ptr get_servant_manager () override; - void set_servant_manager (PortableServer::ServantManager_ptr imgr); + void set_servant_manager (PortableServer::ServantManager_ptr imgr) override; - virtual TAO_SERVANT_LOCATION locate_servant ( + TAO_Servant_Location locate_servant ( const PortableServer::ObjectId &system_id, - PortableServer::Servant &servant); + PortableServer::Servant &servant) override; - virtual PortableServer::Servant locate_servant ( + 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 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 void post_invoke_servant_cleanup( + void post_invoke_servant_cleanup( const PortableServer::ObjectId &system_id, - const TAO::Portable_Server::Servant_Upcall &servant_upcall); + const TAO::Portable_Server::Servant_Upcall &servant_upcall) override; private: PortableServer::Servant incarnate_servant ( @@ -73,7 +73,7 @@ namespace TAO private: PortableServer::ServantActivator_var servant_activator_; - CORBA::Boolean etherealize_objects_; + CORBA::Boolean etherealize_objects_ { true }; }; } } |