diff options
| author | Simon McQueen <simon.mcqueen@gmail.com> | 2005-06-10 12:20:00 +0000 |
|---|---|---|
| committer | Simon McQueen <simon.mcqueen@gmail.com> | 2005-06-10 12:20:00 +0000 |
| commit | efa5ff4d784016a3a7489b75bc4ee3482913b9f6 (patch) | |
| tree | 5a3725023202a203a017ec977ae2d058d1225848 | |
| parent | 1d5b7d78eeec9175bab0a59d992fa7b190ecb67f (diff) | |
| download | ATCD-efa5ff4d784016a3a7489b75bc4ee3482913b9f6.tar.gz | |
ChangeLogTag: Fri Jun 10 13:16:53 2005 Simon McQueen <sm@prismtech.com>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ace/Reactor.cpp | 24 |
2 files changed, 15 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog index ef644e41f68..7d832a24ff6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Jun 10 13:16:53 2005 Simon McQueen <sm@prismtech.com> + + * ace/Reactor.cpp (register_handler): + + Backed out Thu Jun 9 11:12:39 2005 Steve Huston. + It was causing test failures on Linux. + Fri Jun 10 06:43:25 2005 Chad Elliott <elliott_c@ociweb.com> * bin/MakeProjectCreator/templates/gnu.mpd: diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp index 4cc09b0242b..5e3e891c26c 100644 --- a/ace/Reactor.cpp +++ b/ace/Reactor.cpp @@ -527,15 +527,11 @@ ACE_Reactor::register_handler (int signum, ACE_Event_Handler **old_sh, ACE_Sig_Action *old_disp) { - int result = this->implementation ()->register_handler (signum, - new_sh, - new_disp, - old_sh, - old_disp); - if (result == 0) - // Assign this reactor to the event handler. - new_sh->reactor (this); - return result; + return this->implementation ()->register_handler (signum, + new_sh, + new_disp, + old_sh, + old_disp); } int @@ -543,13 +539,9 @@ ACE_Reactor::register_handler (const ACE_Sig_Set &sigset, ACE_Event_Handler *new_sh, ACE_Sig_Action *new_disp) { - int result = this->implementation ()->register_handler (sigset, - new_sh, - new_disp); - if (result == 0) - // Assign this reactor to the event handler. - new_sh->reactor (this); - return result; + return this->implementation ()->register_handler (sigset, + new_sh, + new_disp); } int |