summaryrefslogtreecommitdiff
path: root/ACE/ace/Condition_T.h
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/ace/Condition_T.h')
-rw-r--r--ACE/ace/Condition_T.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/ACE/ace/Condition_T.h b/ACE/ace/Condition_T.h
index edcf72c4931..44a1f55fb91 100644
--- a/ACE/ace/Condition_T.h
+++ b/ACE/ace/Condition_T.h
@@ -37,8 +37,8 @@ class ACE_Time_Value;
* until shared data changes state.
*
* A condition variable enables threads to atomically block and
- * test the condition under the protection of a mutual exclu-
- * sion lock (mutex) until the condition is satisfied. That is,
+ * test the condition under the protection of a mutual exclusion
+ * lock (mutex) until the condition is satisfied. That is,
* the mutex must have been held by the thread before calling
* wait or signal on the condition. If the condition is false,
* a thread blocks on a condition variable and atomically
@@ -54,7 +54,6 @@ template <class MUTEX>
class ACE_Condition
{
public:
- // = Initialiation and termination methods.
/// Initialize the condition variable.
ACE_Condition (MUTEX &m, int type = USYNC_THREAD,
const ACE_TCHAR *name = 0, void *arg = 0);
@@ -67,7 +66,7 @@ public:
* Block on condition, or until absolute time-of-day has passed. If
* @a abstime == 0 use "blocking" <wait> semantics. Else, if @a abstime
* != 0 and the call times out before the condition is signaled
- * <wait> returns -1 and sets errno to ETIME.
+ * wait() returns -1 and sets errno to ETIME.
*/
int wait (const ACE_Time_Value *abstime);
@@ -76,10 +75,10 @@ public:
/**
* Block on condition or until absolute time-of-day has passed. If
- * abstime == 0 use "blocking" wait() semantics on the <mutex>
+ * @a abstime == 0 use "blocking" wait() semantics on the @a mutex
* passed as a parameter (this is useful if you need to store the
- * <Condition> in shared memory). Else, if <abstime> != 0 and the
- * call times out before the condition is signaled <wait> returns -1
+ * <Condition> in shared memory). Else, if @a abstime != 0 and the
+ * call times out before the condition is signaled wait() returns -1
* and sets errno to ETIME.
*/
int wait (MUTEX &mutex, const ACE_Time_Value *abstime = 0);