diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-04-07 11:48:50 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-04-07 11:48:50 +0000 |
| commit | 4e0fbcbede63c844fcb99dc98eee3446dba7d1df (patch) | |
| tree | 85aab228c3ecabd30f1cec1f04730de4fee1217f /ACE/ace/OS_NS_Thread.h | |
| parent | 57a3abab77bf7e53eb868b04cc3159a78357f86e (diff) | |
| download | ATCD-4e0fbcbede63c844fcb99dc98eee3446dba7d1df.tar.gz | |
Thu Apr 7 11:40:00 UTC 2011 Martin Corino <mcorino@remedy.nl>
Merged changes from Remedy work branch.
Diffstat (limited to 'ACE/ace/OS_NS_Thread.h')
| -rw-r--r-- | ACE/ace/OS_NS_Thread.h | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/ACE/ace/OS_NS_Thread.h b/ACE/ace/OS_NS_Thread.h index 54469b772d9..87f547647e7 100644 --- a/ACE/ace/OS_NS_Thread.h +++ b/ACE/ace/OS_NS_Thread.h @@ -1023,23 +1023,12 @@ private: # endif /* defined (ACE_WIN32) || defined (ACE_HAS_TSS_EMULATION) */ -// Support non-scalar thread keys, such as with some POSIX -// implementations, e.g., MVS. -# if defined (ACE_HAS_NONSCALAR_THREAD_KEY_T) -# define ACE_KEY_INDEX(OBJ,KEY) \ - u_int OBJ; \ - ACE_OS::memcpy (&OBJ, &KEY, sizeof (u_int)) -# else -# define ACE_KEY_INDEX(OBJ,KEY) u_int OBJ = KEY -# endif /* ACE_HAS_NONSCALAR_THREAD_KEY_T */ - ACE_END_VERSIONED_NAMESPACE_DECL #if (defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1) # define ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ace_mutex_lock_cleanup_adapter) #endif /* ACE_HAS_VERSIONED_NAMESPACE == 1 */ - # if defined (ACE_HAS_THR_C_FUNC) // This is necessary to work around nasty problems with MVS C++. extern "C" ACE_Export void ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME (void *args); @@ -1288,7 +1277,7 @@ namespace ACE_OS { const ACE_Time_Value &timeout); /** - * If <timeout> == 0, calls <ACE_OS::mutex_lock(m)>. Otherwise, + * If @a timeout == 0, calls <ACE_OS::mutex_lock(m)>. Otherwise, * this method attempts to acquire a lock, but gives up if the lock * has not been acquired by the given time, in which case it returns * -1 with an @c ETIME errno on platforms that actually support timed @@ -1312,7 +1301,7 @@ namespace ACE_OS { int mutex_trylock (ACE_mutex_t *m); /// This method is only implemented for Win32. For abandoned - /// mutexes, <abandoned> is set to 1 and 0 is returned. + /// mutexes, @a abandoned is set to 1 and 0 is returned. extern ACE_Export int mutex_trylock (ACE_mutex_t *m, int &abandoned); @@ -1410,7 +1399,7 @@ namespace ACE_OS { int sched_params (const ACE_Sched_Params &, ACE_id_t id = ACE_SELF); //@} - /// Find the schedling class ID that corresponds to the class name. + /// Find the scheduling class ID that corresponds to the class name. extern ACE_Export int scheduling_class (const char *class_name, ACE_id_t &); @@ -1509,7 +1498,7 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION int thr_continue (ACE_hthread_t target_thread); - /* + /** * Creates a new thread having @a flags attributes and running @a func * with @a args (if @a thread_adapter is non-0 then @a func and @a args * are ignored and are obtained from @a thread_adapter). @a thr_id |