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

[10643] Update the ACE part we use to 5.8.2

Browse source 
Signed-off-by: Neo2003 <Neo.2003@Hotmail.fr>
This commit is contained in:
Neo2003 2010-10-25 20:36:51 +02:00
parent 8f71d95c0d
commit 23c920ca4b
739 changed files with 22031 additions and 40373 deletions
Download patch file Download diff file Expand all files Collapse all files

35
dep/ACE_wrappers/ace/Sched_Params.cpp
View file

@ -3,7 +3,7 @@
/**
* @file Sched_Params.cpp
*
* $Id: Sched_Params.cpp 80826 2008-03-04 14:51:23Z wotte $
* $Id: Sched_Params.cpp 91286 2010-08-05 09:04:31Z johnnyw $
*
* @author David Levine
*/
@ -21,7 +21,7 @@
# include /**/ <sys/priocntl.h>
#endif /* ACE_HAS_PRIOCNTL && ACE_HAS_THREADS */
ACE_RCSID(ace, Sched_Params, "$Id: Sched_Params.cpp 80826 2008-03-04 14:51:23Z wotte $")
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@ -115,10 +115,14 @@ ACE_Sched_Params::priority_min (const Policy policy,
}
}
#elif defined (ACE_HAS_WTHREADS)
#elif defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE)
ACE_UNUSED_ARG (policy);
ACE_UNUSED_ARG (scope);
return THREAD_PRIORITY_IDLE;
#elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WINCE)
ACE_UNUSED_ARG (policy);
ACE_UNUSED_ARG (scope);
return 255;
#elif defined (ACE_VXWORKS)
ACE_UNUSED_ARG (policy);
ACE_UNUSED_ARG (scope);
@ -219,10 +223,14 @@ ACE_Sched_Params::priority_max (const Policy policy,
}
}
#elif defined (ACE_HAS_WTHREADS)
#elif defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE)
ACE_UNUSED_ARG (policy);
ACE_UNUSED_ARG (scope);
return THREAD_PRIORITY_TIME_CRITICAL;
#elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WINCE)
ACE_UNUSED_ARG (policy);
ACE_UNUSED_ARG (scope);
return 0;
#elif defined (ACE_VXWORKS)
ACE_UNUSED_ARG (policy);
ACE_UNUSED_ARG (scope);
@ -243,7 +251,7 @@ ACE_Sched_Params::next_priority (const Policy policy,
const int priority,
const int scope)
{
#if defined (ACE_HAS_WTHREADS)
#if defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE)
ACE_UNUSED_ARG (policy);
ACE_UNUSED_ARG (scope);
switch (priority)
@ -271,10 +279,9 @@ ACE_Sched_Params::next_priority (const Policy policy,
// including STHREADS, and PTHREADS
int const max = priority_max (policy, scope);
return priority < max ? priority + 1 : max;
#elif defined (ACE_VXWORKS)
return priority > priority_max (policy, scope)
? priority - 1
: priority_max (policy, scope);
#elif defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE)
int const max = priority_max (policy, scope);
return priority > max ? priority - 1 : max;
#else
ACE_UNUSED_ARG (policy);
ACE_UNUSED_ARG (scope);
@ -288,7 +295,7 @@ ACE_Sched_Params::previous_priority (const Policy policy,
const int priority,
const int scope)
{
#if defined (ACE_HAS_WTHREADS)
#if defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE)
ACE_UNUSED_ARG (policy);
ACE_UNUSED_ARG (scope);
switch (priority)
@ -315,12 +322,10 @@ ACE_Sched_Params::previous_priority (const Policy policy,
defined (ACE_HAS_PTHREAD_SCHEDPARAM))
// including STHREADS and PTHREADS
int const min = priority_min (policy, scope);
return priority > min ? priority - 1 : min;
#elif defined (ACE_VXWORKS)
return priority < priority_min (policy, scope)
? priority + 1
: priority_min (policy, scope);
#elif defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE)
int const min = priority_min (policy, scope);
return priority < min ? priority + 1 : min;
#else
ACE_UNUSED_ARG (policy);
ACE_UNUSED_ARG (scope);