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

23
dep/ACE_wrappers/ace/Sig_Handler.cpp
View file

@ -1,4 +1,4 @@
// $Id: Sig_Handler.cpp 91286 2010-08-05 09:04:31Z johnnyw $
// $Id: Sig_Handler.cpp 91626 2010-09-07 10:59:20Z johnnyw $
#include "ace/Sig_Handler.h"
#include "ace/Sig_Adapter.h"
@ -71,7 +71,7 @@ ACE_Sig_Handler::sig_pending (void)
ACE_MT (ACE_Recursive_Thread_Mutex *lock =
ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
(ACE_Object_Manager::ACE_SIG_HANDLER_LOCK);
ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock));
ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, 0));
return ACE_Sig_Handler::sig_pending_ != 0;
}
@ -83,7 +83,7 @@ ACE_Sig_Handler::sig_pending (int pending)
ACE_MT (ACE_Recursive_Thread_Mutex *lock =
ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
(ACE_Object_Manager::ACE_SIG_HANDLER_LOCK);
ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock));
ACE_GUARD (ACE_Recursive_Thread_Mutex, m, *lock));
ACE_Sig_Handler::sig_pending_ = pending;
}
@ -94,7 +94,7 @@ ACE_Sig_Handler::handler (int signum)
ACE_MT (ACE_Recursive_Thread_Mutex *lock =
ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
(ACE_Object_Manager::ACE_SIG_HANDLER_LOCK);
ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock));
ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, 0));
if (ACE_Sig_Handler::in_range (signum))
return ACE_Sig_Handler::signal_handlers_[signum];
@ -127,7 +127,7 @@ ACE_Sig_Handler::handler (int signum,
ACE_MT (ACE_Recursive_Thread_Mutex *lock =
ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
(ACE_Object_Manager::ACE_SIG_HANDLER_LOCK);
ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock));
ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, 0));
return ACE_Sig_Handler::handler_i (signum, new_sh);
}
@ -185,7 +185,7 @@ ACE_Sig_Handler::register_handler (int signum,
ACE_MT (ACE_Recursive_Thread_Mutex *lock =
ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
(ACE_Object_Manager::ACE_SIG_HANDLER_LOCK);
ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock));
ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, -1));
return ACE_Sig_Handler::register_handler_i (signum,
new_sh,
@ -206,7 +206,7 @@ ACE_Sig_Handler::remove_handler (int signum,
ACE_MT (ACE_Recursive_Thread_Mutex *lock =
ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
(ACE_Object_Manager::ACE_SIG_HANDLER_LOCK);
ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock));
ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, -1));
if (ACE_Sig_Handler::in_range (signum))
{
@ -221,7 +221,7 @@ ACE_Sig_Handler::remove_handler (int signum,
return new_disp->register_action (signum, old_disp);
}
return -1;
return -1;
}
// Master dispatcher function that gets called by a signal handler and
@ -270,8 +270,7 @@ ACE_Sig_Handler::dispatch (int signum,
// dispatched. Therefore, to workaround this "feature" we
// must re-register the <ACE_Event_Handler> with <signum>
// explicitly.
ACE_Sig_Handler::register_handler_i (signum,
eh);
ACE_Sig_Handler::register_handler_i (signum, eh);
#endif /* ACE_WIN32*/
}
}
@ -345,7 +344,7 @@ ACE_Sig_Handlers::register_handler (int signum,
ACE_MT (ACE_Recursive_Thread_Mutex *lock =
ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
(ACE_Object_Manager::ACE_SIG_HANDLER_LOCK);
ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock));
ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, -1));
if (ACE_Sig_Handler::in_range (signum))
{
@ -474,7 +473,7 @@ ACE_Sig_Handlers::remove_handler (int signum,
ACE_MT (ACE_Recursive_Thread_Mutex *lock =
ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
(ACE_Object_Manager::ACE_SIG_HANDLER_LOCK);
ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock));
ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, -1));
if (ACE_Sig_Handler::in_range (signum))
{