diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-11 12:51:42 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-11 12:51:42 +0000 |
| commit | 684f4149bb62552bd083a246812149010a0d5278 (patch) | |
| tree | e7cd895a2fa466e22075c21c31fc83ebc30f476d /TAO/tao/PortableServer/Object_Adapter.inl | |
| parent | df13612f36e202934137663b99b65394b07ae8cd (diff) | |
| download | ATCD-684f4149bb62552bd083a246812149010a0d5278.tar.gz | |
Sun Feb 11 12:38:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/PortableServer/Object_Adapter.inl')
| -rw-r--r-- | TAO/tao/PortableServer/Object_Adapter.inl | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/TAO/tao/PortableServer/Object_Adapter.inl b/TAO/tao/PortableServer/Object_Adapter.inl index 0a0777bc6ab..9a09c7e9f1b 100644 --- a/TAO/tao/PortableServer/Object_Adapter.inl +++ b/TAO/tao/PortableServer/Object_Adapter.inl @@ -3,6 +3,7 @@ // $Id$ #include "tao/SystemException.h" +#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -50,37 +51,29 @@ TAO_Object_Adapter::transient_poa_name_size () } ACE_INLINE int -TAO_Object_Adapter::locate_servant (const TAO::ObjectKey &key - ) +TAO_Object_Adapter::locate_servant (const TAO::ObjectKey &key) { // Lock access for the duration of this transaction. TAO_OBJECT_ADAPTER_GUARD_RETURN (-1); - return this->locate_servant_i (key - ); + return this->locate_servant_i (key); } ACE_INLINE TAO_SERVANT_LOCATION TAO_Object_Adapter::find_servant (const TAO::ObjectKey &key, - PortableServer::Servant &servant - ) + PortableServer::Servant &servant) { // Lock access for the duration of this transaction. TAO_OBJECT_ADAPTER_GUARD_RETURN (TAO_SERVANT_NOT_FOUND); - return this->find_servant_i (key, - servant - ); + return this->find_servant_i (key, servant); } ACE_INLINE int TAO_Object_Adapter::find_persistent_poa (const poa_name &system_name, - TAO_Root_POA *&poa - ) + TAO_Root_POA *&poa) { - return this->hint_strategy_->find_persistent_poa (system_name, - poa - ); + return this->hint_strategy_->find_persistent_poa (system_name, poa); } ACE_INLINE int @@ -93,9 +86,7 @@ TAO_Object_Adapter::find_poa (const poa_name &system_name, { if (activate_it) { - return this->find_persistent_poa (system_name, - poa - ); + return this->find_persistent_poa (system_name, poa); } else { |