diff options
Diffstat (limited to 'TAO/tests/Bug_1330_Regression/client.cpp')
-rw-r--r-- | TAO/tests/Bug_1330_Regression/client.cpp | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/TAO/tests/Bug_1330_Regression/client.cpp b/TAO/tests/Bug_1330_Regression/client.cpp index f317731aeae..043271d2a70 100644 --- a/TAO/tests/Bug_1330_Regression/client.cpp +++ b/TAO/tests/Bug_1330_Regression/client.cpp @@ -39,22 +39,19 @@ int main (int argc, char *argv[]) { int result = 0; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->string_to_object(ior); Test_var server = - Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + Test::_narrow(tmp.in ()); if (CORBA::is_nil (server.in ())) { @@ -65,19 +62,16 @@ main (int argc, char *argv[]) } - server->test_method(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->test_method(); result =0; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception&) { result =1; } - ACE_ENDTRY; return result; } |