diff options
Diffstat (limited to 'TAO/tests/Timeout/client.cpp')
| -rw-r--r-- | TAO/tests/Timeout/client.cpp | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/TAO/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp index b19f30c2f42..dc5416aceeb 100644 --- a/TAO/tests/Timeout/client.cpp +++ b/TAO/tests/Timeout/client.cpp @@ -53,12 +53,12 @@ static int in_time_count = 0; void send_echo (CORBA::ORB_ptr orb, Simple_Server_ptr server, - CORBA::Long t, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Long t + TAO_ENV_ARG_DECL) { ACE_TRY { - server->echo (0, t, ACE_TRY_ENV); + server->echo (0, t TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; in_time_count++; @@ -76,7 +76,7 @@ send_echo (CORBA::ORB_ptr orb, (max_timeout % 1000) * 1000); // This is a non-standard TAO call. - orb->run (tv, ACE_TRY_ENV); + orb->run (tv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_ENDTRY; @@ -88,18 +88,18 @@ int main (int argc, char* argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_var server = - Simple_Server::_narrow (object.in (), ACE_TRY_ENV); + Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -111,21 +111,21 @@ int main (int argc, char* argv[]) } object = - orb->resolve_initial_references ("ORBPolicyManager", - ACE_TRY_ENV); + orb->resolve_initial_references ("ORBPolicyManager" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (object.in (), ACE_TRY_ENV); + CORBA::PolicyManager::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; object = - orb->resolve_initial_references ("PolicyCurrent", - ACE_TRY_ENV); + orb->resolve_initial_references ("PolicyCurrent" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in (), ACE_TRY_ENV); + CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; TimeBase::TimeT mid_value = @@ -142,20 +142,20 @@ int main (int argc, char* argv[]) policy_list.length (1); policy_list[0] = orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, - any_object, - ACE_TRY_ENV); + any_object + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; object = server->_set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_var timeout_server = - Simple_Server::_narrow (object.in (), ACE_TRY_ENV); + Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - policy_list[0]->destroy (ACE_TRY_ENV); + policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; policy_list[0] = CORBA::Policy::_nil (); @@ -174,15 +174,15 @@ int main (int argc, char* argv[]) policy_list.length (0); policy_manager->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - send_echo (orb.in (), server.in (), t, ACE_TRY_ENV); + send_echo (orb.in (), server.in (), t TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, @@ -191,19 +191,19 @@ int main (int argc, char* argv[]) policy_list.length (1); policy_list[0] = orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, - any_orb, - ACE_TRY_ENV); + any_orb + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_manager->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - send_echo (orb.in (), server.in (), t, ACE_TRY_ENV); + send_echo (orb.in (), server.in (), t TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - policy_list[0]->destroy (ACE_TRY_ENV); + policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, @@ -212,24 +212,24 @@ int main (int argc, char* argv[]) policy_list.length (1); policy_list[0] = orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, - any_thread, - ACE_TRY_ENV); + any_thread + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - send_echo (orb.in (), server.in (), t, ACE_TRY_ENV); + send_echo (orb.in (), server.in (), t TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - policy_list[0]->destroy (ACE_TRY_ENV); + policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, // "client(%P) Use the object policies\n")); - send_echo (orb.in (), timeout_server.in (), t, ACE_TRY_ENV); + send_echo (orb.in (), timeout_server.in (), t TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -238,18 +238,18 @@ int main (int argc, char* argv[]) // "resynch with server\n")); policy_list.length (0); policy_manager->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - send_echo (orb.in (), server.in (), 0, ACE_TRY_ENV); + send_echo (orb.in (), server.in (), 0 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - server->shutdown (ACE_TRY_ENV); + server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (timeout_count == 0) @@ -263,7 +263,7 @@ int main (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "In time = %d, timed out = %d\n", in_time_count, timeout_count)); - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |