From 322d0a3e30d2e608108e0d7caf6bdcddbd728081 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 13 Feb 2023 11:42:23 +0100 Subject: Major cleanup in PortableServer library --- .../ServantRetentionStrategyRetain.h | 78 +++++++++------------- 1 file changed, 31 insertions(+), 47 deletions(-) (limited to 'TAO/tao/PortableServer/ServantRetentionStrategyRetain.h') diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h index a475bdb69ac..22eefd38cd1 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h @@ -18,7 +18,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Auto_Ptr.h" +#include "tao/PortableServer/Active_Object_Map.h" +#include TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -32,82 +33,67 @@ namespace TAO : public ServantRetentionStrategyNonRetain { public: - ServantRetentionStrategyRetain (); + ServantRetentionStrategyRetain () = default; - CORBA::ULong waiting_servant_deactivation () const; + CORBA::ULong waiting_servant_deactivation () const override; - virtual void strategy_init (TAO_Root_POA *poa); + void strategy_init (TAO_Root_POA *poa) override; - virtual void strategy_cleanup(); + void strategy_cleanup() override; - virtual int is_servant_in_map (PortableServer::Servant servant, - bool &wait_occurred_restart_call); + int is_servant_in_map (PortableServer::Servant servant, + bool &wait_occurred_restart_call) override; - virtual PortableServer::ObjectId * activate_object (PortableServer::Servant servant, CORBA::Short priority, - bool &wait_occurred_restart_call); + bool &wait_occurred_restart_call) override; - virtual void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Short priority, - bool &wait_occurred_restart_call); + bool &wait_occurred_restart_call) override; - void deactivate_object (const PortableServer::ObjectId &id); + void deactivate_object (const PortableServer::ObjectId &id) override; - virtual PortableServer::Servant find_servant ( - const PortableServer::ObjectId &system_id); + PortableServer::Servant find_servant (const PortableServer::ObjectId &system_id) override; - virtual PortableServer::ObjectId * system_id_to_object_id ( - const PortableServer::ObjectId &system_id); + PortableServer::ObjectId * system_id_to_object_id (const PortableServer::ObjectId &system_id) override; - virtual - PortableServer::Servant - user_id_to_servant (const PortableServer::ObjectId &id); + PortableServer::Servant user_id_to_servant (const PortableServer::ObjectId &id) override; CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &id, - bool indirect); + bool indirect) override; - virtual - TAO_SERVANT_LOCATION + TAO_Servant_Location servant_present (const PortableServer::ObjectId &system_id, - PortableServer::Servant &servant); + PortableServer::Servant &servant) override; - virtual PortableServer::Servant find_servant ( + PortableServer::Servant find_servant ( const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, - TAO::Portable_Server::POA_Current_Impl &poa_current_impl); + TAO::Portable_Server::POA_Current_Impl &poa_current_impl) override; - virtual int find_servant_priority ( + int find_servant_priority ( const PortableServer::ObjectId &system_id, - CORBA::Short &priority); + CORBA::Short &priority) override; - virtual void deactivate_all_objects (); + void deactivate_all_objects () override; - virtual PortableServer::ObjectId *servant_to_user_id ( - PortableServer::Servant servant); + PortableServer::ObjectId *servant_to_user_id (PortableServer::Servant servant) override; - virtual - CORBA::Object_ptr servant_to_reference (PortableServer::Servant servant); + CORBA::Object_ptr servant_to_reference (PortableServer::Servant servant) override; - virtual - CORBA::Object_ptr create_reference ( - const char *intf, - CORBA::Short priority); + CORBA::Object_ptr create_reference (const char *intf, CORBA::Short priority) override; #if !defined (CORBA_E_MICRO) - virtual CORBA::Object_ptr create_reference_with_id ( const PortableServer::ObjectId &oid, const char *intf, - CORBA::Short priority); + CORBA::Short priority) override; #endif - virtual ::PortableServer::ServantRetentionPolicyValue type() const; - protected: int is_user_id_in_map (const PortableServer::ObjectId &id, @@ -122,25 +108,23 @@ namespace TAO PortableServer::Servant p_servant, CORBA::Short &priority); - virtual int rebind_using_user_id_and_system_id ( PortableServer::Servant servant, const PortableServer::ObjectId &user_id, const PortableServer::ObjectId &system_id, - TAO::Portable_Server::Servant_Upcall &servant_upcall); + TAO::Portable_Server::Servant_Upcall &servant_upcall) override; - virtual CORBA::Boolean servant_has_remaining_activations ( - PortableServer::Servant servant); + PortableServer::Servant servant) override; - virtual int unbind_using_user_id ( - const PortableServer::ObjectId &user_id); + int unbind_using_user_id ( + const PortableServer::ObjectId &user_id) override; TAO_Active_Object_Map * get_active_object_map() const; private: std::unique_ptr active_object_map_; - CORBA::ULong waiting_servant_deactivation_; + CORBA::ULong waiting_servant_deactivation_ { 0 } ; }; } } -- cgit v1.2.1 From 45fa63be04357683ab473a2f993e621508ecb5f7 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 13 Feb 2023 16:29:08 +0100 Subject: Fixed warnings * TAO/tao/PortableServer/IdAssignmentPolicy.h: * TAO/tao/PortableServer/IdUniquenessPolicy.h: * TAO/tao/PortableServer/LifespanStrategyPersistent.h: * TAO/tao/PortableServer/LifespanStrategyTransient.h: * TAO/tao/PortableServer/Operation_Table_Linear_Search.h: * TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h: * TAO/tao/PortableServer/ServantRetentionStrategyRetain.h: * TAO/tao/RTPortableServer/RT_POA.h: * TAO/tao/RTPortableServer/RT_Policy_Validator.h: --- TAO/tao/PortableServer/ServantRetentionStrategyRetain.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'TAO/tao/PortableServer/ServantRetentionStrategyRetain.h') diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h index 22eefd38cd1..98d0c1db5db 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h @@ -120,7 +120,7 @@ namespace TAO int unbind_using_user_id ( const PortableServer::ObjectId &user_id) override; - TAO_Active_Object_Map * get_active_object_map() const; + TAO_Active_Object_Map * get_active_object_map() const override; private: std::unique_ptr active_object_map_; -- cgit v1.2.1