summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2006-04-14 17:23:39 +0000
committerSteve Huston <shuston@riverace.com>2006-04-14 17:23:39 +0000
commitba70ee3b947d5e5112fcef9cd454f668c9fe8f21 (patch)
tree1968eaef08badffda1bbe54a4315c17ee40a47be /examples
parente77ba2fd2bb572a6c13284d790d368636ad7b919 (diff)
downloadATCD-ba70ee3b947d5e5112fcef9cd454f668c9fe8f21.tar.gz
ChangeLogTag:Fri Apr 14 15:53:21 UTC 2006 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/Threads/task_three.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/Threads/task_three.cpp b/examples/Threads/task_three.cpp
index c1e796736ad..03f6e816572 100644
--- a/examples/Threads/task_three.cpp
+++ b/examples/Threads/task_three.cpp
@@ -53,11 +53,11 @@ public:
size_t Test_Task::current_count_ = 0;
size_t Test_Task::done_cnt_ = 0;
-static ACE_Thread_Mutex lock_;
+static ACE_Thread_Mutex Lock;
Test_Task::Test_Task (void)
{
- ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
+ ACE_GUARD (ACE_Thread_Mutex, ace_mon, Lock);
this->handled_ = 0;
Test_Task::current_count_++;
@@ -68,7 +68,7 @@ Test_Task::Test_Task (void)
Test_Task::~Test_Task (void)
{
- ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
+ ACE_GUARD (ACE_Thread_Mutex, ace_mon, Lock);
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("Test_Task destroyed, current_count_ = %d\n"),
@@ -85,7 +85,7 @@ Test_Task::open (void *args)
int
Test_Task::close (u_long)
{
- ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock_, -1);
+ ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Lock, -1);
Test_Task::current_count_--;
ACE_DEBUG ((LM_DEBUG,
@@ -110,7 +110,7 @@ Test_Task::svc (void)
if (r_->notify (this, ACE_Event_Handler::READ_MASK) == -1)
{
- ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock_, -1);
+ ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Lock, -1);
ACE_ERROR_RETURN ((LM_ERROR,
ACE_TEXT ("Test_Task: error %p!\n"),
@@ -130,7 +130,7 @@ Test_Task::handle_input (ACE_HANDLE)
if (this->handled_ == NUM_INVOCATIONS)
{
- ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock_, -1);
+ ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Lock, -1);
Test_Task::done_cnt_++;
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT (" (%t) Test_Task: handle_input done_cnt_ = %d.\n"),