summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2013-05-09 14:06:42 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2013-05-09 14:06:42 +0000
commit6e90b5522b5ee97e6d103b57b6084fc164a05ab0 (patch)
tree4a3a52ebce3197dd5fb5d7c474a0a5907f19244d
parentd31ef53df49cc29dacd590000dba729e8b6724a5 (diff)
downloadATCD-6e90b5522b5ee97e6d103b57b6084fc164a05ab0.tar.gz
ChangeLogTag:Thu
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/tests/Thread_Manager_Test.cpp8
2 files changed, 11 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index e59853a93da..3e3d8447ce3 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 9 14:05:28 UTC 2013 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu>
+
+ * tests/Thread_Manager_Test.cpp (worker): Removed unused "len"
+ variable to fix a warning. Thanks to Johnny for reporting this.
+
Wed May 8 19:04:22 UTC 2013 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu>
* ace/OS_NS_Thread.inl (ACE_OS::thr_id): Fixed a warning on
diff --git a/ACE/tests/Thread_Manager_Test.cpp b/ACE/tests/Thread_Manager_Test.cpp
index 68adabbc3d8..c1cf843d4e7 100644
--- a/ACE/tests/Thread_Manager_Test.cpp
+++ b/ACE/tests/Thread_Manager_Test.cpp
@@ -118,9 +118,13 @@ worker (int iterations)
// to avoid race conditions for suspend() and resume().
if (thr_mgr->testcancel (ACE_Thread::self ()) != 0)
{
+ char thr_id[BUFSIZ];
+ // Test out the ACE_OS::thr_id() method.
+ ACE_OS::thr_id (thr_id, sizeof thr_id);
ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT ("(%t) has been cancelled ")
+ ACE_TEXT ("(%s) has been cancelled ")
ACE_TEXT ("before iteration %d!\n"),
+ thr_id,
i));
break;
}
@@ -130,7 +134,7 @@ worker (int iterations)
{
char thr_id[BUFSIZ];
// Test out the ACE_OS::thr_id() method.
- ssize_t len = ACE_OS::thr_id (thr_id, sizeof thr_id);
+ ACE_OS::thr_id (thr_id, sizeof thr_id);
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%s) has been cancelled ")
ACE_TEXT ("before iteration %d!\n"),