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/RTPortableServer/RT_POA.cpp | |
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/RTPortableServer/RT_POA.cpp')
-rw-r--r-- | TAO/tao/RTPortableServer/RT_POA.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp index 0ead61fa6d7..87830403e45 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, @@ -574,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 () @@ -586,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 () { |