diff options
Diffstat (limited to 'TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp')
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp index 33ac960b3ee..af1db91e347 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp @@ -39,7 +39,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node) AST_Field **f = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Visit each field. @@ -90,7 +90,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node) CORBA_Contained_ptr tmp = CORBA_Contained::_narrow (visitor.ir_current () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->move_queue_.enqueue_tail (tmp); @@ -114,7 +114,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node) { // Updates ir_current_. this->get_referenced_type (ft - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -147,12 +147,12 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node) int ifr_adding_visitor_structure::visit_structure (AST_Structure *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (prev_def.in ())) @@ -177,7 +177,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) node->local_name ()->get_string (), node->version (), this->members_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } else @@ -202,7 +202,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) node->local_name ()->get_string (), node->version (), this->members_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -216,24 +216,24 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) CORBA_Container_var new_container = CORBA_Container::_narrow (this->ir_current_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (size_t i = 0; i < size; ++i) { this->move_queue_.dequeue_head (traveller); - CORBA::String_var name = traveller->name (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var name = traveller->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var version = - traveller->version (TAO_ENV_SINGLE_ARG_PARAMETER); + traveller->version (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; traveller->move (new_container.in (), name.in (), version.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -248,7 +248,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -257,7 +257,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -278,13 +278,13 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) int ifr_adding_visitor_structure::visit_enum (AST_Enum *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this enum already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If not, create a new entry. @@ -315,13 +315,13 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node) node->local_name ()->get_string (), node->version (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; CORBA_Contained_ptr tmp = CORBA_Contained::_narrow (this->ir_current_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Since the enclosing StructDef hasn't been created @@ -340,7 +340,7 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -349,7 +349,7 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -370,13 +370,13 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node) int ifr_adding_visitor_structure::visit_union (AST_Union *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this union already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If not, create a new entry. @@ -395,7 +395,7 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node) CORBA_Contained_ptr tmp = CORBA_Contained::_narrow (visitor.ir_current () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Since the enclosing StructDef hasn't been created @@ -415,7 +415,7 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -424,7 +424,7 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } |