summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1998-12-20 00:34:10 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1998-12-20 00:34:10 +0000
commitc405943059be2018af935e5b6d16d44102bc8b49 (patch)
treec89732da77cd8855cbcd9895b3a6947f388aba8c
parent97b65061a61c3a9f5d05cf0f13ee1d25e546f679 (diff)
downloadATCD-c405943059be2018af935e5b6d16d44102bc8b49.tar.gz
.
-rw-r--r--ChangeLog-98b5
-rw-r--r--ace/Timer_Queue_Adapters.cpp15
-rw-r--r--include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU7
3 files changed, 18 insertions, 9 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b
index 8961075d053..08ef6948bf1 100644
--- a/ChangeLog-98b
+++ b/ChangeLog-98b
@@ -1,3 +1,8 @@
+Sat Dec 19 18:27:07 1998 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
+
+ * ace/Timer_Queue_Adapters.cpp (handle_signal): Cleaned up an
+ unused variable. Thanks to David Levine for reporting this.
+
Fri Dec 18 09:30:57 1998 David L. Levine <levine@cs.wustl.edu>
* ace/High_Res_Timer.h (elapsed_time_incr): added missing
diff --git a/ace/Timer_Queue_Adapters.cpp b/ace/Timer_Queue_Adapters.cpp
index 4c79dfff68f..468c9b11d91 100644
--- a/ace/Timer_Queue_Adapters.cpp
+++ b/ace/Timer_Queue_Adapters.cpp
@@ -122,15 +122,16 @@ ACE_Async_Timer_Queue_Adapter<TQ>::handle_signal (int signum,
{
case SIGALRM:
{
- int expired_timers;
-
// Expire the pending timers.
- // @@ We need to figure out how to implement interval timers...
- expired_timers = this->timer_queue_.expire ();
- // Only schedule a new timer if there is one in the list. @@
- // This code should also become smarter to avoid unnecessary
- // calls to ualarm().
+ // @@ We need to figure out how to implement interval
+ // timers...
+ this->timer_queue_.expire ();
+
+ // Only schedule a new timer if there is one in the list.
+
+ // @@ This code should also become smarter to avoid
+ // unnecessary calls to ualarm().
if (this->timer_queue_.is_empty () == 0)
return this->schedule_ualarm ();
else
diff --git a/include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU b/include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU
index 6267de6e682..da2331d139a 100644
--- a/include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU
+++ b/include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU
@@ -1,7 +1,10 @@
# $Id$
#
-# NOTE: the above file from ACE 4.6 has been modified by Mike P. to get rid of
-# thread related stuff until we can obtain fsu-threads library.
+# Note 1: the above file from ACE 4.6 has been modified by Mike P. to get
+# rid of thread related stuff until we can obtain fsu-threads library.
+#
+# Note 2: You must setup FSU_PTHREADS_DIR environment var to your FSU
+# pthreads directory.
# Requires gcc 2.7.2 Skunkware 97
# to produce libACE.so correctly changed the specs file for gcc 2.7.2