1 files changed, 10 insertions, 12 deletions

diff --git a/ACE/examples/APG/Active_Objects/AO.cpp b/ACE/examples/APG/Active_Objects/AO.cpp
index fbf9b22fc61..a8b1683fbb1 100644
--- a/ACE/examples/APG/Active_Objects/AO.cpp
+++ b/ACE/examples/APG/Active_Objects/AO.cpp
@@ -16,14 +16,13 @@ class HA_ControllerAgent
 public:
   HA_ControllerAgent ()
   {
-    ACE_TRACE
-      (ACE_TEXT ("HA_ControllerAgent::HA_ControllerAgent"));
+    ACE_TRACE("HA_ControllerAgent::HA_ControllerAgent");
     status_result_ = 1;
   }
 
   int status_update (void)
   {
-    ACE_TRACE (ACE_TEXT ("HA_ControllerAgent::status_update"));
+    ACE_TRACE ("HA_ControllerAgent::status_update");
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("Obtaining a status_update in %t ")
                 ACE_TEXT ("thread of control\n")));
@@ -35,7 +34,7 @@ public:
 private:
   int next_result_id (void)
   {
-    ACE_TRACE (ACE_TEXT ("HA_ControllerAgent::next_cmd_id"));
+    ACE_TRACE ("HA_ControllerAgent::next_cmd_id");
     return status_result_++;
   }
 
@@ -50,12 +49,12 @@ public:
                 ACE_Future<int>& returnVal)
     : controller_(controller), returnVal_(returnVal)
   {
-    ACE_TRACE (ACE_TEXT ("StatusUpdate::StatusUpdate"));
+    ACE_TRACE ("StatusUpdate::StatusUpdate");
   }
 
   virtual int call (void)
   {
-    ACE_TRACE (ACE_TEXT ("StatusUpdate::call"));
+    ACE_TRACE ("StatusUpdate::call");
 
     // status_update with the controller.
     this->returnVal_.set (this->controller_.status_update ());
@@ -84,13 +83,13 @@ class Scheduler : public ACE_Task_Base
 public:
   Scheduler ()
   {
-    ACE_TRACE (ACE_TEXT ("Scheduler::Scheduler"));
+    ACE_TRACE ("Scheduler::Scheduler");
     this->activate ();
   }
 
   virtual int svc (void)
   {
-    ACE_TRACE (ACE_TEXT ("Scheduler::svc"));
+    ACE_TRACE ("Scheduler::svc");
 
     while (1)
       {
@@ -108,7 +107,7 @@ public:
 
   int enqueue (ACE_Method_Request *request)
   {
-    ACE_TRACE (ACE_TEXT ("Scheduler::enqueue"));
+    ACE_TRACE ("Scheduler::enqueue");
     return this->activation_queue_.enqueue (request);
   }
 
@@ -123,8 +122,7 @@ class HA_ControllerAgentProxy
 public:
   ACE_Future<int> status_update (void)
   {
-    ACE_TRACE
-      (ACE_TEXT ("HA_ControllerAgentProxy::status_update"));
+    ACE_TRACE("HA_ControllerAgentProxy::status_update");
     ACE_Future<int> result;
 
     // Create and enqueue a method request on the scheduler.
@@ -139,7 +137,7 @@ public:
   void exit (void)
   {
   //FUZZ: enable check_for_lack_ACE_OS
-    ACE_TRACE (ACE_TEXT ("HA_ControllerAgentProxy::exit"));
+    ACE_TRACE ("HA_ControllerAgentProxy::exit");
     this->scheduler_.enqueue (new ExitMethod);
   }