diff options
Diffstat (limited to 'TAO/tests/Param_Test/server.cpp')
| -rw-r--r-- | TAO/tests/Param_Test/server.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp index 738a343337e..c1ed50851ec 100644 --- a/TAO/tests/Param_Test/server.cpp +++ b/TAO/tests/Param_Test/server.cpp @@ -61,12 +61,12 @@ main (int argc, char *argv[]) PortableServer::POA_var oa_ptr; Param_Test_i *param_test = 0; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { const char *orb_name = ""; CORBA::ORB_var orb_ptr = - CORBA::ORB_init (argc, argv, orb_name, ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, orb_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var temp; // holder for the myriad of times we get @@ -74,8 +74,8 @@ main (int argc, char *argv[]) // Get the Root POA - temp = orb_ptr->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + temp = orb_ptr->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (temp.in())) @@ -83,29 +83,29 @@ main (int argc, char *argv[]) "(%P|%t) Unable to get root poa reference.\n"), 1); - oa_ptr = PortableServer::POA::_narrow (temp.in(), ACE_TRY_ENV); + oa_ptr = PortableServer::POA::_narrow (temp.in() TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - oa_ptr->the_POAManager (ACE_TRY_ENV); + oa_ptr->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyList policies (2); policies.length (2); policies[0] = - oa_ptr->create_id_assignment_policy (PortableServer::USER_ID, - ACE_TRY_ENV); + oa_ptr->create_id_assignment_policy (PortableServer::USER_ID + TAO_ENV_ARG_PARAMETER); policies[1] = - oa_ptr->create_lifespan_policy (PortableServer::PERSISTENT, - ACE_TRY_ENV); + oa_ptr->create_lifespan_policy (PortableServer::PERSISTENT + TAO_ENV_ARG_PARAMETER); // We use a different POA, otherwise the user would have to // change the object key each time it invokes the server. PortableServer::POA_var good_poa = oa_ptr->create_POA ("child_poa", poa_manager.in (), - policies, - ACE_TRY_ENV); + policies + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse remaining command line and verify parameters. @@ -123,20 +123,20 @@ main (int argc, char *argv[]) PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("param_test"); good_poa->activate_object_with_id (id.in (), - param_test, - ACE_TRY_ENV); + param_test + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Stringify the objref we'll be implementing, and print it to // stdout. Someone will take that string and give it to a // client. Then release the object. - temp = good_poa->id_to_reference (id.in (), ACE_TRY_ENV); + temp = good_poa->id_to_reference (id.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var str = - orb_ptr->object_to_string (temp.in (), - ACE_TRY_ENV); + orb_ptr->object_to_string (temp.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) @@ -149,20 +149,20 @@ main (int argc, char *argv[]) // Make the POAs controlled by this manager active - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb_ptr->run (ACE_TRY_ENV); + orb_ptr->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; good_poa->destroy (1, - 1, - ACE_TRY_ENV); + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; oa_ptr->destroy (1, - 1, - ACE_TRY_ENV); + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) |