summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp')
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp52
1 files changed, 26 insertions, 26 deletions
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
index 935b4629b9b..8cf19deac77 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
@@ -36,7 +36,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
AST_Field **f = 0;
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
// Visit each field.
@@ -77,7 +77,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
else
{
// Updates ir_current_.
- this->get_referenced_type (ft TAO_ENV_ARG_PARAMETER);
+ this->get_referenced_type (ft ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
@@ -110,13 +110,13 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
int
ifr_adding_visitor_exception::visit_structure (AST_Structure *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.
@@ -135,7 +135,7 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *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 ExceptionDef hasn't been created
@@ -155,7 +155,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 (TAO_ENV_SINGLE_ARG_PARAMETER);
+ prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
// This call will take the other branch.
@@ -164,7 +164,7 @@ ifr_adding_visitor_exception::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;
}
}
@@ -185,12 +185,12 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
int
ifr_adding_visitor_exception::visit_exception (AST_Exception *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 ()))
@@ -201,7 +201,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 (TAO_ENV_SINGLE_ARG_PARAMETER);
+ prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
// This call will create a new EnumDef entry.
@@ -245,7 +245,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
node->local_name ()->get_string (),
node->version (),
this->members_
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -257,23 +257,23 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
CORBA_Container_var new_container =
CORBA_Container::_narrow (new_def.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);
+ CORBA::String_var version = 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;
}
}
@@ -297,13 +297,13 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
int
ifr_adding_visitor_exception::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.
@@ -334,13 +334,13 @@ ifr_adding_visitor_exception::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;
this->move_queue_.enqueue_tail (tmp);
@@ -355,7 +355,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 (TAO_ENV_SINGLE_ARG_PARAMETER);
+ prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
// This call will take the other branch.
@@ -364,7 +364,7 @@ ifr_adding_visitor_exception::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;
}
}
@@ -385,13 +385,13 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
int
ifr_adding_visitor_exception::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.
@@ -410,7 +410,7 @@ ifr_adding_visitor_exception::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 ExceptionDef hasn't been created
@@ -430,7 +430,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 (TAO_ENV_SINGLE_ARG_PARAMETER);
+ prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
// This call will take the other branch.
@@ -439,7 +439,7 @@ ifr_adding_visitor_exception::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;
}
}
View Lorry Controller Status