mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10874] Update ACE to v5.8.3

Browse source 
(based on zergtmn's repo commit 3a8c259)
(based on zergtmn's repo commit 946c1a8)

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
zerg 2010-12-14 17:14:34 +03:00 • committed by VladimirMangos
parent c38c876b1d
commit b8d773091a
343 changed files with 3060 additions and 7431 deletions
Download patch file Download diff file Expand all files Collapse all files

26
dep/ACE_wrappers/ace/Timer_Hash_T.cpp
View file

@ -1,4 +1,4 @@
// $Id: Timer_Hash_T.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
// $Id: Timer_Hash_T.cpp 92069 2010-09-28 11:38:59Z johnnyw $
#ifndef ACE_TIMER_HASH_T_CPP
#define ACE_TIMER_HASH_T_CPP
@ -419,14 +419,6 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::reschedule (
expired->get_interval ());
ACE_ASSERT (h->orig_id_ != -1);
#if 0
ACE_DEBUG ((LM_DEBUG, "Hash::reschedule() resets %d in slot %d where it's id is %d and token is %x\n",
expired->get_timer_value ().msec (),
h->pos_,
h->orig_id_,
h));
#endif
// Since schedule() above will allocate a new node
// then here schedule <expired> for deletion. Don't call
// this->free_node() because that will invalidate <h>
@ -470,14 +462,6 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::schedule_i (
interval);
ACE_ASSERT (h->orig_id_ != -1);
#if 0
ACE_DEBUG ((LM_DEBUG, "Hash::schedule() placing %d in slot %d where it's id is %d and token is %x\n",
future_time.msec (),
position,
h->orig_id_,
h));
#endif
if (this->table_[this->earliest_position_]->is_empty ()
|| this->table_[position]->earliest_time ()
< this->table_[this->earliest_position_]->earliest_time ())
@ -806,14 +790,6 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::expire (const ACE_Time_Value
ACE_ASSERT (h->pos_ == i);
#if 0
ACE_DEBUG ((LM_DEBUG, "Hash::expire() expiring %d in slot %d where it's id is %d and token is %x\n",
expired->get_timer_value ().msec (),
h->pos_,
h->orig_id_,
h));
#endif
// Check if this is an interval timer.
if (expired->get_interval () > ACE_Time_Value::zero)
{