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

Some missing from merge.

Browse source 
Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 • committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions
Download patch file Download diff file Expand all files Collapse all files

28
dep/acelite/ace/Select_Reactor_Base.cpp
View file

@ -1,3 +1,5 @@
// $Id: Select_Reactor_Base.cpp 97798 2014-07-03 10:57:43Z johnnyw $
#include "ace/Select_Reactor_Base.h"
#include "ace/Reactor.h"
#include "ace/Thread.h"
@ -18,10 +20,6 @@
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_ALLOC_HOOK_DEFINE(ACE_Select_Reactor_Notify)
ACE_ALLOC_HOOK_DEFINE(ACE_Select_Reactor_Handler_Repository)
ACE_ALLOC_HOOK_DEFINE(ACE_Select_Reactor_Handler_Repository_Iterator)
template<typename iterator>
inline ACE_Event_Handler *
ACE_SELECT_REACTOR_EVENT_HANDLER (iterator i)
@ -529,6 +527,8 @@ ACE_Select_Reactor_Handler_Repository::dump (void) const
#endif /* ACE_HAS_DUMP */
}
ACE_ALLOC_HOOK_DEFINE(ACE_Select_Reactor_Handler_Repository_Iterator)
ACE_Select_Reactor_Notify::ACE_Select_Reactor_Notify (void)
: select_reactor_ (0)
, max_notify_iterations_ (-1)
@ -610,16 +610,9 @@ ACE_Select_Reactor_Notify::open (ACE_Reactor_Impl *r,
if (this->notification_pipe_.open () == -1)
return -1;
#if defined (F_SETFD) && !defined (ACE_LACKS_FCNTL)
if (ACE_OS::fcntl (this->notification_pipe_.read_handle (), F_SETFD, 1) == -1)
{
return -1;
}
if (ACE_OS::fcntl (this->notification_pipe_.write_handle (), F_SETFD, 1) == -1)
{
return -1;
}
#if defined (F_SETFD)
ACE_OS::fcntl (this->notification_pipe_.read_handle (), F_SETFD, 1);
ACE_OS::fcntl (this->notification_pipe_.write_handle (), F_SETFD, 1);
#endif /* F_SETFD */
#if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
@ -627,13 +620,6 @@ ACE_Select_Reactor_Notify::open (ACE_Reactor_Impl *r,
{
return -1;
}
# if defined (ACE_LACKS_LISTEN) && defined (ACE_LACKS_SOCKETPAIR) \
&& !defined (ACE_HAS_STREAM_PIPES)
if (ACE::set_flags (this->notification_pipe_.write_handle (),
ACE_NONBLOCK) == -1)
return -1;
# endif
#endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
// There seems to be a Win32 bug with this... Set this into