1 files changed, 9 insertions, 8 deletions

diff --git a/ACE/examples/APG/ThreadPools/Futures.cpp b/ACE/examples/APG/ThreadPools/Futures.cpp
index 361a8bb43a2..9180418d817 100644
--- a/ACE/examples/APG/ThreadPools/Futures.cpp
+++ b/ACE/examples/APG/ThreadPools/Futures.cpp
@@ -12,6 +12,7 @@
 #include "ace/Method_Request.h"
 #include "ace/Future.h"
 #include "ace/Activation_Queue.h"
+#include "ace/Condition_T.h"
 
 #define OUTSTANDING_REQUESTS 20
 
@@ -36,7 +37,7 @@ class LongWork : public ACE_Method_Request
 public:
   virtual int call (void)
   {
-    ACE_TRACE (ACE_TEXT ("LongWork::call"));
+    ACE_TRACE ("LongWork::call");
     ACE_DEBUG
       ((LM_INFO, ACE_TEXT ("(%t) Attempting long work task\n")));
     ACE_OS::sleep (1);
@@ -52,7 +53,7 @@ public:
 
   ACE_Future<ACE_CString*> &future (void)
   {
-    ACE_TRACE (ACE_TEXT ("LongWork::future"));
+    ACE_TRACE ("LongWork::future");
     return result_;
   }
 
@@ -71,7 +72,7 @@ class Exit : public ACE_Method_Request
 public:
   virtual int call (void)
   {
-    ACE_TRACE (ACE_TEXT ("Exit::call"));
+    ACE_TRACE ("Exit::call");
     return -1;
   }
 };
@@ -96,7 +97,7 @@ public:
 
   int perform (ACE_Method_Request *req)
   {
-    ACE_TRACE (ACE_TEXT ("Worker::perform"));
+    ACE_TRACE ("Worker::perform");
     return this->queue_.enqueue (req);
   }
 
@@ -144,18 +145,18 @@ public:
   Manager ()
     : shutdown_(0), workers_lock_(), workers_cond_(workers_lock_)
   {
-    ACE_TRACE (ACE_TEXT ("Manager::TP"));
+    ACE_TRACE ("Manager");
   }
 
   int perform (ACE_Method_Request *req)
   {
-    ACE_TRACE (ACE_TEXT ("Manager::perform"));
+    ACE_TRACE ("perform");
     return this->queue_.enqueue (req);
   }
 
   int svc (void)
   {
-    ACE_TRACE (ACE_TEXT ("Manager::svc"));
+    ACE_TRACE ("svc");
 
     ACE_DEBUG ((LM_INFO, ACE_TEXT ("(%t) Manager started\n")));
 
@@ -250,7 +251,7 @@ private:
 int
 Manager::shut_down (void)
 {
-  ACE_TRACE (ACE_TEXT ("Manager::shut_down"));
+  ACE_TRACE ("Manager::shut_down");
   ACE_Unbounded_Queue<Worker* >::ITERATOR iter = this->workers_.begin ();
   Worker **worker_ptr = 0;
   do