summaryrefslogtreecommitdiff
path: root/ACE
diff options
context:
space:
mode:
Diffstat (limited to 'ACE')
-rw-r--r--ACE/ChangeLog7
-rw-r--r--ACE/examples/APG/Containers/Allocator.cpp2
-rw-r--r--ACE/examples/APG/Containers/Stacks.cpp2
-rw-r--r--ACE/examples/APG/ThreadPools/Futures.cpp6
-rw-r--r--ACE/examples/APG/Timers/PCB.cpp2
5 files changed, 13 insertions, 6 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 392458f1b82..d98be8fa69e 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jul 11 00:39:05 UTC 2011 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu>
+
+ * examples/APG/ThreadPools/Futures.cpp (class Manager):
+ * examples/APG/Containers/Stacks.cpp (StackExample::run):
+ * examples/APG/Containers/Allocator.cpp (StackExample::run):
+ * examples/APG/Timers/PCB.cpp (PCB::handleClose): Fixed a mismatch in ACE_TRACE.
+
Sat Jul 9 19:07:20 UTC 2011 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu>
* ace/RB_Tree.inl,
diff --git a/ACE/examples/APG/Containers/Allocator.cpp b/ACE/examples/APG/Containers/Allocator.cpp
index 38f25d7061d..8f934f5bd13 100644
--- a/ACE/examples/APG/Containers/Allocator.cpp
+++ b/ACE/examples/APG/Containers/Allocator.cpp
@@ -20,7 +20,7 @@ private:
// Listing 1 code/ch05
int StackExample::run (void)
{
- ACE_TRACE ("StackUser::run");
+ ACE_TRACE ("StackExample::run");
ACE_Allocator *allocator = 0;
size_t block_size = sizeof(ACE_Node<DataElement>);
diff --git a/ACE/examples/APG/Containers/Stacks.cpp b/ACE/examples/APG/Containers/Stacks.cpp
index 8d2e67c096d..9147d3239ae 100644
--- a/ACE/examples/APG/Containers/Stacks.cpp
+++ b/ACE/examples/APG/Containers/Stacks.cpp
@@ -30,7 +30,7 @@ private:
int StackExample::run (void)
{
- ACE_TRACE ("StackUser::run");
+ ACE_TRACE ("StackExample::run");
ACE_ASSERT(!this->runBoundedStack());
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n# of live objects %d\n"),
diff --git a/ACE/examples/APG/ThreadPools/Futures.cpp b/ACE/examples/APG/ThreadPools/Futures.cpp
index 104fafd4f30..9180418d817 100644
--- a/ACE/examples/APG/ThreadPools/Futures.cpp
+++ b/ACE/examples/APG/ThreadPools/Futures.cpp
@@ -145,18 +145,18 @@ public:
Manager ()
: shutdown_(0), workers_lock_(), workers_cond_(workers_lock_)
{
- ACE_TRACE ("Manager::TP");
+ ACE_TRACE ("Manager");
}
int perform (ACE_Method_Request *req)
{
- ACE_TRACE ("Manager::perform");
+ ACE_TRACE ("perform");
return this->queue_.enqueue (req);
}
int svc (void)
{
- ACE_TRACE ("Manager::svc");
+ ACE_TRACE ("svc");
ACE_DEBUG ((LM_INFO, ACE_TEXT ("(%t) Manager started\n")));
diff --git a/ACE/examples/APG/Timers/PCB.cpp b/ACE/examples/APG/Timers/PCB.cpp
index dbb39a62b72..0d4dcad3dff 100644
--- a/ACE/examples/APG/Timers/PCB.cpp
+++ b/ACE/examples/APG/Timers/PCB.cpp
@@ -67,7 +67,7 @@ PCB::getID (void) const
int
PCB::handleClose (void)
{
- ACE_TRACE ("PCB::handle_close");
+ ACE_TRACE ("PCB::handleClose");
return 0;
}