diff options
Diffstat (limited to 'TAO/tao/PortableServer/poa_macros.h')
| -rw-r--r-- | TAO/tao/PortableServer/poa_macros.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/TAO/tao/PortableServer/poa_macros.h b/TAO/tao/PortableServer/poa_macros.h index 4ef9552bfd4..86da46eaefb 100644 --- a/TAO/tao/PortableServer/poa_macros.h +++ b/TAO/tao/PortableServer/poa_macros.h @@ -18,25 +18,21 @@ ACE_GUARD_THROW_EX (ACE_Lock, \ monitor, \ this->lock (), \ - CORBA::OBJ_ADAPTER ()); \ - ACE_CHECK + CORBA::OBJ_ADAPTER ()) #define TAO_OBJECT_ADAPTER_GUARD_RETURN(RETURN) \ ACE_GUARD_THROW_EX (ACE_Lock, \ monitor, \ this->lock (), \ - CORBA::OBJ_ADAPTER ()); \ - ACE_CHECK_RETURN (RETURN) + CORBA::OBJ_ADAPTER ()) #define TAO_POA_GUARD \ - TAO::Portable_Server::POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER); \ - ACE_UNUSED_ARG (poa_guard); \ - ACE_CHECK + TAO::Portable_Server::POA_Guard poa_guard (*this); \ + ACE_UNUSED_ARG (poa_guard) #define TAO_POA_GUARD_RETURN(RETURN) \ - TAO::Portable_Server::POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER); \ - ACE_UNUSED_ARG (poa_guard); \ - ACE_CHECK_RETURN (RETURN) + TAO::Portable_Server::POA_Guard poa_guard (*this); \ + ACE_UNUSED_ARG (poa_guard) #include /**/ "ace/post.h" |