diff options
| author | fhunleth <fhunleth@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-02-13 17:38:55 +0000 |
|---|---|---|
| committer | fhunleth <fhunleth@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-02-13 17:38:55 +0000 |
| commit | 51e9072bf4b28156473b46787bcbda22e8ace01b (patch) | |
| tree | effe6bcea8de2ad0430c49fab194fd3af3bf89dd | |
| parent | 1dc594b9b47a05ae1ded34d8c52e439ad8c5dd45 (diff) | |
| download | ATCD-51e9072bf4b28156473b46787bcbda22e8ace01b.tar.gz | |
ChangeLogTag: Tue Feb 13 11:37:03 2001 Frank Hunleth <fhunleth@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | TAO/tao/ORB.cpp | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 9f64d6d8b46..15b75a5af24 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Tue Feb 13 11:37:03 2001 Frank Hunleth <fhunleth@cs.wustl.edu> + + * tao/ORB.cpp: + Changed ACE_CHECK_RETURN macros to be ACE_CHECK in + ORB::run() and ORB::perform_work(). + Tue Feb 13 09:17:30 2001 Carlos O'Ryan <coryan@uci.edu> * tao/ORB.h: diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 3f6fe0ea2ac..ac05067a99a 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -244,7 +244,7 @@ CORBA_ORB::run (ACE_Time_Value *tv, CORBA::Environment &ACE_TRY_ENV) { this->check_shutdown (ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); + ACE_CHECK; this->orb_core ()->run (tv, 0, ACE_TRY_ENV); } @@ -267,7 +267,7 @@ CORBA_ORB::perform_work (ACE_Time_Value *tv, { // This method should not be called if the ORB has been shutdown. this->check_shutdown (ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); + ACE_CHECK; this->orb_core ()->run (tv, 1, ACE_TRY_ENV); } |