diff options
Diffstat (limited to 'CIAO/examples/BasicSP/EC/controller.cpp')
| -rw-r--r-- | CIAO/examples/BasicSP/EC/controller.cpp | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/CIAO/examples/BasicSP/EC/controller.cpp b/CIAO/examples/BasicSP/EC/controller.cpp index 87e8c28ad77..13a5fd6d81e 100644 --- a/CIAO/examples/BasicSP/EC/controller.cpp +++ b/CIAO/examples/BasicSP/EC/controller.cpp @@ -72,13 +72,12 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); if (parse_args (argc, argv) != 0) { @@ -86,12 +85,10 @@ main (int argc, char *argv[]) } CORBA::Object_var obj = - orb->string_to_object (rategen_ior_ - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (rategen_ior_); BasicSP::EC_var pulser - = BasicSP::EC::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + = BasicSP::EC::_narrow (obj.in ()); if (CORBA::is_nil (pulser.in ())) { @@ -100,13 +97,11 @@ main (int argc, char *argv[]) -1); } - pulser->hertz (rate - ACE_ENV_ARG_PARAMETER); + pulser->hertz (rate); if (turn_on) { - pulser->hertz (rate - ACE_ENV_ARG_PARAMETER); + pulser->hertz (rate); ACE_DEBUG ((LM_DEBUG, "Start up the Event services\n")); @@ -121,15 +116,13 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Who is the culprit \n"); + ex._tao_print_exception ("Who is the culprit \n"); ACE_ERROR_RETURN ((LM_ERROR, "Uncaught CORBA exception\n"), 1); } - ACE_ENDTRY; return 0; } |