josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Dependencies: Update ACE to v6.1.4 (Windows only)

Browse Source 
Tested in multiple configurations
.diff with TC changes added
This commit is contained in:
Nay
2012-09-17 23:21:01 +01:00
parent 6ebc6b9a76
commit 2e21fa6b92
549 changed files with 28949 additions and 14408 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dep/acelite/ace/Base_Thread_Adapter.h
+16 -12
View File
@@ -4,7 +4,7 @@
/**
* @file Base_Thread_Adapter.h
*
* $Id: Base_Thread_Adapter.h 81239 2008-04-04 22:28:48Z iliyan $
* $Id: Base_Thread_Adapter.h 95595 2012-03-07 13:33:25Z johnnyw $
*
* @author Nanbor Wang <[email protected]>
*/
@@ -33,9 +33,8 @@
# define ACE_THREAD_ADAPTER_NAME ace_thread_adapter
#endif /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
// Run the thread entry point for the ACE_Thread_Adapter. This must
// be an extern "C" to make certain compilers happy...
/// Run the thread entry point for the ACE_Thread_Adapter. This must
/// be an extern "C" to make certain compilers happy...
extern "C" ACE_Export ACE_THR_FUNC_RETURN ACE_THREAD_ADAPTER_NAME (void *args);
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -44,7 +43,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
* @class ACE_OS_Thread_Descriptor
*
* @brief Parent class of all ACE_Thread_Descriptor classes.
* =
*
* Container for ACE_Thread_Descriptor members that are
* used in ACE_OS.
*/
@@ -54,6 +53,8 @@ public:
/// Get the thread creation flags.
long flags (void) const;
virtual ~ACE_OS_Thread_Descriptor (void);
protected:
/// For use by ACE_Thread_Descriptor.
ACE_OS_Thread_Descriptor (long flags = 0);
@@ -61,17 +62,14 @@ protected:
/**
* Keeps track of whether this thread was created "detached" or not.
* If a thread is *not* created detached then if someone calls
* <ACE_Thread_Manager::wait>, we need to join with that thread (and
* ACE_Thread_Manager::wait(), we need to join with that thread (and
* close down the handle).
*/
long flags_;
};
class ACE_Service_Gestalt;
/**
* @class ACE_Base_Thread_Adapter
*
@@ -126,6 +124,7 @@ protected:
, ACE_SEH_EXCEPT_HANDLER selector = 0
, ACE_SEH_EXCEPT_HANDLER handler = 0
# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
, long cancel_flags = 0
);
/// Inherit the logging features if the parent thread has an
/// ACE_Log_Msg.
@@ -162,8 +161,8 @@ protected:
/**
* Optional thread descriptor. Passing this pointer in will force
* the spawned thread to cache this location in <Log_Msg> and wait
* until <Thread_Manager> fills in all information in thread
* the spawned thread to cache this location in Log_Msg and wait
* until Thread_Manager fills in all information in thread
* descriptor.
*/
ACE_OS_Thread_Descriptor *thr_desc_;
@@ -171,7 +170,7 @@ protected:
/// The ACE_Log_Msg attributes.
ACE_OS_Log_Msg_Attributes log_msg_attributes_;
/// That is usefull for gprof, define itimerval
/// That is useful for gprof, define itimerval
#ifdef ACE_USES_GPROF
struct itimerval itimer_;
#endif // ACE_USES_GPROF
@@ -179,6 +178,11 @@ protected:
/// Keep a reference to the configuration context that spawns the
/// thread so the child can inherit it.
ACE_Service_Gestalt * const ctx_;
/// Pass through the thread-creation flags that can only be acted on by
/// the spawned thread. Currently this is only the cancellation-related
/// flags.
long flags_;
};
ACE_END_VERSIONED_NAMESPACE_DECL