6 files changed, 10 insertions, 6 deletions
diff --git a/ACE/examples/APG/ThreadManagement/Async_Cancel.cpp b/ACE/examples/APG/ThreadManagement/Async_Cancel.cpp
index 842c7fa2bca..3aac199d793 100644
--- a/ACE/examples/APG/ThreadManagement/Async_Cancel.cpp
+++ b/ACE/examples/APG/ThreadManagement/Async_Cancel.cpp
@@ -23,6 +23,10 @@ public:
         // Put this thread in a compute loop.. no
         // cancellation points are available.
       }
+#if defined (__HP_aCC) 
+    // This is only to workaround a warning on HP-UX compiler.
+    return 0;
+#endif /* __HP_aCC */ 
   }
 
   int set_cancel_mode (void)
diff --git a/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp b/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp
index 4a7714cf14b..781f72e4d35 100644
--- a/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp
+++ b/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp
@@ -15,7 +15,7 @@ public:
 
   virtual int svc (void)
   {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up \n")));
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up\n")));
 
     // Cache our ACE_Thread_Manager pointer.
     ACE_Thread_Manager *mgr = this->thr_mgr ();
diff --git a/ACE/examples/APG/ThreadManagement/ExitHandler.cpp b/ACE/examples/APG/ThreadManagement/ExitHandler.cpp
index 85238eac052..0d47b430f51 100644
--- a/ACE/examples/APG/ThreadManagement/ExitHandler.cpp
+++ b/ACE/examples/APG/ThreadManagement/ExitHandler.cpp
@@ -9,7 +9,7 @@ class ExitHandler : public ACE_At_Thread_Exit
 public:
   virtual void apply (void)
   {
-    ACE_DEBUG ((LM_INFO, ACE_TEXT ("(%t) is exiting \n")));
+    ACE_DEBUG ((LM_INFO, ACE_TEXT ("(%t) is exiting\n")));
 
     // Shut down all devices.
   }
@@ -24,7 +24,7 @@ public:
 
   virtual int svc (void)
   {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up \n")));
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up\n")));
 
     this->thr_mgr ()->at_exit (eh_);
 
diff --git a/ACE/examples/APG/ThreadManagement/Pool.cpp b/ACE/examples/APG/ThreadManagement/Pool.cpp
index 30ae56801a5..bc3644480a6 100644
--- a/ACE/examples/APG/ThreadManagement/Pool.cpp
+++ b/ACE/examples/APG/ThreadManagement/Pool.cpp
@@ -12,7 +12,7 @@ class HA_CommandHandler : public ACE_Task<ACE_MT_SYNCH>
 public:
   virtual int svc (void)
   {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up \n")));
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up\n")));
     ACE_Message_Block *mb;
     if (this->getq (mb) == -1)
       return -1;
diff --git a/ACE/examples/APG/ThreadManagement/Signals2.cpp b/ACE/examples/APG/ThreadManagement/Signals2.cpp
index 0df855c45bb..bb9497cb6c6 100644
--- a/ACE/examples/APG/ThreadManagement/Signals2.cpp
+++ b/ACE/examples/APG/ThreadManagement/Signals2.cpp
@@ -68,7 +68,7 @@ SignalableTask::handle_alert (void)
 // Listing 1 code/ch13
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Main thread \n")));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Main thread\n")));
   SignalableTask handler;
   handler.activate (THR_NEW_LWP | THR_JOINABLE, 5);
 
diff --git a/ACE/examples/APG/ThreadManagement/Start_Hook.cpp b/ACE/examples/APG/ThreadManagement/Start_Hook.cpp
index 1c4ad0794b7..e48a29f6861 100644
--- a/ACE/examples/APG/ThreadManagement/Start_Hook.cpp
+++ b/ACE/examples/APG/ThreadManagement/Start_Hook.cpp
@@ -38,7 +38,7 @@ class HA_CommandHandler : public ACE_Task_Base
 public:
   virtual int svc (void)
   {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up \n")));
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up\n")));
 
     // Do something.