diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-21 15:37:07 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-21 15:37:07 +0000 |
| commit | 64065581360769a734628fee1d03aa415f841d9d (patch) | |
| tree | 4acc507526be560d7556141a03cdc7a38e03391d | |
| parent | b33cfcfd4042379a4f1c641cc97f09a38dad0275 (diff) | |
| download | ATCD-64065581360769a734628fee1d03aa415f841d9d.tar.gz | |
(reschedule): only declare local "timerID" without ACE_NDEBUG, to
avoid compile warning with debug=0.
| -rw-r--r-- | ace/Timer_Heap_T.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ace/Timer_Heap_T.cpp b/ace/Timer_Heap_T.cpp index 031b40c1b28..21c82bbe99d 100644 --- a/ace/Timer_Heap_T.cpp +++ b/ace/Timer_Heap_T.cpp @@ -224,7 +224,7 @@ template <class TYPE, class FUNCTOR, class ACE_LOCK> int ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::is_empty (void) const { ACE_TRACE ("ACE_Timer_Heap::is_empty"); - return this->cur_size_ == 0; + return this->cur_size_ == 0; } @@ -467,7 +467,10 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::reschedule (ACE_Timer_Node_T<TYPE> *e // to reacquire it. // NOTE: we rely on the fact that we will get the same timer id we just // freed. - int timerId = this->timer_id (); +# if !defined (ACE_NDEBUG) + int timerId = +# endif /* ACE_NDEBUG */ + this->timer_id (); ACE_ASSERT(timerId == expired->get_timer_id ()); // Just to be safe... |