diff options
Diffstat (limited to 'TAO/tao/PortableServer/Root_POA.cpp')
| -rw-r--r-- | TAO/tao/PortableServer/Root_POA.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index a2ea413e806..f894825dd50 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -258,11 +258,9 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name, // minimum POA builds, remove this code and remove the guards // in Object_Adapter.cpp when changing the default policy for the // RootPOA. - if (ACE_OS::strcmp (this->name_.c_str (), - TAO_DEFAULT_ROOTPOA_NAME) == 0) + if (ACE_OS::strcmp (this->name_.c_str (), TAO_DEFAULT_ROOTPOA_NAME) == 0) { - this->cached_policies_.implicit_activation - (PortableServer::IMPLICIT_ACTIVATION); + this->cached_policies_.implicit_activation (PortableServer::IMPLICIT_ACTIVATION); } #endif /* TAO_HAS_MINIMUM_POA == 1 */ @@ -270,7 +268,7 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name, this->active_policy_strategies_.update (this->cached_policies_, this); TAO::Portable_Server::Active_Policy_Strategies_Cleanup_Guard aps_cleanup_guard ( - &this->active_policy_strategies_); + std::addressof(this->active_policy_strategies_)); // Set the folded name of this POA. this->set_folded_name (parent); @@ -738,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 () { @@ -746,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) @@ -2189,7 +2189,7 @@ TAO_Root_POA::client_exposed_policies (CORBA::Short /* object_priority */) return policies._retn (); } -TAO_SERVANT_LOCATION +TAO_Servant_Location TAO_Root_POA::locate_servant_i (const PortableServer::ObjectId &system_id, PortableServer::Servant &servant) { @@ -2197,7 +2197,7 @@ TAO_Root_POA::locate_servant_i (const PortableServer::ObjectId &system_id, locate_servant (system_id, servant); } -TAO_SERVANT_LOCATION +TAO_Servant_Location TAO_Root_POA::servant_present (const PortableServer::ObjectId &system_id, PortableServer::Servant &servant) { |