summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog-99b26
-rw-r--r--ace/FlReactor.cpp2
-rw-r--r--ace/FlReactor.h2
-rw-r--r--ace/Reactor.h2
-rw-r--r--ace/Reactor.i2
-rw-r--r--ace/Reactor_Impl.h2
-rw-r--r--ace/Select_Reactor_T.cpp2
-rw-r--r--ace/Select_Reactor_T.h2
-rw-r--r--ace/Timer_Hash_T.cpp2
-rw-r--r--ace/Timer_Hash_T.h2
-rw-r--r--ace/Timer_Heap_T.cpp2
-rw-r--r--ace/Timer_Heap_T.h2
-rw-r--r--ace/Timer_List_T.cpp5
-rw-r--r--ace/Timer_List_T.h2
-rw-r--r--ace/Timer_Queue_T.h2
-rw-r--r--ace/Timer_Wheel_T.cpp2
-rw-r--r--ace/Timer_Wheel_T.h2
-rw-r--r--ace/TkReactor.cpp2
-rw-r--r--ace/TkReactor.h2
-rw-r--r--ace/WFMO_Reactor.h2
-rw-r--r--ace/WFMO_Reactor.i2
-rw-r--r--ace/XtReactor.cpp2
-rw-r--r--ace/XtReactor.h2
23 files changed, 49 insertions, 24 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b
index 80ddfdca530..cea112fbe1b 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,3 +1,29 @@
+Wed Aug 18 22:45:24 1999 Douglas C. Schmidt <schmidt@mambo.cs.wustl.edu>
+
+ * ace/WFMO_Reactor.h,
+ * ace/WFMO_Reactor.cpp,
+ * ace/XtReactor.h,
+ * ace/XtReactor.cpp,
+ * ace/TkReactor.h,
+ * ace/TkReactor.cpp,
+ * ace/FlReactor.h,
+ * ace/FlReactor.cpp,
+ * ace/Select_Reactor_T.h,
+ * ace/Select_Reactor_T.cpp,
+ * ace/Reactor_Impl.h,
+ * ace/Reactor.h,
+ * ace/Reactor.cpp:
+ * ace/Timer_Hash_T.h:
+ * ace/Timer_Heap_T.h:
+ * ace/Timer_List_T.h:
+ * ace/Timer_Queue_T.h:
+ * ace/Timer_Wheel_T.h:
+ * ace/Timer_Hash_T.cpp:
+ * ace/Timer_Heap_T.cpp:
+ * ace/Timer_List_T.cpp:
+ * ace/Timer_Wheel_T.cpp:
+ Changed all uses of const long to long...
+
Wed Aug 18 22:15:58 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
* tests/run_tests.sh:
diff --git a/ace/FlReactor.cpp b/ace/FlReactor.cpp
index fccee9e5760..ee6af14fe14 100644
--- a/ace/FlReactor.cpp
+++ b/ace/FlReactor.cpp
@@ -254,7 +254,7 @@ ACE_FlReactor::reset_timeout (void)
int
ACE_FlReactor::reset_timer_interval
- (const long timer_id,
+ (long timer_id,
const ACE_Time_Value &interval)
{
ACE_TRACE ("ACE_FlReactor::reset_timer_interval");
diff --git a/ace/FlReactor.h b/ace/FlReactor.h
index 454e09d51d1..182d11d7995 100644
--- a/ace/FlReactor.h
+++ b/ace/FlReactor.h
@@ -58,7 +58,7 @@ public:
const void *arg,
const ACE_Time_Value &delta_time,
const ACE_Time_Value &interval);
- virtual int reset_timer_interval (const long timer_id,
+ virtual int reset_timer_interval (long timer_id,
const ACE_Time_Value &interval);
virtual int cancel_timer (ACE_Event_Handler *handler,
int dont_call_handle_close = 1);
diff --git a/ace/Reactor.h b/ace/Reactor.h
index 38274d31d52..baa00f6b2df 100644
--- a/ace/Reactor.h
+++ b/ace/Reactor.h
@@ -354,7 +354,7 @@ public:
// with accidentally deleting the wrong timer. Returns -1 on
// failure (which is guaranteed never to be a valid <timer_id>.
- virtual int reset_timer_interval (const long timer_id,
+ virtual int reset_timer_interval (long timer_id,
const ACE_Time_Value &interval);
// Resets the interval of the timer represented by <timer_id> to
// <interval>, which is specified in relative time to the current
diff --git a/ace/Reactor.i b/ace/Reactor.i
index 0ff7125d0bc..317c09f2d1f 100644
--- a/ace/Reactor.i
+++ b/ace/Reactor.i
@@ -358,7 +358,7 @@ ACE_Reactor::resume_handlers (void)
ACE_INLINE int
ACE_Reactor::reset_timer_interval
- (const long timer_id,
+ (long timer_id,
const ACE_Time_Value &interval)
{
ACE_TRACE ("ACE_Reactor::reset_timer_interval");
diff --git a/ace/Reactor_Impl.h b/ace/Reactor_Impl.h
index 63cf44f71bc..8b2f08f1396 100644
--- a/ace/Reactor_Impl.h
+++ b/ace/Reactor_Impl.h
@@ -312,7 +312,7 @@ public:
// accidentally deleting the wrong timer. Returns -1 on failure
// (which is guaranteed never to be a valid <timer_id>.
- virtual int reset_timer_interval (const long timer_id,
+ virtual int reset_timer_interval (long timer_id,
const ACE_Time_Value &interval) = 0;
// Resets the interval of the timer represented by <timer_id> to
// <interval>, which is specified in relative time to the current
diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp
index 562b4b0410d..1e8e5ea52ec 100644
--- a/ace/Select_Reactor_T.cpp
+++ b/ace/Select_Reactor_T.cpp
@@ -687,7 +687,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::schedule_timer
template <class ACE_SELECT_REACTOR_TOKEN> int
ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::reset_timer_interval
- (const long timer_id,
+ (long timer_id,
const ACE_Time_Value &interval)
{
ACE_TRACE ("ACE_Select_Reactor_T::reset_timer_interval");
diff --git a/ace/Select_Reactor_T.h b/ace/Select_Reactor_T.h
index 76be6e62a13..cce4f1d73f1 100644
--- a/ace/Select_Reactor_T.h
+++ b/ace/Select_Reactor_T.h
@@ -350,7 +350,7 @@ public:
// with accidentally deleting the wrong timer. Returns -1 on
// failure (which is guaranteed never to be a valid <timer_id>.
- virtual int reset_timer_interval (const long timer_id,
+ virtual int reset_timer_interval (long timer_id,
const ACE_Time_Value &interval);
// Resets the interval of the timer represented by <timer_id> to
// <interval>, which is specified in relative time to the current
diff --git a/ace/Timer_Hash_T.cpp b/ace/Timer_Hash_T.cpp
index bb166dbdb12..cec21b3020d 100644
--- a/ace/Timer_Hash_T.cpp
+++ b/ace/Timer_Hash_T.cpp
@@ -379,7 +379,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::schedule (const TYPE &type,
// Locate and update the inteval on the timer_id
template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> int
-ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::reset_interval (const long timer_id,
+ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::reset_interval (long timer_id,
const ACE_Time_Value &interval)
{
ACE_TRACE ("ACE_Timer_Hash_T::reset_interval");
diff --git a/ace/Timer_Hash_T.h b/ace/Timer_Hash_T.h
index 67f5446e1d2..8c5580ea9fa 100644
--- a/ace/Timer_Hash_T.h
+++ b/ace/Timer_Hash_T.h
@@ -174,7 +174,7 @@ public:
// used to cancel the timer before it expires. Returns -1 on
// failure.
- virtual int reset_interval (const long timer_id,
+ virtual int reset_interval (long timer_id,
const ACE_Time_Value &interval);
// Resets the interval of the timer represented by <timer_id> to
// <interval>, which is specified in relative time to the current
diff --git a/ace/Timer_Heap_T.cpp b/ace/Timer_Heap_T.cpp
index 7d4ea508f3f..cf5ae85ce54 100644
--- a/ace/Timer_Heap_T.cpp
+++ b/ace/Timer_Heap_T.cpp
@@ -645,7 +645,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (long timer_id,
// Locate and update the inteval on the timer_id
template <class TYPE, class FUNCTOR, class ACE_LOCK> int
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::reset_interval (const long timer_id,
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::reset_interval (long timer_id,
const ACE_Time_Value &interval)
{
ACE_TRACE ("ACE_Timer_Heap_T::reset_interval");
diff --git a/ace/Timer_Heap_T.h b/ace/Timer_Heap_T.h
index 669d9757dae..b025d41dc5d 100644
--- a/ace/Timer_Heap_T.h
+++ b/ace/Timer_Heap_T.h
@@ -135,7 +135,7 @@ public:
// wrong timer. Returns -1 on failure (which is guaranteed never to
// be a valid <timer_id>).
- virtual int reset_interval (const long timer_id,
+ virtual int reset_interval (long timer_id,
const ACE_Time_Value &interval);
// Resets the interval of the timer represented by <timer_id> to
// <interval>, which is specified in relative time to the current
diff --git a/ace/Timer_List_T.cpp b/ace/Timer_List_T.cpp
index a37bc7cf804..e7392de8291 100644
--- a/ace/Timer_List_T.cpp
+++ b/ace/Timer_List_T.cpp
@@ -219,7 +219,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::schedule (const TYPE &type,
// Locate and update the inteval on the timer_id
template <class TYPE, class FUNCTOR, class ACE_LOCK> int
-ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::reset_interval (const long timer_id,
+ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::reset_interval (long timer_id,
const ACE_Time_Value &interval)
{
ACE_TRACE ("ACE_Timer_List_T::reset_interval");
@@ -232,8 +232,7 @@ 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> *,
- ACE_const_cast (long,
- timer_id));
+ timer_id);
node->set_interval (interval);
diff --git a/ace/Timer_List_T.h b/ace/Timer_List_T.h
index 9caed213b8a..df633675668 100644
--- a/ace/Timer_List_T.h
+++ b/ace/Timer_List_T.h
@@ -126,7 +126,7 @@ public:
// wrong timer. Returns -1 on failure (which is guaranteed never to
// be a valid <timer_id>).
- virtual int reset_interval (const long timer_id,
+ virtual int reset_interval (long timer_id,
const ACE_Time_Value &interval);
// Resets the interval of the timer represented by <timer_id> to
// <interval>, which is specified in relative time to the current
diff --git a/ace/Timer_Queue_T.h b/ace/Timer_Queue_T.h
index f25da9cea9c..24ce3257d5d 100644
--- a/ace/Timer_Queue_T.h
+++ b/ace/Timer_Queue_T.h
@@ -206,7 +206,7 @@ public:
// wrong timer. Returns -1 on failure (which is guaranteed never to
// be a valid <timer_id>).
- virtual int reset_interval (const long timer_id,
+ virtual int reset_interval (long timer_id,
const ACE_Time_Value &interval) = 0;
// Resets the interval of the timer represented by <timer_id> to
// <interval>, which is specified in relative time to the current
diff --git a/ace/Timer_Wheel_T.cpp b/ace/Timer_Wheel_T.cpp
index 1770e5b0d4e..3e37b30fab2 100644
--- a/ace/Timer_Wheel_T.cpp
+++ b/ace/Timer_Wheel_T.cpp
@@ -275,7 +275,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::schedule (const TYPE &type,
// Locate and update the inteval on the timer_id
template <class TYPE, class FUNCTOR, class ACE_LOCK> int
-ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::reset_interval (const long timer_id,
+ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::reset_interval (long timer_id,
const ACE_Time_Value &interval)
{
ACE_TRACE ("ACE_Timer_Wheel_T::reset_interval");
diff --git a/ace/Timer_Wheel_T.h b/ace/Timer_Wheel_T.h
index 463f77d4284..6de5208bc43 100644
--- a/ace/Timer_Wheel_T.h
+++ b/ace/Timer_Wheel_T.h
@@ -139,7 +139,7 @@ public:
// timer. This <timer_id> can be used to cancel the timer before it
// expires. Returns -1 on failure.
- virtual int reset_interval (const long timer_id,
+ virtual int reset_interval (long timer_id,
const ACE_Time_Value &interval);
// Resets the interval of the timer represented by <timer_id> to
// <interval>, which is specified in relative time to the current
diff --git a/ace/TkReactor.cpp b/ace/TkReactor.cpp
index 73ed040335d..833bce6e862 100644
--- a/ace/TkReactor.cpp
+++ b/ace/TkReactor.cpp
@@ -358,7 +358,7 @@ ACE_TkReactor::reset_timeout (void)
int
ACE_TkReactor::reset_timer_interval
- (const long timer_id,
+ (long timer_id,
const ACE_Time_Value &interval)
{
ACE_TRACE ("ACE_TkReactor::reset_timer_interval");
diff --git a/ace/TkReactor.h b/ace/TkReactor.h
index d3780035005..9606315cae5 100644
--- a/ace/TkReactor.h
+++ b/ace/TkReactor.h
@@ -64,7 +64,7 @@ public:
const void *arg,
const ACE_Time_Value &delta_time,
const ACE_Time_Value &interval);
- virtual int reset_timer_interval (const long timer_id,
+ virtual int reset_timer_interval (long timer_id,
const ACE_Time_Value &interval);
virtual int cancel_timer (ACE_Event_Handler *handler,
int dont_call_handle_close = 1);
diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h
index e73e54e0121..719e10a4ba8 100644
--- a/ace/WFMO_Reactor.h
+++ b/ace/WFMO_Reactor.h
@@ -780,7 +780,7 @@ public:
// with accidentally deleting the wrong timer. Returns -1 on
// failure (which is guaranteed never to be a valid <timer_id>.
- virtual int reset_timer_interval (const long timer_id,
+ virtual int reset_timer_interval (long timer_id,
const ACE_Time_Value &interval);
// Resets the interval of the timer represented by <timer_id> to
// <interval>, which is specified in relative time to the current
diff --git a/ace/WFMO_Reactor.i b/ace/WFMO_Reactor.i
index 70fed75d0dd..5aecde24695 100644
--- a/ace/WFMO_Reactor.i
+++ b/ace/WFMO_Reactor.i
@@ -433,7 +433,7 @@ ACE_WFMO_Reactor_Handler_Repository::unbind (ACE_HANDLE handle,
ACE_INLINE int
ACE_WFMO_Reactor::reset_timer_interval
- (const long timer_id,
+ (long timer_id,
const ACE_Time_Value &interval)
{
ACE_TRACE ("ACE_WFMO_Reactor::reset_timer_interval");
diff --git a/ace/XtReactor.cpp b/ace/XtReactor.cpp
index 0a82fa4ba3e..1521681063d 100644
--- a/ace/XtReactor.cpp
+++ b/ace/XtReactor.cpp
@@ -373,7 +373,7 @@ ACE_XtReactor::reset_timeout (void)
int
ACE_XtReactor::reset_timer_interval
- (const long timer_id,
+ (long timer_id,
const ACE_Time_Value &interval)
{
ACE_TRACE ("ACE_XtReactor::reset_timer_interval");
diff --git a/ace/XtReactor.h b/ace/XtReactor.h
index cf2ad2338e8..cac08cd0f70 100644
--- a/ace/XtReactor.h
+++ b/ace/XtReactor.h
@@ -68,7 +68,7 @@ public:
const void *arg,
const ACE_Time_Value &delta_time,
const ACE_Time_Value &interval);
- virtual int reset_timer_interval (const long timer_id,
+ virtual int reset_timer_interval (long timer_id,
const ACE_Time_Value &interval);
virtual int cancel_timer (ACE_Event_Handler *handler,
int dont_call_handle_close = 1);
View Lorry Controller Status