Tue Dec 15 14:58:21 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h:
        * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp:
        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h:
        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp:
        * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h:
        * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp:
        * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h:
        * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h:
        * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp:
        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h:
        * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp:
        * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp:
          Optimized code. Removed unused header files, indentation, removed empty lines.

26 files changed, 107 insertions, 141 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 567d2e51e7e..37726724b27 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,32 @@
+Tue Dec 15 14:58:21 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h:
+        * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h:
+        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h:
+        * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h:
+        * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h:
+        * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h:
+        * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp:
+          Optimized code. Removed unused header files, indentation, removed empty lines.
+
 Tue Dec 15 14:32:46 UTC 2009  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
 
         * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.cpp:
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp
index 20e1327567d..7c7ebbd7c28 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp
@@ -4,14 +4,12 @@
 
 #include "Event_Connection_Test_Receiver_exec.h"
 #include "ciao/Logger/Log_Macros.h"
-#include "tao/ORB_Core.h"
 
 namespace CIAO_Event_Connection_Test_Receiver_Impl
 {
   //============================================================
-  // Component Executor Implementation Class: Receiver_exec_i
+  // Receiver_exec_i
   //============================================================
-
   Receiver_exec_i::Receiver_exec_i (void)
     : //DDS_Get
       getter_ok_ (false),
@@ -64,7 +62,6 @@ namespace CIAO_Event_Connection_Test_Receiver_Impl
     return ::CCM_DDS::CCM_ConnectorStatusListener::_nil ();
   }
 
-
   // Operations from Components::SessionComponent.
   void
   Receiver_exec_i::set_session_context (
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h
index f0aec0318cb..7536df834d0 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h
@@ -13,11 +13,12 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/LocalObject.h"
-#include "ace/Task.h"
-#include "ace/Reactor.h"
 
 namespace CIAO_Event_Connection_Test_Receiver_Impl
 {
+  //============================================================
+  // Receiver_exec_i
+  //============================================================
   class RECEIVER_EXEC_Export Receiver_exec_i
     : public virtual Receiver_Exec,
       public virtual ::CORBA::LocalObject
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp
index 48ae48ae774..5968e35e8b1 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp
@@ -2,17 +2,13 @@
 // $Id$
 
 #include "Event_Connection_Test_Sender_exec.h"
-#include "ace/Guard_T.h"
 #include "ciao/Logger/Log_Macros.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
 
 namespace CIAO_Event_Connection_Test_Sender_Impl
 {
   //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
+  // Sender_exec_i
   //============================================================
-
   Sender_exec_i::Sender_exec_i (void)
     : writer_ok_ (false),
       writer_dds_datawriter_ok_ (false)
@@ -23,8 +19,6 @@ namespace CIAO_Event_Connection_Test_Sender_Impl
   {
   }
 
-  // Supported operations and attributes.
-
   void
   Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
   {
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h
index 079fa5969ca..6a6e8f31f46 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h
@@ -15,10 +15,11 @@
 
 #include "tao/LocalObject.h"
 
-#include <map>
-
 namespace CIAO_Event_Connection_Test_Sender_Impl
 {
+  //============================================================
+  // Sender_exec_i
+  //============================================================
   class Sender_exec_i
     : public virtual Sender_Exec,
       public virtual ::CORBA::LocalObject
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
index da320a32c9a..c94618183f9 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
@@ -328,7 +328,6 @@ namespace CIAO_Getter_Test_Receiver_Impl
       }
   }
 
-  // Port operations.
   ::CCM_DDS::GetterTest::CCM_Listener_ptr
   Receiver_exec_i::get_info_out_data_listener (void)
   {
@@ -347,7 +346,6 @@ namespace CIAO_Getter_Test_Receiver_Impl
     return new Invoker_exec_i (*this);
   }
 
-  // Operations from Components::SessionComponent.
   void
   Receiver_exec_i::set_session_context (
     ::Components::SessionContext_ptr ctx)
@@ -394,4 +392,3 @@ namespace CIAO_Getter_Test_Receiver_Impl
     return retval;
   }
 }
-
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h
index fb715a9af76..abb08d9db15 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h
@@ -14,8 +14,6 @@
 
 #include "tao/LocalObject.h"
 
-#include <map>
-
 namespace CIAO_Getter_Test_Receiver_Impl
 {
   class Receiver_exec_i;
@@ -93,10 +91,6 @@ namespace CIAO_Getter_Test_Receiver_Impl
     Receiver_exec_i (void);
     virtual ~Receiver_exec_i (void);
 
-    // Supported operations and attributes.
-    // Component attributes.
-
-    // Port operations.
     virtual ::CCM_DDS::GetterTest::CCM_Listener_ptr
     get_info_out_data_listener (void);
 
@@ -119,7 +113,6 @@ namespace CIAO_Getter_Test_Receiver_Impl
     void get_many (CORBA::Short keys,
                          CORBA::Long iterations);
 
-    // Operations from Components::SessionComponent.
     virtual void
     set_session_context (
       ::Components::SessionContext_ptr ctx);
@@ -140,4 +133,3 @@ namespace CIAO_Getter_Test_Receiver_Impl
 }
 
 #endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
index 21fc068153c..d48b80fa2d0 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
@@ -67,7 +67,7 @@ namespace CIAO_Getter_Test_Sender_Impl
   }
 
   void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
+    ::DDS::Entity_ptr ,
     ::DDS::StatusKind  status_kind)
   {
     if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h
index 6e82f638862..834f61bd720 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h
@@ -19,19 +19,24 @@ namespace CIAO_Getter_Test_Sender_Impl
 {
   class Sender_exec_i;
 
+  //============================================================
+  // pulse_Generator
+  //============================================================
   class pulse_Generator :
     public ACE_Event_Handler
   {
   public:
     pulse_Generator (Sender_exec_i &callback);
-    /// Handle the timeout.
+
     virtual int handle_timeout (const ACE_Time_Value &tv,
                                 const void *arg);
   private:
-    /// Maintains a handle that actually process the event
     Sender_exec_i &pulse_callback_;
   };
 
+  //============================================================
+  // ConnectorStatusListener_exec_i
+  //============================================================
   class SENDER_EXEC_Export ConnectorStatusListener_exec_i
     : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
       public virtual ::CORBA::LocalObject
@@ -59,10 +64,12 @@ namespace CIAO_Getter_Test_Sender_Impl
     void on_unexpected_status( ::DDS::Entity_ptr ,
                               ::DDS::StatusKind );
   private:
-    /// Maintains a handle that actually process the event
     Sender_exec_i &callback_;
   };
 
+  //============================================================
+  // Sender_exec_i
+  //============================================================
   class Sender_exec_i
     : public virtual Sender_Exec,
       public virtual ::CORBA::LocalObject
@@ -115,4 +122,3 @@ namespace CIAO_Getter_Test_Sender_Impl
 }
 
 #endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
index 962f835ee01..70b6b964497 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
@@ -9,6 +9,9 @@
 
 namespace CIAO_Keyed_Test_Receiver_Impl
 {
+  //============================================================
+  // read_action_Generator
+  //============================================================
   read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
     : pulse_callback_ (callback)
   {
@@ -26,9 +29,8 @@ namespace CIAO_Keyed_Test_Receiver_Impl
   }
 
   //============================================================
-  // Component Executor Implementation Class: Receiver_exec_iKeyedTest_Listener_exec_i ();
+  // Receiver_exec_i
   //============================================================
-
   Receiver_exec_i::Receiver_exec_i (void)
     : rate_ (1),
       iterations_ (10),
@@ -58,7 +60,7 @@ namespace CIAO_Keyed_Test_Receiver_Impl
         this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
       }
   }
-  // Supported operations and attributes.
+
   void
   Receiver_exec_i::read (void)
   {
@@ -99,13 +101,11 @@ namespace CIAO_Keyed_Test_Receiver_Impl
       }
     catch(const CCM_DDS::NonExistent& )
       {
-        //due to timing issues, this exception may occur
         CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("KeyedTest_Read: ")
                   ACE_TEXT ("Expected NonExistent received\n")));
       }
   }
 
-  // Component attributes.
   ::CORBA::ULong
   Receiver_exec_i::rate (void)
   {
@@ -145,7 +145,6 @@ namespace CIAO_Keyed_Test_Receiver_Impl
     this->expected_ = this->iterations_ * this->keys_;
   }
 
-  // Port operations.
   ::CCM_DDS::KeyedTest::CCM_Listener_ptr
   Receiver_exec_i::get_info_out_data_listener (void)
   {
@@ -158,7 +157,6 @@ namespace CIAO_Keyed_Test_Receiver_Impl
     return 0;
   }
 
-  // Operations from Components::SessionComponent.
   void
   Receiver_exec_i::set_session_context (
     ::Components::SessionContext_ptr ctx)
@@ -180,7 +178,6 @@ namespace CIAO_Keyed_Test_Receiver_Impl
   void
   Receiver_exec_i::ccm_activate (void)
   {
-    // calculate the interval time
     long usec = 1000000 / this->rate_;
     if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer (
                                           this->ticker_,
@@ -234,4 +231,3 @@ namespace CIAO_Keyed_Test_Receiver_Impl
     return retval;
   }
 }
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h
index 4b7ac1cc771..250f25cc256 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h
@@ -20,12 +20,10 @@
 namespace CIAO_Keyed_Test_Receiver_Impl
 {
   class Receiver_exec_i;
-  /**
-  * @class reader activity generator
-  *
-  * @brief an active object used by Receiver to perform a periodical read action
-  *
-  */
+
+  //============================================================
+  // read_action_Generator
+  //============================================================
   class read_action_Generator
     : public ACE_Event_Handler
   {
@@ -34,16 +32,16 @@ namespace CIAO_Keyed_Test_Receiver_Impl
 
     ~read_action_Generator ();
 
-    /// Handle the timeout.
     virtual int handle_timeout (const ACE_Time_Value &tv,
                                 const void *arg);
-
   private:
-    /// Maintains a handle that actually process the event
     Receiver_exec_i &pulse_callback_;
 
   };
 
+  //============================================================
+  // Receiver_exec_i
+  //============================================================
   class RECEIVER_EXEC_Export Receiver_exec_i
     : public virtual Receiver_Exec,
       public virtual ::CORBA::LocalObject
@@ -52,10 +50,8 @@ namespace CIAO_Keyed_Test_Receiver_Impl
     Receiver_exec_i (void);
     virtual ~Receiver_exec_i (void);
 
-    // Supported operations and attributes.
     void read (void);
 
-    // Component attributes.
     virtual ::CORBA::ULong rate (void);
 
     virtual void rate (::CORBA::ULong rate);
@@ -68,14 +64,12 @@ namespace CIAO_Keyed_Test_Receiver_Impl
 
     virtual void keys (::CORBA::UShort keys);
 
-    // Port operations.
     virtual ::CCM_DDS::KeyedTest::CCM_Listener_ptr
     get_info_out_data_listener (void);
 
     virtual ::CCM_DDS::CCM_PortStatusListener_ptr
     get_info_out_status (void);
 
-    // Operations from Components::SessionComponent.
     virtual void
     set_session_context (
       ::Components::SessionContext_ptr ctx);
@@ -108,4 +102,3 @@ namespace CIAO_Keyed_Test_Receiver_Impl
 }
 
 #endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp
index a651ba45820..eb2e6667059 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp
@@ -12,7 +12,6 @@ namespace CIAO_Keyed_Test_Sender_Impl
   //============================================================
   // Pulse generator
   //============================================================
-
   pulse_Generator::pulse_Generator (Sender_exec_i &callback)
     : pulse_callback_ (callback)
   {
@@ -27,9 +26,8 @@ namespace CIAO_Keyed_Test_Sender_Impl
   }
 
   //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
+  // Sender_exec_i
   //============================================================
-
   Sender_exec_i::Sender_exec_i (void)
     : rate_ (1),
       iterations_ (10),
@@ -42,8 +40,6 @@ namespace CIAO_Keyed_Test_Sender_Impl
   {
   }
 
-  // Supported operations and attributes.
-
   void
   Sender_exec_i::tick ()
   {
@@ -85,17 +81,16 @@ namespace CIAO_Keyed_Test_Sender_Impl
   void
   Sender_exec_i::start (void)
   {
-    // calculate the interval time
     long usec = 1000000 / this->rate_;
     if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer (
                 this->ticker_,
                 0,
                 ACE_Time_Value (0, usec),
                 ACE_Time_Value (0, usec)) == -1)
-    {
-      CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                             ACE_TEXT ("Error scheduling timer")));
-    }
+      {
+        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
+                              ACE_TEXT ("Error scheduling timer")));
+      }
   }
 
   void
@@ -164,7 +159,7 @@ namespace CIAO_Keyed_Test_Sender_Impl
   Sender_exec_i::ccm_activate (void)
   {
     this->start ();
-    
+
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
                         this->mutex_, CORBA::INTERNAL ());
 
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h
index 9a05e0d0c01..4c519576bd7 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h
@@ -21,19 +21,23 @@ namespace CIAO_Keyed_Test_Sender_Impl
 {
   class Sender_exec_i;
 
+  //============================================================
+  // pulse_Generator
+  //============================================================
   class pulse_Generator :
     public ACE_Event_Handler
   {
   public:
     pulse_Generator (Sender_exec_i &callback);
-    /// Handle the timeout.
     virtual int handle_timeout (const ACE_Time_Value &tv,
                                 const void *arg);
   private:
-    /// Maintains a handle that actually process the event
     Sender_exec_i &pulse_callback_;
   };
 
+  //============================================================
+  // Sender_exec_i
+  //============================================================
   class Sender_exec_i
     : public virtual Sender_Exec,
       public virtual ::CORBA::LocalObject
@@ -87,4 +91,3 @@ namespace CIAO_Keyed_Test_Sender_Impl
 }
 
 #endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp
index ebdaf19c3ec..0f74a0b40d0 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp
@@ -10,9 +10,8 @@
 namespace CIAO_Writer_Receiver_Impl
 {
   //============================================================
-  // Facet Executor Implementation Class: WriterTest_Listener_exec_i
+  // WriterTest_Listener_exec_i
   //============================================================
-
   WriterTest_Listener_exec_i::WriterTest_Listener_exec_i ()
   {
   }
@@ -21,8 +20,6 @@ namespace CIAO_Writer_Receiver_Impl
   {
   }
 
-  // Operations from ::CCM_DDS::WriterTest_Listener
-
   void
   WriterTest_Listener_exec_i::on_one_data (
     const WriterTest & an_instance ,
@@ -47,9 +44,9 @@ namespace CIAO_Writer_Receiver_Impl
                 an_instance[i].iteration));
       }
   }
-  
+
   //============================================================
-  // Component Executor Implementation Class: Receiver_exec_iKeyedTest_Listener_exec_i ();
+  // Receiver_exec_i
   //============================================================
   Receiver_exec_i::Receiver_exec_i (void)
   {
@@ -59,7 +56,6 @@ namespace CIAO_Writer_Receiver_Impl
   {
   }
 
-  // Port operations.
   ::CCM_DDS::WriterTest::CCM_Listener_ptr
   Receiver_exec_i::get_info_out_data_listener (void)
   {
@@ -72,8 +68,7 @@ namespace CIAO_Writer_Receiver_Impl
   {
     return 0;
   }
-  
-  // Operations from Components::SessionComponent.
+
   void
   Receiver_exec_i::set_session_context (
     ::Components::SessionContext_ptr ctx)
@@ -128,4 +123,3 @@ namespace CIAO_Writer_Receiver_Impl
     return retval;
   }
 }
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h
index 4ea16a99b9d..5860ebe5742 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h
@@ -13,11 +13,12 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/LocalObject.h"
-#include "ace/Task.h"
-#include "ace/Reactor.h"
 
 namespace CIAO_Writer_Receiver_Impl
 {
+  //============================================================
+  // WriterTest_Listener_exec_i
+  //============================================================
   class RECEIVER_EXEC_Export WriterTest_Listener_exec_i
     : public virtual ::CCM_DDS::WriterTest::CCM_Listener,
       public virtual ::CORBA::LocalObject
@@ -36,6 +37,9 @@ namespace CIAO_Writer_Receiver_Impl
       const ::CCM_DDS::ReadInfoSeq & info);
   };
 
+  //============================================================
+  // Receiver_exec_i
+  //============================================================
   class RECEIVER_EXEC_Export Receiver_exec_i
     : public virtual Receiver_Exec,
       public virtual ::CORBA::LocalObject
@@ -44,16 +48,12 @@ namespace CIAO_Writer_Receiver_Impl
     Receiver_exec_i (void);
     virtual ~Receiver_exec_i (void);
 
-    // Component attributes.
-
-    // Port operations.
     virtual ::CCM_DDS::WriterTest::CCM_Listener_ptr
     get_info_out_data_listener (void);
 
     virtual ::CCM_DDS::CCM_PortStatusListener_ptr
     get_info_out_status (void);
 
-    // Operations from Components::SessionComponent.
     virtual void
     set_session_context (
       ::Components::SessionContext_ptr ctx);
@@ -73,4 +73,3 @@ namespace CIAO_Writer_Receiver_Impl
 }
 
 #endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp
index 25832a37e91..808e6b204a9 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp
@@ -10,9 +10,8 @@
 namespace CIAO_Writer_Sender_Impl
 {
   //============================================================
-  // Pulse generator
+  // pulse_Generator
   //============================================================
-
   pulse_Generator::pulse_Generator (Sender_exec_i &callback)
     : pulse_callback_ (callback)
   {
@@ -27,9 +26,8 @@ namespace CIAO_Writer_Sender_Impl
   }
 
   //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
+  // Sender_exec_i
   //============================================================
-
   Sender_exec_i::Sender_exec_i (void)
     : rate_ (1),
       iterations_ (10),
@@ -44,7 +42,6 @@ namespace CIAO_Writer_Sender_Impl
   {
   }
 
-  // Supported operations and attributes.
   void
   Sender_exec_i::reset_iterations ()
   {
@@ -56,7 +53,6 @@ namespace CIAO_Writer_Sender_Impl
       }
   }
 
-  
   void
   Sender_exec_i::unregister_handles ()
   {
@@ -178,12 +174,12 @@ namespace CIAO_Writer_Sender_Impl
           }
       }
   }
-  
+
   void
   Sender_exec_i::write_many ()
   {
     bool expected_exception_thrown = false;
-    
+
     WriterTest_Seq write_many_seq;
     write_many_seq.length (this->keys_ * this->iterations_);
     int iter_key = 0;
@@ -249,17 +245,16 @@ namespace CIAO_Writer_Sender_Impl
   void
   Sender_exec_i::start (void)
   {
-    // calculate the interval time
     long usec = 1000000 / this->rate_;
     if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer (
                 this->ticker_,
                 0,
                 ACE_Time_Value (0, usec),
                 ACE_Time_Value (0, usec)) == -1)
-    {
-      CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                             ACE_TEXT ("Error scheduling timer")));
-    }
+      {
+        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
+                              ACE_TEXT ("Error scheduling timer")));
+      }
   }
 
   void
@@ -371,4 +366,3 @@ namespace CIAO_Writer_Sender_Impl
     return retval;
   }
 }
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h
index 36c3cc4eb5f..274ee32ee32 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h
@@ -20,13 +20,16 @@
 namespace CIAO_Writer_Sender_Impl
 {
   class Sender_exec_i;
-  
+
   enum WRITER_ASSIGNMENT {
     WRITE_NONE,
     WRITE_KEYED,
     WRITE_MULTI
   };
 
+  //============================================================
+  // pulse_Generator
+  //============================================================
   class pulse_Generator :
     public ACE_Event_Handler
   {
@@ -40,6 +43,9 @@ namespace CIAO_Writer_Sender_Impl
     Sender_exec_i &pulse_callback_;
   };
 
+  //============================================================
+  // Sender_exec_i
+  //============================================================
   class Sender_exec_i
     : public virtual Sender_Exec,
       public virtual ::CORBA::LocalObject
@@ -95,7 +101,7 @@ namespace CIAO_Writer_Sender_Impl
     TAO_SYNCH_MUTEX mutex_;
     typedef std::map<ACE_CString, WriterTest_var> Writer_Table;
     Writer_Table ktests_;
-    
+
     typedef std::map<ACE_CString, ::DDS::InstanceHandle_t> Writer_Table_Handles;
     Writer_Table_Handles handles_;
 
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
index 59142aad867..7f9ea2d613c 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
@@ -93,7 +93,6 @@ namespace CIAO_LMBM_Test_Receiver_Impl
   {
   }
 
-  // Operations from ::CCM_DDS::ConnectorStatusListener
   void ConnectorStatusListener_exec_i::on_inconsistent_topic(
      ::DDS::Topic_ptr ,
      const DDS::InconsistentTopicStatus & )
@@ -125,7 +124,7 @@ namespace CIAO_LMBM_Test_Receiver_Impl
   }
 
   void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
+    ::DDS::Entity_ptr ,
     ::DDS::StatusKind  status_kind)
   {
     if (status_kind == ::DDS::DATA_ON_READERS_STATUS)
@@ -166,7 +165,6 @@ namespace CIAO_LMBM_Test_Receiver_Impl
       }
   }
 
-  // Port operations.
   ::CCM_DDS::ListenManyByManyTest::CCM_Listener_ptr
   Receiver_exec_i::get_info_listen_data_listener (void)
   {
@@ -215,7 +213,7 @@ namespace CIAO_LMBM_Test_Receiver_Impl
     this->keys_ = keys;
     this->expected_ = this->keys_ * this->iterations_;
   }
-  // Operations from Components::SessionComponent.
+
   void
   Receiver_exec_i::set_session_context (
     ::Components::SessionContext_ptr ctx)
@@ -315,4 +313,3 @@ namespace CIAO_LMBM_Test_Receiver_Impl
     return retval;
   }
 }
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h
index df3081950a0..d61d5c5823a 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h
@@ -13,10 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/LocalObject.h"
-#include "ace/Reactor.h"
-#include "ace/Task.h"
-
-#include <map>
 
 namespace CIAO_LMBM_Test_Receiver_Impl
 {
@@ -101,9 +97,8 @@ namespace CIAO_LMBM_Test_Receiver_Impl
     Receiver_exec_i (void);
     virtual ~Receiver_exec_i (void);
 
-    // Supported operations and attributes.
     void start ();
-    // Component attributes.
+
     virtual ::CORBA::UShort iterations (void);
 
     virtual void iterations (::CORBA::UShort iterations);
@@ -112,7 +107,6 @@ namespace CIAO_LMBM_Test_Receiver_Impl
 
     virtual void keys (::CORBA::UShort keys);
 
-    // Port operations.
     virtual ::CCM_DDS::ListenManyByManyTest::CCM_Listener_ptr
     get_info_listen_data_listener (void);
 
@@ -122,7 +116,6 @@ namespace CIAO_LMBM_Test_Receiver_Impl
     virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
     get_info_listen_connector_status (void);
 
-    // Operations from Components::SessionComponent.
     virtual void
     set_session_context (
       ::Components::SessionContext_ptr ctx);
@@ -151,4 +144,3 @@ namespace CIAO_LMBM_Test_Receiver_Impl
 }
 
 #endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp
index 00b6d1b24f3..472b2a85791 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp
@@ -43,7 +43,7 @@ namespace CIAO_LMBM_Test_Sender_Impl
 
 
   //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
+  // Sender_exec_i
   //============================================================
   Sender_exec_i::Sender_exec_i (void)
     : iterations_ (10),
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h
index 00900201305..849b46310a8 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h
@@ -31,7 +31,6 @@ namespace CIAO_LMBM_Test_Sender_Impl
     WriteTicker (Sender_exec_i &callback);
     int handle_timeout (const ACE_Time_Value &, const void *);
   private:
-    /// Maintains a handle that actually process the event
     Sender_exec_i &callback_;
   };
 
@@ -45,7 +44,6 @@ namespace CIAO_LMBM_Test_Sender_Impl
     WriteManyHandler (Sender_exec_i &callback);
     virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
   private:
-    /// Maintains a handle that actually process the event
     Sender_exec_i &callback_;
   };
 
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp
index 4a89be04066..2f132ea2fa6 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp
@@ -84,7 +84,7 @@ namespace CIAO_LNE_Test_Receiver_Impl
   }
 
   void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
+    ::DDS::Entity_ptr ,
     ::DDS::StatusKind  status_kind)
   {
     if (status_kind == ::DDS::DATA_ON_READERS_STATUS)
@@ -107,7 +107,6 @@ namespace CIAO_LNE_Test_Receiver_Impl
   {
   }
 
-  // Port operations.
   ::CCM_DDS::ListenNotEnabledTest::CCM_Listener_ptr
   Receiver_exec_i::get_info_listen_data_listener (void)
   {
@@ -206,4 +205,3 @@ namespace CIAO_LNE_Test_Receiver_Impl
     return retval;
   }
 }
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h
index 96fda1e4a00..e932dcb9955 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h
@@ -14,8 +14,6 @@
 
 #include "tao/LocalObject.h"
 
-#include <map>
-
 namespace CIAO_LNE_Test_Receiver_Impl
 {
   class Receiver_exec_i;
@@ -93,10 +91,6 @@ namespace CIAO_LNE_Test_Receiver_Impl
     Receiver_exec_i (void);
     virtual ~Receiver_exec_i (void);
 
-    // Supported operations and attributes.
-    // Component attributes.
-
-    // Port operations.
     virtual ::CCM_DDS::ListenNotEnabledTest::CCM_Listener_ptr
     get_info_listen_data_listener (void);
 
@@ -106,7 +100,6 @@ namespace CIAO_LNE_Test_Receiver_Impl
     virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
     get_info_listen_connector_status (void);
 
-    // Operations from Components::SessionComponent.
     virtual void
     set_session_context (
       ::Components::SessionContext_ptr ctx);
@@ -130,4 +123,3 @@ namespace CIAO_LNE_Test_Receiver_Impl
 }
 
 #endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
index b84144e3bb0..d5c6f564ba6 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
@@ -73,7 +73,6 @@ namespace CIAO_LOBO_Test_Receiver_Impl
   {
   }
 
-  // Operations from ::CCM_DDS::ConnectorStatusListener
   void ConnectorStatusListener_exec_i::on_inconsistent_topic(
      ::DDS::Topic_ptr ,
      const DDS::InconsistentTopicStatus & )
@@ -105,7 +104,7 @@ namespace CIAO_LOBO_Test_Receiver_Impl
   }
 
   void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
+    ::DDS::Entity_ptr ,
     ::DDS::StatusKind  status_kind)
   {
     if (status_kind == ::DDS::DATA_ON_READERS_STATUS)
@@ -123,7 +122,6 @@ namespace CIAO_LOBO_Test_Receiver_Impl
       started_ (false),
       iterations_ (10),
       keys_ (5)
-
   {
   }
 
@@ -143,7 +141,6 @@ namespace CIAO_LOBO_Test_Receiver_Impl
       }
   }
 
-  // Port operations.
   ::CCM_DDS::ListenOneByOneTest::CCM_Listener_ptr
   Receiver_exec_i::get_info_listen_data_listener (void)
   {
@@ -187,7 +184,7 @@ namespace CIAO_LOBO_Test_Receiver_Impl
   {
     this->keys_ = keys;
   }
-  // Operations from Components::SessionComponent.
+
   void
   Receiver_exec_i::set_session_context (
     ::Components::SessionContext_ptr ctx)
@@ -276,4 +273,3 @@ namespace CIAO_LOBO_Test_Receiver_Impl
     return retval;
   }
 }
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h
index dcfcf5bba2c..6a64f454548 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h
@@ -95,9 +95,8 @@ namespace CIAO_LOBO_Test_Receiver_Impl
     Receiver_exec_i (void);
     virtual ~Receiver_exec_i (void);
 
-    // Supported operations and attributes.
     void start ();
-    // Component attributes.
+
     virtual ::CORBA::UShort iterations (void);
 
     virtual void iterations (::CORBA::UShort iterations);
@@ -106,7 +105,6 @@ namespace CIAO_LOBO_Test_Receiver_Impl
 
     virtual void keys (::CORBA::UShort keys);
 
-    // Port operations.
     virtual ::CCM_DDS::ListenOneByOneTest::CCM_Listener_ptr
     get_info_listen_data_listener (void);
 
@@ -116,7 +114,6 @@ namespace CIAO_LOBO_Test_Receiver_Impl
     virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
     get_info_listen_connector_status (void);
 
-    // Operations from Components::SessionComponent.
     virtual void
     set_session_context (
       ::Components::SessionContext_ptr ctx);
@@ -143,4 +140,3 @@ namespace CIAO_LOBO_Test_Receiver_Impl
 }
 
 #endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp
index 9a20fcd8c87..41deea9e7b5 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp
@@ -12,7 +12,7 @@
 
 namespace CIAO_SL_ManyByMany_Receiver_Impl
 {
-//============================================================
+  //============================================================
   // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
   //============================================================
   read_action_Generator::read_action_Generator (Receiver_exec_i &callback)