diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-03-04 18:14:19 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-03-04 18:14:19 +0000 |
| commit | 75535dcc2f585034de8ff4cd251dd91f5fe9941c (patch) | |
| tree | 20b42de465d858cc1a91df5478f9cf0b1db9bb8b | |
| parent | 0498d708e7660fa146fe6685e8bed54931362f0c (diff) | |
| download | ATCD-75535dcc2f585034de8ff4cd251dd91f5fe9941c.tar.gz | |
ChangeLogTag:Sun Mar 04 10:11:07 2001 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 11 | ||||
| -rw-r--r-- | TAO/tests/Smart_Proxies/Policy/server.cpp | 12 |
2 files changed, 16 insertions, 7 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index ce1a00c7d5a..96d3e795256 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,14 @@ +Sun Mar 04 10:11:07 2001 Ossama Othman <ossama@uci.edu> + + * tests/Smart_Proxies/Policy/server.cpp (shutdown): + + Added missing ACE_TRY_ENV parameter to the ORB::shutdown() call. + + (main): + + Fixed ORB::run() call so that it uses the standard calling + convention (void return). + Sun Mar 04 10:02:18 2001 Ossama Othman <ossama@uci.edu> * tests/Smart_Proxies/Benchmark/server.cpp (box_prices, tickets): diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp index eacd1458aff..518e3d4fc1a 100644 --- a/TAO/tests/Smart_Proxies/Policy/server.cpp +++ b/TAO/tests/Smart_Proxies/Policy/server.cpp @@ -62,10 +62,10 @@ Test_i :: method (CORBA::Short boo, } void -Test_i::shutdown (CORBA::Environment &) +Test_i::shutdown (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (); + this->orb_->shutdown (0, ACE_TRY_ENV); } static const char *ior_output_file = 0; @@ -157,11 +157,9 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_TRY_ENV); ACE_TRY_CHECK; - if (orb->run () == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "orb->run"), - -1); + orb->run (ACE_TRY_ENV); + ACE_TRY_CHECK; + ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); |