mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 04:37:00 +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

6
dep/ACE_wrappers/ace/Timer_Queue_T.cpp
View file

@ -1,4 +1,4 @@
// $Id: Timer_Queue_T.cpp 89254 2010-02-25 22:10:39Z cleeland $
// $Id: Timer_Queue_T.cpp 92285 2010-10-20 16:34:57Z shuston $
#ifndef ACE_TIMER_QUEUE_T_CPP
#define ACE_TIMER_QUEUE_T_CPP
@ -18,6 +18,7 @@
#include "ace/Guard_T.h"
#include "ace/Log_Msg.h"
#include "ace/Reactor_Timer_Interface.h"
#include "ace/Reverse_Lock_T.h"
#include "ace/Null_Mutex.h"
#include "ace/OS_NS_sys_time.h"
@ -267,6 +268,9 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>::expire (const ACE_Time_Value &cur_ti
while ((result = this->dispatch_info_i (cur_time, info)) != 0)
{
ACE_MT (ACE_Reverse_Lock<ACE_LOCK> rev_lk(this->mutex_));
ACE_MT (ACE_GUARD_RETURN (ACE_Reverse_Lock<ACE_LOCK>, rmon, rev_lk, -1));
const void *upcall_act = 0;
this->preinvoke (info, cur_time, upcall_act);