diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-02-14 13:25:00 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-02-14 13:25:00 +0000 |
| commit | 437dd73e266058439de97459351b7edea89511dd (patch) | |
| tree | 3572fc0995b0432637cdb3e03d88a4d1be3e9adc /TAO | |
| parent | 891e0e1cee684f9add6ef0df8415f4611bc5e862 (diff) | |
| download | ATCD-437dd73e266058439de97459351b7edea89511dd.tar.gz | |
ChangeLogTag: Fri Feb 14 08:35:14 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/examples/RTCORBA/Activity/Activity.cpp | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 1217717d00e..29e25a3effb 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Fri Feb 14 08:35:14 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * examples/RTCORBA/Activity/Activity.cpp: Fixed compile errors in + builds where exceptions have turned off. + Fri Feb 14 12:02:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * utils/catior/Makefile.bor: diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp index 4a5f500f5b2..57d35522099 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.cpp +++ b/TAO/examples/RTCORBA/Activity/Activity.cpp @@ -121,8 +121,8 @@ Activity::init (int& argc, char *argv [] ACE_CHECK_RETURN (-1); object = this->orb_->resolve_initial_references ("PriorityMappingManager" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (-1); RTCORBA::PriorityMappingManager_var mapping_manager = RTCORBA::PriorityMappingManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); @@ -462,7 +462,8 @@ Activity::run (int argc, char *argv[] ACE_ENV_ARG_DECL) this->activate_schedule (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->create_started_flag_file (argc, argv ACE_ENV_ARG_PARAMETER); + this->create_started_flag_file (argc, argv); + orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -473,7 +474,7 @@ Activity::run (int argc, char *argv[] ACE_ENV_ARG_DECL) } void -Activity::create_started_flag_file (int argc, char *argv[] ACE_ENV_ARG_DECL) +Activity::create_started_flag_file (int argc, char *argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); |