diff options
Diffstat (limited to 'TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp')
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp index 2a3baece26a..8baa46d085f 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp @@ -14,7 +14,7 @@ ifr_removing_visitor::~ifr_removing_visitor (void) { } -int +int ifr_removing_visitor::visit_scope (UTL_Scope *node) { // Proceed if the number of members in our scope is greater than 0. @@ -26,7 +26,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node) AST_Decl *d = 0; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Continue until each element is visited. @@ -40,7 +40,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node) LM_ERROR, ACE_TEXT ("(%N:%l) ifr_removing_visitor::visit_scope -") ACE_TEXT (" bad node in this scope\n") - ), + ), -1 ); } @@ -52,9 +52,9 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node) continue; } - CORBA_Contained_var top_level = - be_global->repository ()->lookup_id (d->repoID (), - ACE_TRY_ENV); + CORBA_Contained_var top_level = + be_global->repository ()->lookup_id (d->repoID () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (top_level.in ())) @@ -62,7 +62,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node) // All we have to do is call destroy() on each IR object // in the global scope, because destroy() works on all // the contents recursively. - top_level->destroy (ACE_TRY_ENV); + top_level->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } |