diff options
| author | Erik Sohns <esohns@users.noreply.github.com> | 2023-04-06 11:09:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-06 11:09:11 +0200 |
| commit | a3a7c2a50383ebf00534c28014704ce57e092821 (patch) | |
| tree | 0de4a576c9929ac6d821462e1693882654f2a456 /TAO/tao/RTPortableServer/RT_POA.cpp | |
| parent | 5625244fd7bb77bafabce28fdec790f51ef50080 (diff) | |
| parent | b50aba0fdce1069b9aa9b1baac9adee396663779 (diff) | |
| download | ATCD-a3a7c2a50383ebf00534c28014704ce57e092821.tar.gz | |
Merge branch 'master' into message_queue_ex_get_queue
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 () { |