Commit merged-in changes from mainlinePROACTOR_FIXES_STEVE_JAN05

1 files changed, 2 insertions, 3 deletions

diff --git a/ace/Timer_Heap_T.cpp b/ace/Timer_Heap_T.cpp
index 537c2e85734..81224fa354b 100644
--- a/ace/Timer_Heap_T.cpp
+++ b/ace/Timer_Heap_T.cpp
@@ -234,8 +234,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::pop_freelist (void)
     }
 
   // We need to truncate this to <int> for backwards compatibility.
-  int new_id = ACE_static_cast (int,
-                                this->timer_ids_curr_);
+  int new_id = static_cast<int> (this->timer_ids_curr_);
   return new_id;
 }
 
@@ -509,7 +508,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::grow_heap (void)
 
   // And add the new elements to the end of the "freelist".
   for (size_t i = this->max_size_; i < new_size; i++)
-    this->timer_ids_[i] = -(ACE_static_cast (ssize_t, i) + 1);
+    this->timer_ids_[i] = -(static_cast<ssize_t> (i) + 1);
 
    // Grow the preallocation array (if using preallocation)
   if (this->preallocated_nodes_ != 0)