summaryrefslogtreecommitdiff
path: root/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp')
-rw-r--r--TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp
index c7de619af4e..8a0aec21337 100644
--- a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp
+++ b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp
@@ -23,7 +23,7 @@ TAO_ThruPOA_Object_Proxy_Impl::~TAO_ThruPOA_Object_Proxy_Impl (void)
CORBA::Boolean
TAO_ThruPOA_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target,
const CORBA::Char *logical_type_id
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
{
TAO_Object_Adapter::Servant_Upcall
servant_upcall (target->_stubobj ()->servant_orb_var ()->orb_core ());
@@ -33,9 +33,9 @@ TAO_ThruPOA_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target,
target->_object_key (),
"_is_a",
forward_to.out ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
- return servant_upcall.servant ()->_is_a (logical_type_id TAO_ENV_ARG_PARAMETER);
+ return servant_upcall.servant ()->_is_a (logical_type_id ACE_ENV_ARG_PARAMETER);
}
@@ -43,7 +43,7 @@ TAO_ThruPOA_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target,
CORBA::Boolean
TAO_ThruPOA_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
{
CORBA::Boolean _tao_retval = 0;
@@ -59,10 +59,10 @@ TAO_ThruPOA_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target
target->_object_key (),
"_non_existent",
forward_to.out ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- return servant_upcall.servant ()->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+ return servant_upcall.servant ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
}
ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
{
@@ -79,7 +79,7 @@ TAO_ThruPOA_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target
CORBA_InterfaceDef_ptr
TAO_ThruPOA_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
{
ACE_TRY
{
@@ -93,10 +93,10 @@ TAO_ThruPOA_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target
target->_object_key (),
"_get_interface",
forward_to.out ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- return servant_upcall.servant ()->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+ return servant_upcall.servant ()->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
}
ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
{