diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp index 965bdda1adb..3aa7dcf576f 100644 --- a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp @@ -7,21 +7,20 @@ int main(int argc, char** argv) { - ACE_TRY_NEW_ENV + try { - CORBA::ORB_var orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb_ = CORBA::ORB_init (argc, argv, 0); CORBA::Object_var object = - orb_->resolve_initial_references ("InterfaceRepository" ACE_ENV_ARG_PARAMETER); + orb_->resolve_initial_references ("InterfaceRepository"); - CORBA::Repository_var repo_ = CORBA::Repository::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + CORBA::Repository_var repo_ = CORBA::Repository::_narrow (object.in ()); CORBA::ContainedSeq_var interfaces = repo_->contents (CORBA::dk_Interface, // Any type of contained object. 1 // Exclude parents of interfaces. - ACE_ENV_ARG_PARAMETER); + ); CORBA::ULong length = interfaces->length (); @@ -34,8 +33,7 @@ int main(int argc, char** argv) CORBA::ULong first_one = 0; CORBA::InterfaceDef_var the_interface = - CORBA::InterfaceDef::_narrow (interfaces[first_one] - ACE_ENV_ARG_PARAMETER); + CORBA::InterfaceDef::_narrow (interfaces[first_one]); CORBA::String_var name = the_interface->name(); @@ -48,12 +46,10 @@ int main(int argc, char** argv) } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception ..."); + ex._tao_print_exception ("Exception ..."); return -1; } - ACE_ENDTRY; return 0; } |