diff options
author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-08-18 14:36:04 +0000 |
---|---|---|
committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-08-18 14:36:04 +0000 |
commit | 7e0a6ae5783433c046c0beef24c5983d210252ee (patch) | |
tree | 18dd2cf0e71858f4ba7e2ba1c82c7ef54087144e | |
parent | 20712a980bba0146c3156630a61e0d7f487c2b58 (diff) | |
download | ATCD-7e0a6ae5783433c046c0beef24c5983d210252ee.tar.gz |
ChangeLogTag:Wed Aug 18 09:34:46 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
-rw-r--r-- | ChangeLog-99b | 7 | ||||
-rw-r--r-- | ace/FlReactor.cpp | 6 | ||||
-rw-r--r-- | ace/XtReactor.cpp | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index f8024b1de66..5c4e9ac5837 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,10 @@ +Wed Aug 18 09:34:46 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * ace/FlReactor.cpp: + * ace/XtReactor.cpp: + Fixed typos in the code, this is only used in a few platforms, + that's why it didn't show up before. + Tue Aug 17 20:02:55 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * tests/Reactor_Timer_Test.cpp: Enhanced this test to exercise diff --git a/ace/FlReactor.cpp b/ace/FlReactor.cpp index 6911d11336b..fccee9e5760 100644 --- a/ace/FlReactor.cpp +++ b/ace/FlReactor.cpp @@ -246,7 +246,7 @@ ACE_FlReactor::reset_timeout (void) { float t = max_wait_time->sec () + max_wait_time->usec () / 1000000.0F; - Fl::add_timeout (t, + Fl::add_timeout (t, ACE_FlReactor::fl_timeout_proc, this); } @@ -254,11 +254,11 @@ ACE_FlReactor::reset_timeout (void) int ACE_FlReactor::reset_timer_interval - (const long timer_id, + (const long timer_id, const ACE_Time_Value &interval) { ACE_TRACE ("ACE_FlReactor::reset_timer_interval"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); + ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1)); int result = ACE_Select_Reactor::reset_interval (timer_id, diff --git a/ace/XtReactor.cpp b/ace/XtReactor.cpp index a66f5196947..0a82fa4ba3e 100644 --- a/ace/XtReactor.cpp +++ b/ace/XtReactor.cpp @@ -373,11 +373,11 @@ ACE_XtReactor::reset_timeout (void) int ACE_XtReactor::reset_timer_interval - (const long timer_id, + (const long timer_id, const ACE_Time_Value &interval) { ACE_TRACE ("ACE_XtReactor::reset_timer_interval"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); + ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1)); int result = ACE_Select_Reactor::timer_queue_->reset_interval (timer_id, |