diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-29 13:40:46 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-29 13:40:46 +0100 |
commit | 1fd4e430fee005d73f91cf4e2ce9c2ac8721d9b6 (patch) | |
tree | c0fb3bf13b84224c13fd26517a792a937639af66 /ACE/ace/OS_NS_Thread.h | |
parent | 4ce761b1d69d50c0c3658b1139370b44b9c626c8 (diff) | |
parent | c6a620cc7eabece507d13986c40c955d2f226f26 (diff) | |
download | ATCD-1fd4e430fee005d73f91cf4e2ce9c2ac8721d9b6.tar.gz |
Merge branch 'master' into diop-portspan
Diffstat (limited to 'ACE/ace/OS_NS_Thread.h')
-rw-r--r-- | ACE/ace/OS_NS_Thread.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/ACE/ace/OS_NS_Thread.h b/ACE/ace/OS_NS_Thread.h index 98a24079307..e01e8a2b4f7 100644 --- a/ACE/ace/OS_NS_Thread.h +++ b/ACE/ace/OS_NS_Thread.h @@ -701,7 +701,7 @@ public: ACE_hthread_t thr_handle); /// Initialize the object using calls to ACE_OS::thr_self(). - ACE_Thread_ID (void); + ACE_Thread_ID (); /// Copy constructor. ACE_Thread_ID (const ACE_Thread_ID &id); @@ -710,13 +710,13 @@ public: ACE_Thread_ID& operator= (const ACE_Thread_ID &id); /// Get the thread id. - ACE_thread_t id (void) const; + ACE_thread_t id () const; /// Set the thread id. void id (ACE_thread_t); /// Get the thread handle. - ACE_hthread_t handle (void) const; + ACE_hthread_t handle () const; /// Set the thread handle. void handle (ACE_hthread_t); @@ -1629,7 +1629,7 @@ namespace ACE_OS { void thr_exit (ACE_THR_FUNC_RETURN status = 0); ACE_NAMESPACE_INLINE_FUNCTION - int thr_getconcurrency (void); + int thr_getconcurrency (); ACE_NAMESPACE_INLINE_FUNCTION int thr_getprio (ACE_hthread_t id, @@ -1740,16 +1740,16 @@ namespace ACE_OS { int thr_kill (ACE_thread_t thr_id, int signum); ACE_NAMESPACE_INLINE_FUNCTION - size_t thr_min_stack (void); + size_t thr_min_stack (); ACE_NAMESPACE_INLINE_FUNCTION - ACE_thread_t thr_self (void); + ACE_thread_t thr_self (); ACE_NAMESPACE_INLINE_FUNCTION void thr_self (ACE_hthread_t &); ACE_NAMESPACE_INLINE_FUNCTION - const char* thr_name (void); + const char* thr_name (); /// Stores a string version of the current thread id into buffer and /// returns the size of this thread id in bytes. @@ -1809,10 +1809,10 @@ namespace ACE_OS { int thr_suspend (ACE_hthread_t target_thread); ACE_NAMESPACE_INLINE_FUNCTION - void thr_testcancel (void); + void thr_testcancel (); ACE_NAMESPACE_INLINE_FUNCTION - void thr_yield (void); + void thr_yield (); //@{ @name A set of wrappers for mutex locks that only work within a single process. @@ -1952,17 +1952,17 @@ class ACE_Export ACE_event_t public: /// Constructor initializing all pointer fields to null - ACE_event_t (void); + ACE_event_t (); private: /// Lock the internal mutex/semaphore - int lock (void); + int lock (); /// Unlock the internal mutex/semaphore - int unlock (void); + int unlock (); /// Use the internal semaphore or condition variable to unblock one thread - int wake_one (void); + int wake_one (); /// Event name if process shared. char *name_; @@ -2014,13 +2014,13 @@ public: ACE_OS_Thread_Mutex_Guard (ACE_thread_mutex_t &m); /// Implicitly release the lock. - ~ACE_OS_Thread_Mutex_Guard (void); + ~ACE_OS_Thread_Mutex_Guard (); /// Explicitly acquire the lock. - int acquire (void); + int acquire (); /// Explicitly release the lock. - int release (void); + int release (); protected: /// Reference to the mutex. @@ -2059,13 +2059,13 @@ public: ACE_OS_Recursive_Thread_Mutex_Guard (ACE_recursive_thread_mutex_t &m); /// Implicitly release the lock. - ~ACE_OS_Recursive_Thread_Mutex_Guard (void); + ~ACE_OS_Recursive_Thread_Mutex_Guard (); /// Explicitly acquire the lock. - int acquire (void); + int acquire (); /// Explicitly release the lock. - int release (void); + int release (); protected: /// Reference to the mutex. |