diff options
Diffstat (limited to 'TAO/tests/Abstract_Interface/client.cpp')
| -rw-r--r-- | TAO/tests/Abstract_Interface/client.cpp | 82 |
1 files changed, 23 insertions, 59 deletions
diff --git a/TAO/tests/Abstract_Interface/client.cpp b/TAO/tests/Abstract_Interface/client.cpp index 0a26fb84775..0fcf7680569 100644 --- a/TAO/tests/Abstract_Interface/client.cpp +++ b/TAO/tests/Abstract_Interface/client.cpp @@ -124,12 +124,9 @@ test_state (base_ptr abs) } void -test_operation (base_ptr abs - ACE_ENV_ARG_DECL) +test_operation (base_ptr abs) { - CORBA::String_var retval = abs->base_op ("base_op" - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var retval = abs->base_op ("base_op"); if (debug) { @@ -140,13 +137,9 @@ test_operation (base_ptr abs CORBA::Object_var obj = abs->_to_object (); - foo_var concrete = foo::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + foo_var concrete = foo::_narrow (obj.in ()); - retval = concrete->foo_op ("foo_op" - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + retval = concrete->foo_op ("foo_op"); if (debug) { @@ -155,9 +148,7 @@ test_operation (base_ptr abs retval.in ())); } - retval = concrete->base_op ("base_op" - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + retval = concrete->base_op ("base_op"); if (debug) { @@ -168,12 +159,9 @@ test_operation (base_ptr abs } void -test_exception (base_ptr abs - ACE_ENV_ARG_DECL) +test_exception (base_ptr abs) { - CORBA::String_var retval = abs->base_op ("bad_name" - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var retval = abs->base_op ("bad_name"); if (debug) { @@ -188,13 +176,11 @@ main (int argc, char *argv[]) { CORBA::String_var retval; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ""); if (parse_args (argc, argv) != 0) { @@ -202,9 +188,7 @@ main (int argc, char *argv[]) } CORBA::Object_var obj = - orb->string_to_object (ior_input_file - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->string_to_object (ior_input_file); if (CORBA::is_nil (obj.in ())) { @@ -213,9 +197,7 @@ main (int argc, char *argv[]) -1); } - passer_var objref = passer::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + passer_var objref = passer::_narrow (obj.in ()); if (CORBA::is_nil (objref.in ())) { @@ -235,9 +217,7 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (bn_factory->tao_repository_id (), - bn_factory - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + bn_factory); bn_factory->_remove_ref (); // release ownership // Create and register factory for TreeController. @@ -247,9 +227,7 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (tc_factory->tao_repository_id (), - tc_factory - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + tc_factory); tc_factory->_remove_ref (); // release ownership // Create and register factory for StringNode. @@ -259,14 +237,10 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (sn_factory->tao_repository_id (), - sn_factory - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + sn_factory); sn_factory->_remove_ref (); // release ownership - objref->pass_state (package.out () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + objref->pass_state (package.out ()); if (CORBA::is_nil (package.in ())) { @@ -280,9 +254,7 @@ main (int argc, char *argv[]) if (which_test != TEST_STATE) { - objref->pass_ops (package.out () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + objref->pass_ops (package.out ()); if (CORBA::is_nil (package.in ())) { @@ -294,28 +266,22 @@ main (int argc, char *argv[]) if (which_test == TEST_OPERATION || which_test == TEST_ALL) { - test_operation (package.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + test_operation (package.in ()); } if (which_test == TEST_EXCEPTION || which_test == TEST_ALL) { which_test = TEST_EXCEPTION; - test_exception (package.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + test_exception (package.in ()); } - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } - ACE_CATCH (BadInput, ex) + catch (const BadInput& ex) { if (which_test != TEST_EXCEPTION) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client: exception caught - "); + ex._tao_print_exception ("Client: exception caught - "); return 1; } @@ -327,14 +293,12 @@ main (int argc, char *argv[]) ex.message.in ())); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client: exception caught - "); + ex._tao_print_exception ("Client: exception caught - "); return 1; } - ACE_ENDTRY; return 0; } |