diff options
Diffstat (limited to 'TAO/orbsvcs/IFR_Service/be_produce.cpp')
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/be_produce.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp index 299d407c046..4733035164f 100644 --- a/TAO/orbsvcs/IFR_Service/be_produce.cpp +++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp @@ -65,7 +65,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. */ // BE_produce.cc - Produce the work of the BE - does nothing in the -// dummy BE +// dummy BE #include "idl.h" #include "idl_extern.h" @@ -93,22 +93,22 @@ BE_cleanup (void) idl_global = 0; // Remove the holding scope entry from the repository. - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA_Contained_var result = - be_global->repository ()->lookup_id (be_global->holding_scope_name (), - ACE_TRY_ENV); + be_global->repository ()->lookup_id (be_global->holding_scope_name () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (result.in ())) { CORBA_ModuleDef_var scope = - CORBA_ModuleDef::_narrow (result.in (), - ACE_TRY_ENV); + CORBA_ModuleDef::_narrow (result.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - scope->destroy (ACE_TRY_ENV); + scope->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -140,18 +140,18 @@ TAO_IFR_BE_Export int BE_ifr_init (int &ac, char *av[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { be_global->orb (CORBA::ORB_init (ac, av, - 0, - ACE_TRY_ENV)); + 0 + TAO_ENV_ARG_PARAMETER)); ACE_TRY_CHECK; CORBA::Object_var object = - be_global->orb ()->resolve_initial_references ("InterfaceRepository", - ACE_TRY_ENV); + be_global->orb ()->resolve_initial_references ("InterfaceRepository" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (object.in ())) @@ -164,8 +164,8 @@ BE_ifr_init (int &ac, ); } - CORBA_Repository_var repo = CORBA_Repository::_narrow (object.in (), - ACE_TRY_ENV); + CORBA_Repository_var repo = CORBA_Repository::_narrow (object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (repo.in ())) @@ -191,16 +191,16 @@ BE_ifr_init (int &ac, return 0; } - + void -BE_create_holding_scope (CORBA::Environment &ACE_TRY_ENV) +BE_create_holding_scope (TAO_ENV_SINGLE_ARG_DECL) { CORBA_ModuleDef_ptr scope = CORBA_ModuleDef::_nil (); // If we are multi-threaded, it may already be created. CORBA_Contained_var result = - be_global->repository ()->lookup_id (be_global->holding_scope_name (), - ACE_TRY_ENV); + be_global->repository ()->lookup_id (be_global->holding_scope_name () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (result.in ())) @@ -209,15 +209,15 @@ BE_create_holding_scope (CORBA::Environment &ACE_TRY_ENV) be_global->repository ()->create_module ( be_global->holding_scope_name (), be_global->holding_scope_name (), - "1.0", - ACE_TRY_ENV + "1.0" + TAO_ENV_ARG_PARAMETER ); ACE_CHECK; } else { - scope = CORBA_ModuleDef::_narrow (result.in (), - ACE_TRY_ENV); + scope = CORBA_ModuleDef::_narrow (result.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -228,10 +228,10 @@ BE_create_holding_scope (CORBA::Environment &ACE_TRY_ENV) TAO_IFR_BE_Export void BE_produce (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - BE_create_holding_scope (ACE_TRY_ENV); + BE_create_holding_scope (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get the root node. |