diff options
| author | Steve Huston <shuston@riverace.com> | 2005-02-15 23:07:37 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2005-02-15 23:07:37 +0000 |
| commit | 34104cf059eeafbd1382ac7f9315e0c9a4afac2e (patch) | |
| tree | 929cad045679537bffe42e0311c7d1ac90539359 /ace/Timer_Wheel_T.cpp | |
| parent | 2cf1b9573c6f58e31ad17124620d11875cf8dab9 (diff) | |
| download | ATCD-34104cf059eeafbd1382ac7f9315e0c9a4afac2e.tar.gz | |
Commit merged-in changes from mainlinePROACTOR_FIXES_STEVE_JAN05
Diffstat (limited to 'ace/Timer_Wheel_T.cpp')
| -rw-r--r-- | ace/Timer_Wheel_T.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ace/Timer_Wheel_T.cpp b/ace/Timer_Wheel_T.cpp index 109cd123b38..f32b29b8853 100644 --- a/ace/Timer_Wheel_T.cpp +++ b/ace/Timer_Wheel_T.cpp @@ -273,7 +273,7 @@ template <class TYPE, class FUNCTOR, class ACE_LOCK> u_int ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::calculate_spoke (const ACE_Time_Value& t) const { - return ACE_static_cast(u_int, (t.msec () >> this->res_bits_) & (this->spoke_count_ - 1)); + return static_cast<u_int> ((t.msec () >> this->res_bits_) & (this->spoke_count_ - 1)); } /// Generates a unique timer_id for the given spoke. It should be pretty @@ -304,7 +304,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::generate_timer_id (u_int spoke) # pragma warning(push) # pragma warning(disable : 4311) #endif /* ACE_WIN64 */ - long next_cnt = ACE_reinterpret_cast (long, root->get_act ()); + long next_cnt = reinterpret_cast<long> (root->get_act ()); #if defined (ACE_WIN64) # pragma warning(pop) #endif /* ACE_WIN64 */ @@ -359,7 +359,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::generate_timer_id (u_int spoke) # pragma warning(push) # pragma warning(disable : 4312) #endif /* ACE_WIN64 */ - root->set_act (ACE_reinterpret_cast (void*, next_cnt)); + root->set_act (reinterpret_cast<void*> (next_cnt)); #if defined (ACE_WIN64) # pragma warning(pop) #endif /* ACE_WIN64 */ |