From c35277837fe52adb19a22a9d18931b3e804b8358 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 13 Feb 2023 12:43:48 +0100 Subject: Use override/default for RTPortableServer * TAO/NEWS: * TAO/tao/RTPortableServer/RT_Acceptor_Filters.h: * TAO/tao/RTPortableServer/RT_Collocation_Resolver.h: * TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h: * TAO/tao/RTPortableServer/RT_POA.cpp: * TAO/tao/RTPortableServer/RT_POA.h: * TAO/tao/RTPortableServer/RT_Policy_Validator.h: * TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp: * TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h: --- TAO/tao/RTPortableServer/RT_POA.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'TAO/tao/RTPortableServer/RT_POA.cpp') diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp index 0ead61fa6d7..93b27235ac6 100644 --- a/TAO/tao/RTPortableServer/RT_POA.cpp +++ b/TAO/tao/RTPortableServer/RT_POA.cpp @@ -45,17 +45,12 @@ TAO_RT_POA::TAO_RT_POA (const TAO_Root_POA::String &name, lock, thread_lock, orb_core, - object_adapter), - thread_pool_ (0) + object_adapter) { // Parse the RT policies and update our policy cache. this->parse_rt_policies (this->policies ()); } -TAO_RT_POA::~TAO_RT_POA () -{ -} - TAO_Root_POA * TAO_RT_POA::new_POA (const String &name, PortableServer::POAManager_ptr poa_manager, -- cgit v1.2.1 From d9b768c3239be29c3219f2fca81b39e2dc8787b1 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 13 Feb 2023 15:29:08 +0100 Subject: the_children is not available in all CORBA profiles * TAO/tao/PortableServer/Root_POA.cpp: * TAO/tao/PortableServer/Root_POA.h: * TAO/tao/RTPortableServer/RT_POA.cpp: * TAO/tao/RTPortableServer/RT_POA.h: --- TAO/tao/RTPortableServer/RT_POA.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'TAO/tao/RTPortableServer/RT_POA.cpp') diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp index 93b27235ac6..87830403e45 100644 --- a/TAO/tao/RTPortableServer/RT_POA.cpp +++ b/TAO/tao/RTPortableServer/RT_POA.cpp @@ -569,11 +569,13 @@ TAO_RT_POA::the_parent () return this->TAO_Regular_POA::the_parent (); } +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::POAList * TAO_RT_POA::the_children () { return this->TAO_Regular_POA::the_children (); } +#endif /* TAO_HAS_MINIMUM_POA == 0 */ PortableServer::POAManager_ptr TAO_RT_POA::the_POAManager () @@ -581,9 +583,7 @@ TAO_RT_POA::the_POAManager () return this->TAO_Regular_POA::the_POAManager (); } - #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - PortableServer::AdapterActivator_ptr TAO_RT_POA::the_activator () { -- cgit v1.2.1