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/PortableServer/Root_POA.cpp | 4 +++- TAO/tao/PortableServer/Root_POA.h | 3 ++- TAO/tao/RTPortableServer/RT_POA.cpp | 4 ++-- TAO/tao/RTPortableServer/RT_POA.h | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index 049f891a4bf..f894825dd50 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -736,6 +736,8 @@ TAO_Root_POA::servant_to_reference (PortableServer::Servant servant) return this->servant_to_reference_i (servant); } + +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::POAList * TAO_Root_POA::the_children () { @@ -744,7 +746,7 @@ TAO_Root_POA::the_children () return this->the_children_i (); } - +#endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ PortableServer::Servant TAO_Root_POA::id_to_servant (const PortableServer::ObjectId &oid) diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h index 812a4b7d00e..899c8031481 100644 --- a/TAO/tao/PortableServer/Root_POA.h +++ b/TAO/tao/PortableServer/Root_POA.h @@ -173,14 +173,15 @@ public: PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy ( PortableServer::RequestProcessingPolicyValue value); - #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ char * the_name (); PortableServer::POA_ptr the_parent (); +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::POAList *the_children (); +#endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ PortableServer::POAManager_ptr the_POAManager (); 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 () { diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h index 62420daa053..aedc17d469c 100644 --- a/TAO/tao/RTPortableServer/RT_POA.h +++ b/TAO/tao/RTPortableServer/RT_POA.h @@ -120,12 +120,13 @@ public: PortableServer::POA_ptr the_parent () override; +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::POAList *the_children () override; +#endif /* TAO_HAS_MINIMUM_POA == 0 */ PortableServer::POAManager_ptr the_POAManager () override; #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - PortableServer::AdapterActivator_ptr the_activator () override; void the_activator (PortableServer::AdapterActivator_ptr adapter_activator) override; @@ -137,7 +138,6 @@ public: PortableServer::Servant get_servant () override; void set_servant (PortableServer::Servant servant) override; - #endif /* TAO_HAS_MINIMUM_POA == 0 */ PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant) override; -- cgit v1.2.1