diff options
Diffstat (limited to 'TAO/tests/AMI/simple_client.cpp')
| -rw-r--r-- | TAO/tests/AMI/simple_client.cpp | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp index 77c14b0e919..7cd8199157f 100644 --- a/TAO/tests/AMI/simple_client.cpp +++ b/TAO/tests/AMI/simple_client.cpp @@ -9,7 +9,7 @@ // simple_client.cpp // // = DESCRIPTION -// A very simple client, which uses the AMI callback model. +// A very simple client which uses the AMI callback model. // // = AUTHOR // Alexander Babu Arulanthu <alex@cs.wustl.edu>, @@ -82,8 +82,8 @@ public: // Destructor. void foo (CORBA::Long ami_return_val, - CORBA::Long out_l, - CORBA::Environment &) + CORBA::Long out_l + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (debug) @@ -95,24 +95,24 @@ public: } }; - void foo_excep (A::AMI_AMI_TestExceptionHolder * excep_holder, - CORBA::Environment &ACE_TRY_ENV) + void foo_excep (A::AMI_AMI_TestExceptionHolder * excep_holder + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <foo_excep> called: \n" - "Testing proper exception handling ...\n")); + "Testing proper exception handling ...\n")); ACE_TRY { - excep_holder->raise_foo (ACE_TRY_ENV); + excep_holder->raise_foo (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (A::DidTheRightThing, ex) { ACE_DEBUG ((LM_DEBUG, "... exception received successfully\n")); - } + } ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, @@ -123,8 +123,8 @@ public: }; - void get_yadda (CORBA::Long result, - CORBA::Environment &) + void get_yadda (CORBA::Long result + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -132,23 +132,23 @@ public: result)); }; - void get_yadda_excep (A::AMI_AMI_TestExceptionHolder *, - CORBA::Environment &) + void get_yadda_excep (A::AMI_AMI_TestExceptionHolder * + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <get_yadda_excep> called: \n")); }; - void set_yadda (CORBA::Environment &) + void set_yadda (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <set_yadda> called: \n")); }; - void set_yadda_excep (A::AMI_AMI_TestExceptionHolder *, - CORBA::Environment &) + void set_yadda_excep (A::AMI_AMI_TestExceptionHolder * + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -161,38 +161,38 @@ int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object_var = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa_var = - PortableServer::POA::_narrow (object_var.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object_var.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager_var = - poa_var->the_POAManager (ACE_TRY_ENV); + poa_var->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager_var->activate (ACE_TRY_ENV); + poa_manager_var->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; // We reuse the object_var smart pointer! - object_var = orb->string_to_object (ior, ACE_TRY_ENV); + object_var = orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; A::AMI_Test_var ami_test_var = - A::AMI_Test::_narrow (object_var.in (), ACE_TRY_ENV); + A::AMI_Test::_narrow (object_var.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (ami_test_var.in ())) @@ -206,7 +206,7 @@ main (int argc, char *argv[]) // Instantiate the ReplyHandler and register that with the POA. Handler handler; A::AMI_AMI_TestHandler_var the_handler_var = - handler._this (ACE_TRY_ENV); + handler._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Try out sending asynchronous messages without a reply handler @@ -214,8 +214,8 @@ main (int argc, char *argv[]) ami_test_var->sendc_foo (A::AMI_AMI_TestHandler::_nil (), 0, - "", - ACE_TRY_ENV); + "" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -226,8 +226,8 @@ main (int argc, char *argv[]) ami_test_var->sendc_foo (the_handler_var.in (), 0, - "Let's talk AMI.", - ACE_TRY_ENV); + "Let's talk AMI." + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Long l = 931247; @@ -240,23 +240,23 @@ main (int argc, char *argv[]) ami_test_var->sendc_foo (the_handler_var.in (), l, - "Let's talk AMI.", - ACE_TRY_ENV); + "Let's talk AMI." + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } // Begin test of attributes - ami_test_var->sendc_get_yadda (the_handler_var.in (), - ACE_TRY_ENV); + ami_test_var->sendc_get_yadda (the_handler_var.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ami_test_var->sendc_set_yadda (the_handler_var.in (), - 4711, - ACE_TRY_ENV); + 4711 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ami_test_var->sendc_get_yadda (the_handler_var.in (), - ACE_TRY_ENV); + ami_test_var->sendc_get_yadda (the_handler_var.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // End test of attributes @@ -280,8 +280,8 @@ main (int argc, char *argv[]) CORBA::Long number = ami_test_var->foo (l, l, - "Let's talk SMI.", - ACE_TRY_ENV); + "Let's talk SMI." + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (debug) @@ -293,22 +293,22 @@ main (int argc, char *argv[]) if (shutdown_flag) { - ami_test_var->shutdown (ACE_TRY_ENV); + ami_test_var->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } poa_var->destroy (1, // ethernalize objects - 0, // wait for completion - ACE_TRY_ENV); + 0 // wait for completion + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Catched exception:"); + "Caught exception:"); return 1; } ACE_ENDTRY; |