diff options
Diffstat (limited to 'TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp')
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp index d22c22c825b..ed37fb00f4f 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp @@ -90,7 +90,6 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node) { // Updates ir_current_. this->get_referenced_type (ft ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } this->members_[i].name = @@ -129,7 +128,6 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node) CORBA::Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If not, create a new entry. if (CORBA::is_nil (prev_def.in ())) @@ -148,7 +146,6 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node) CORBA::Contained_ptr tmp = CORBA::Contained::_narrow (visitor.ir_current () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Since the enclosing ExceptionDef hasn't been created // yet, we don't have a scope, so this nested StructDef @@ -167,8 +164,7 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + prev_def->destroy (); // This call will take the other branch. return this->visit_structure (node); @@ -177,7 +173,6 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node) this->ir_current_ = CORBA::IDLType::_narrow (prev_def.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCHANY @@ -203,7 +198,6 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node) CORBA::Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!CORBA::is_nil (prev_def.in ())) { @@ -222,8 +216,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + prev_def->destroy (); // This call will create a new ExceptionDef entry. return this->visit_exception (node); @@ -269,7 +262,6 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node) this->members_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; size_t size = this->move_queue_.size (); @@ -280,25 +272,21 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node) CORBA::Container_var new_container = CORBA::Container::_narrow (new_def.in () 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 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + traveller->name (); CORBA::String_var version = - traveller->version (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + traveller->version (); traveller->move (new_container.in (), name.in (), version.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } @@ -328,7 +316,6 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node) CORBA::Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If not, create a new entry. if (CORBA::is_nil (prev_def.in ())) @@ -359,12 +346,10 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node) members ACE_ENV_ARG_PARAMETER ); - ACE_TRY_CHECK; CORBA::Contained_ptr tmp = CORBA::Contained::_narrow (this->ir_current_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->move_queue_.enqueue_tail (tmp); @@ -378,8 +363,7 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + prev_def->destroy (); // This call will take the other branch. return this->visit_enum (node); @@ -388,7 +372,6 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node) this->ir_current_ = CORBA::IDLType::_narrow (prev_def.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCHANY @@ -415,7 +398,6 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node) CORBA::Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If not, create a new entry. if (CORBA::is_nil (prev_def.in ())) @@ -434,7 +416,6 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node) CORBA::Contained_ptr tmp = CORBA::Contained::_narrow (visitor.ir_current () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Since the enclosing ExceptionDef hasn't been created // yet, we don't have a scope, so this nested UnionDef @@ -453,8 +434,7 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + prev_def->destroy (); // This call will take the other branch. return this->visit_union (node); @@ -463,7 +443,6 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node) this->ir_current_ = CORBA::IDLType::_narrow (prev_def.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCHANY |