diff options
Diffstat (limited to 'TAO/tests/OctetSeq/client.cpp')
| -rw-r--r-- | TAO/tests/OctetSeq/client.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/TAO/tests/OctetSeq/client.cpp b/TAO/tests/OctetSeq/client.cpp index 267bf2256ec..757322add9c 100644 --- a/TAO/tests/OctetSeq/client.cpp +++ b/TAO/tests/OctetSeq/client.cpp @@ -57,19 +57,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Test::Database_var server = - Test::Database::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test::Database::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -125,8 +125,7 @@ main (int argc, char *argv[]) server->set (Test::Index (j), elements[j], token, - returned_token - ACE_ENV_ARG_PARAMETER); + returned_token); if (token != returned_token) { @@ -139,7 +138,7 @@ main (int argc, char *argv[]) } CORBA::ULong crc_remote = - server->get_crc (idx ACE_ENV_ARG_PARAMETER); + server->get_crc (idx); CORBA::ULong crc_local = ACE::crc32 (elements[idx].get_buffer (), @@ -163,13 +162,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } |