summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1999-08-18 15:46:28 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1999-08-18 15:46:28 +0000
commite075dbd99309ed51f74181b66272c3707eeb0342 (patch)
tree1eb734014423f565bb2654a43535740ef380b3d4
parentd91c9e66f3858fbdc0aae496e6b8e121e6b5499c (diff)
downloadATCD-e075dbd99309ed51f74181b66272c3707eeb0342.tar.gz
ChangeLogTag:Wed Aug 18 10:42:13 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
-rw-r--r--ChangeLog-99b3
-rw-r--r--ace/Timer_List_T.cpp3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b
index 4e623eb4177..97427c7b2c4 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,5 +1,8 @@
Wed Aug 18 10:42:13 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
+ * ace/Timer_List_T.cpp (reset_interval): Added a constcast to
+ make SunC++ 4.2 happy. Thanks to Andy for reporting this.
+
* ace/WFMO_Reactor.i (reset_timer_interval): The return type
was incorrect... Thanks to Andy and Jeff for reporting this.
diff --git a/ace/Timer_List_T.cpp b/ace/Timer_List_T.cpp
index f010b48a96b..a37bc7cf804 100644
--- a/ace/Timer_List_T.cpp
+++ b/ace/Timer_List_T.cpp
@@ -232,7 +232,8 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::reset_interval (const long timer_id,
ACE_Timer_Node_T<TYPE> *node =
ACE_reinterpret_cast (ACE_Timer_Node_T<TYPE> *,
- timer_id);
+ ACE_const_cast (long,
+ timer_id));
node->set_interval (interval);