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

32
dep/ACE_wrappers/ace/OS_NS_Thread.h
View file

@ -4,7 +4,7 @@
/**
* @file OS_NS_Thread.h
*
* $Id: OS_NS_Thread.h 91536 2010-08-27 18:36:54Z johnnyw $
* $Id: OS_NS_Thread.h 91693 2010-09-09 12:57:54Z johnnyw $
*
* @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
* @author Jesper S. M|ller<stophph@diku.dk>
@ -762,18 +762,18 @@ typedef int ACE_pri_t;
# else
typedef int ACE_idtype_t;
# endif /* ACE_HAS_IDTYPE_T */
# if defined (ACE_HAS_STHREADS) || defined (DIGITAL_UNIX)
# if defined (ACE_HAS_STHREADS)
# if defined (ACE_LACKS_PRI_T)
typedef int pri_t;
# endif /* ACE_LACKS_PRI_T */
typedef id_t ACE_id_t;
# define ACE_SELF P_MYID
typedef pri_t ACE_pri_t;
# else /* ! ACE_HAS_STHREADS && ! DIGITAL_UNIX */
# else /* ! ACE_HAS_STHREADS */
typedef long ACE_id_t;
# define ACE_SELF (-1)
typedef short ACE_pri_t;
# endif /* ! ACE_HAS_STHREADS && ! DIGITAL_UNIX */
# endif /* ! ACE_HAS_STHREADS */
#endif /* !defined (ACE_WIN32) */
# if defined (ACE_HAS_TSS_EMULATION)
@ -1631,11 +1631,8 @@ namespace ACE_OS {
size_t cpu_set_size,
const cpu_set_t * cpu_mask);
/**
* @note the "inst" arg is deprecated. It will be ignored.
*/
extern ACE_Export
int thr_key_detach (ACE_thread_key_t key, void * inst);
int thr_key_detach (ACE_thread_key_t key);
extern ACE_Export
int thr_key_used (ACE_thread_key_t key);
@ -1644,17 +1641,12 @@ namespace ACE_OS {
# if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
/// @internal Applications should call thr_keycreate
extern ACE_Export
int thr_keycreate_native (ACE_OS_thread_key_t *key,
ACE_THR_C_DEST);
int thr_keycreate_native (ACE_OS_thread_key_t *key, ACE_THR_C_DEST);
# endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
/**
* @note the "inst" arge is deprecated. It will be ignored.
*/
extern ACE_Export
int thr_keycreate (ACE_thread_key_t *key,
ACE_THR_C_DEST,
void *inst = 0);
int thr_keycreate (ACE_thread_key_t *key, ACE_THR_C_DEST);
# else
# if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
/// @internal Applications should call thr_keycreate instead
@ -1662,13 +1654,9 @@ namespace ACE_OS {
int thr_keycreate_native (ACE_OS_thread_key_t *key,
ACE_THR_DEST);
# endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
/**
* @note the "inst" arge is deprecated. It will be ignored.
*/
extern ACE_Export
int thr_keycreate (ACE_thread_key_t *key,
ACE_THR_DEST,
void *inst = 0);
int thr_keycreate (ACE_thread_key_t *key, ACE_THR_DEST);
# endif /* ACE_HAS_THR_C_DEST */