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/IdAssignmentPolicy.h | 8 ++++---- TAO/tao/PortableServer/IdUniquenessPolicy.h | 8 ++++---- TAO/tao/PortableServer/LifespanStrategyPersistent.h | 2 +- TAO/tao/PortableServer/LifespanStrategyTransient.h | 2 +- TAO/tao/PortableServer/Operation_Table_Linear_Search.h | 2 +- TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h | 4 ++-- TAO/tao/PortableServer/ServantRetentionStrategyRetain.h | 2 +- TAO/tao/RTPortableServer/RT_POA.h | 2 +- TAO/tao/RTPortableServer/RT_Policy_Validator.h | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.h b/TAO/tao/PortableServer/IdAssignmentPolicy.h index bef8f68e0b5..e7c4f4c21d0 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.h +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.h @@ -43,13 +43,13 @@ namespace TAO public: IdAssignmentPolicy (::PortableServer::IdAssignmentPolicyValue value); - CORBA::Policy_ptr copy (); + CORBA::Policy_ptr copy () override; - void destroy (); + void destroy () override; - ::PortableServer::IdAssignmentPolicyValue value (); + ::PortableServer::IdAssignmentPolicyValue value () override; - CORBA::PolicyType policy_type (); + CORBA::PolicyType policy_type () override; /// Return the cached policy type for this policy. TAO_Cached_Policy_Type _tao_cached_type () const override; diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.h b/TAO/tao/PortableServer/IdUniquenessPolicy.h index 3cf26325ac5..8793a19f90b 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.h +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.h @@ -43,13 +43,13 @@ namespace TAO public: IdUniquenessPolicy (::PortableServer::IdUniquenessPolicyValue value); - CORBA::Policy_ptr copy (); + CORBA::Policy_ptr copy () override; - void destroy (); + void destroy () override; - ::PortableServer::IdUniquenessPolicyValue value (); + ::PortableServer::IdUniquenessPolicyValue value () override; - CORBA::PolicyType policy_type (); + CORBA::PolicyType policy_type () override; /// Return the cached policy type for this policy. TAO_Cached_Policy_Type _tao_cached_type () const override; diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.h b/TAO/tao/PortableServer/LifespanStrategyPersistent.h index 9b964c2b184..5de7c9cb52c 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistent.h +++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.h @@ -44,7 +44,7 @@ namespace TAO CORBA::Boolean is_persistent () const override; - CORBA::ULong key_length () const; + CORBA::ULong key_length () const override; void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at) override; diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.h b/TAO/tao/PortableServer/LifespanStrategyTransient.h index 5a3c7d988d5..58092432668 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransient.h +++ b/TAO/tao/PortableServer/LifespanStrategyTransient.h @@ -40,7 +40,7 @@ namespace TAO CORBA::Boolean is_persistent () const override; - CORBA::ULong key_length () const; + CORBA::ULong key_length () const override; void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at) override; diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h index 75dd2dc7f53..c69ab4a5542 100644 --- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h +++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h @@ -47,7 +47,7 @@ public: const unsigned int length = 0) override; int bind (const char *opname, - const TAO::Operation_Skeletons skelptr); + const TAO::Operation_Skeletons skelptr) override; private: // = Method that should defined by the subclasses. GPERF program diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h index 3365ec714fd..0e778aeb49d 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h @@ -39,7 +39,7 @@ namespace TAO void strategy_cleanup() override; - CORBA::ULong waiting_servant_deactivation () const; + CORBA::ULong waiting_servant_deactivation () const override; PortableServer::ObjectId * activate_object (PortableServer::Servant servant, @@ -68,7 +68,7 @@ namespace TAO CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &id, - bool indirect); + bool indirect) override; TAO_Servant_Location servant_present ( const PortableServer::ObjectId &system_id, 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_; diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h index aedc17d469c..206c1518a42 100644 --- a/TAO/tao/RTPortableServer/RT_POA.h +++ b/TAO/tao/RTPortableServer/RT_POA.h @@ -185,7 +185,7 @@ public: ~TAO_RT_POA () override = default; - void *thread_pool () const; + void *thread_pool () const override; protected: /// Template method for creating new POA's of this type. diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.h b/TAO/tao/RTPortableServer/RT_Policy_Validator.h index 2fcf68be954..afab3f0f46e 100644 --- a/TAO/tao/RTPortableServer/RT_Policy_Validator.h +++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.h @@ -60,10 +60,10 @@ protected: * are consistent and legal. Throw an appropriate exception * if that is not the case. */ - void validate_impl (TAO_Policy_Set &policies); + void validate_impl (TAO_Policy_Set &policies) override; /// Add/merge policies. - void merge_policies_impl (TAO_Policy_Set &policies); + void merge_policies_impl (TAO_Policy_Set &policies) override; /** * Return whether the specified policy type is legal for the -- cgit v1.2.1