Merge pull request #1922 from knutpett/knutpett/whitespace

Remove whitespace

73 files changed, 0 insertions, 92 deletions

diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
index 3914607b1bf..576b48e80ba 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
@@ -47,7 +47,6 @@ protected:
  */
 class AdminProperties_Task : public ACE_Task_Base
 {
-
 public:
   /// Constructor.
   AdminProperties_Task (void);
@@ -83,7 +82,6 @@ private:
  */
 class AdminProperties : public Notify_Test_Client
 {
-
   friend class AdminProperties_StructuredPushConsumer;
   friend class AdminProperties_Task;
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
index 56a3172182b..f5390872c18 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
@@ -4,7 +4,6 @@
 #include "ConnectDisconnect.h"
 
 
-
 #define CD_IMPLEMENT_ENTITY(X)\
 \
 CD_##X::CD_##X (ConnectDisconnect* cd, int id) \
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
index 6dfcd5110ac..a4471ffefbb 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -4,7 +4,6 @@
 #include "Events.h"
 
 
-
 /***************************************************************************/
 
 Event_StructuredPushConsumer::Event_StructuredPushConsumer (Events *test_client)
@@ -131,7 +130,6 @@ Events::parse_args (int argc,
         {
           this->use_default_admin_ = 1;
           arg_shifter.consume_arg ();
-
         }
       else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-events"))))
         {
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp
index 13953088e6a..7d2504daf97 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp
@@ -5,7 +5,6 @@
 #include "orbsvcs/CosNotifyFilterExtC.h"
 
 
-
 ExtendedFilter::ExtendedFilter (void)
   : event_count_ (5)
 {
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
index 6014d6c7aaf..e10e796bc8f 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
@@ -4,7 +4,6 @@
 #include "Filter.h"
 
 
-
 Filter::Filter (void)
   : event_count_ (5)
 {
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index 26893522ce8..7eded75b6ef 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
@@ -86,7 +86,6 @@ IdAssignment::init (int argc,
       ACE_ERROR ((LM_ERROR,
                   " (%P|%t) Unable to resolve naming service !\n"));
       return;
-
     }
   CosNaming::NamingContext_var rootNC =
     CosNaming::NamingContext::_narrow (rootObj.in ());
@@ -108,7 +107,6 @@ IdAssignment::init (int argc,
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (
         obj.in()
       );
-
 }
 
 CosNotifyChannelAdmin::ChannelID
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index e65237bdb92..f772230f01b 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
@@ -4,7 +4,6 @@
 #include "MultiTypes.h"
 
 
-
 //*****************************************************************************************************
 
 MultiTypes_PushConsumer::MultiTypes_PushConsumer (MultiTypes* client)
@@ -63,7 +62,6 @@ MultiTypes::MultiTypes (void)
    seq_event_count_ (0),
    disconnect_on_last_event_ (0)
 {
-
 }
 
 MultiTypes::~MultiTypes ()
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
index f61f6e17edd..942d4dcdaf3 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
@@ -5,7 +5,6 @@
 #include "Sequence.h"
 
 
-
 /***************************************************************************/
 
 SequencePushConsumer::SequencePushConsumer (Sequence *test_client)
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
index ddd0ad8f9ac..add5a5317b6 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
@@ -4,7 +4,6 @@
 #include "Simple.h"
 
 
-
 //***************************************************************************
 
 Event_AnyPushConsumer::Event_AnyPushConsumer (Simple_Test *test_client)
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
index a3326305bcb..612deae2d2f 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
@@ -4,7 +4,6 @@
 #include "Updates.h"
 
 
-
 Updates_StructuredPushConsumer::Updates_StructuredPushConsumer (Updates *test_client)
   : test_client_ (test_client)
 {
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
index e1b15e1fc3c..21bd1c6aae9 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
@@ -24,7 +24,6 @@ namespace CosNotifyCommImpl{
       std::cout << "event.header.fixed_header.event_type.type_name = "
         << event.header.fixed_header.event_type.type_name
         << std::endl;
-
     };
 
     void disconnect_structured_push_consumer()
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
index 6f110389e8b..1e2ee3809d3 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
@@ -16,7 +16,6 @@ get_event_channel(CORBA::ORB_ptr orb)
   CosNotification::AdminProperties init_admin(0);
 
 
-
   std::cout << "Get CosNotifyChannelAdmin::EventChannelFactory"  << std::endl;
   std::cout << "IorEventChannelFactory=" << ior << std::endl;
   CORBA::Object_var obj = orb->string_to_object(ior);
@@ -51,7 +50,6 @@ get_event_channel(CORBA::ORB_ptr orb)
 
   if( channelIdSeq->length() == 0 )
   {
-
     try
     {
       ec = factory->create_channel( init_qos, init_admin, id);
@@ -229,7 +227,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     match_structure_test (filter, event, expected_result);
 
     orb->shutdown();
-
   }
   catch(...)
   {
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
index b9e1fd75cab..172a6306ad4 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
@@ -9,7 +9,6 @@ namespace CosNotifyCommImpl{
     void subscription_change( const CosNotification::EventTypeSeq&,
       const CosNotification::EventTypeSeq&)
     {};
-
   };
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp
index f5939a0a146..22e031184df 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp
@@ -162,7 +162,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                 status = consumer_1->messages_received() == 1 ? 0 : 1;
 
               ACE_DEBUG((LM_DEBUG, "Test status is %s.\n", status == 1 ? "fail" : "pass"));
-
             }
         }
     }
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
index e48a65eba34..6a7051d8fe1 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
@@ -85,7 +85,6 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
   while ((c = get_opts ()) != -1)
     switch (c)
   {
-
     case 'o':
       ior_output_file = get_opts.optarg;
       break;
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
index 96fe82eb761..23a8719f783 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
@@ -136,7 +136,6 @@ int loadOrb(ACE_Service_Config & service_config)
 }
 
 
-
 int
 ACE_TMAIN(int, ACE_TCHAR **argv)
 {
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
index 78ac583c59a..caf8ef284ac 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
@@ -98,7 +98,6 @@ return 0;
 }
 
 
-
 void loadunloadcycle()
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
index 78440bec547..ad34e9cfa75 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
@@ -11,7 +11,6 @@ namespace CosNotifyCommImpl{
     void subscription_change( const CosNotification::EventTypeSeq&,
       const CosNotification::EventTypeSeq&)
     {};
-
   };
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h
index 7c743cbcbd7..3438aff5c43 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h
@@ -31,11 +31,9 @@ class bug3688_Export TestBroadcaster
 
   // protected types and methods
   protected:
-
   // private methods and instance variables
   private:
     CosNotifyChannelAdmin::SequenceProxyPushConsumer_var mv_sequenceProxyPushConsumer;
-
 }; /* end of TestBroadcaster */
 
 
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
index 9c61a834f92..b60ec30150f 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
@@ -43,7 +43,6 @@ ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_VERSIONED_SERVICE_D
 ACE_TCHAR const * const scpc_unloadNotifyService = ACE_REMOVE_SERVICE_DIRECTIVE("testNotifyService");
 
 
-
 int publish()
 {
   int result = 0;
diff --git a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp
index 6f3a741ea98..2224260849d 100644
--- a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp
+++ b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp
@@ -18,7 +18,6 @@ sorter (const void* a, const void* b)
 }
 
 
-
 // It's reasonable to assume that there is only one event channel
 // factory and that we know its name.
 class MonitorTestInterface_i: public virtual POA_MonitorTestInterface
@@ -280,7 +279,6 @@ MonitorTestInterface_i::stat_dump (const char * statName)
     }
   catch (const CORBA::Exception& ex)
     {
-
       ex._tao_print_exception (statName);
     }
 }
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
index 7e3d933ffdd..14947118533 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
@@ -55,7 +55,6 @@ class FilterClient
   void done (void);
 
  protected:
-
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
 
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
index 02f9125570c..1fc535fc299 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
@@ -1,7 +1,6 @@
 #include "RT_Application_Command.h"
 
 
-
 #include "../lib/LookupManager.h"
 #include "RT_Priority_Mapping.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
index e1f9c3d1a34..5622466deed 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
@@ -1,7 +1,6 @@
 #include "../lib/Factories_Define.h"
 
 
-
 #include "rt_notify_test_export.h"
 #include "../lib/Name.h"
 #include "../lib/Command_Factory_T.h"
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
index 88cda77d7ec..9672f19024d 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
@@ -1,7 +1,6 @@
 #include "RT_POA_Command.h"
 
 
-
 #include "tao/debug.h"
 #include "../lib/LookupManager.h"
 #include "../lib/Name.h"
@@ -270,7 +269,6 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ
       // Create a thread-pool policy.
       lanes_policy =
         rt_orb->create_threadpool_policy (threadpool_id);
-
     }
   else if (thread_pool_static_threads_ > 0)
     {
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
index 10a8b6ba093..4545dc048f5 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
@@ -1,7 +1,6 @@
 #include "RT_Priority_Mapping.h"
 
 
-
 #include "../lib/LookupManager.h"
 
 TAO_Notify_Tests_RT_Priority_Mapping::~TAO_Notify_Tests_RT_Priority_Mapping (void)
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h
index 10adc098929..a8e7f5f2b2a 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h
@@ -40,7 +40,6 @@ public:
                 CORBA::Short &corba_priority);
 
 protected:
-
   /// The Priority Mapping helper.
   RTCORBA::PriorityMapping *priority_mapping_;
 };
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index 4b43325d224..b6583729658 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -7,7 +7,6 @@
 #include "tao/AnyTypeCode/Any.h"
 
 
-
 static const char NOTIFY_FACTORY_NAME[] = "NotifyEventChannelFactory";
 static const char NAMING_SERVICE_NAME[] = "NameService";
 
@@ -1561,7 +1560,6 @@ Consumer_Main::init_sequence_proxy_supplier (void)
   this->sequence_proxy_push_supplier_->connect_sequence_push_consumer (
     this->sequence_push_consumer_ref_.in ());
   this->sequence_push_consumer_.set_connected(true);
-
 }
 
 
@@ -1680,7 +1678,6 @@ Consumer_Main::init_any_proxy_supplier (void)
 
 int Consumer_Main::fini (void)
 {
-
   this->reconnection_callback_.fini ();
 
   if (this->disconnect_on_exit_)
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
index 26f4b891391..46491df04be 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
@@ -202,7 +202,6 @@ class Consumer_Main
   ////////////////
   // Data members
  private:
-
   // set by command line parameters
   bool verbose_;            // -v make a glorious noise
   enum Mode_T{
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
index c550f4178fe..c94aaef6509 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
@@ -7,7 +7,6 @@
 #include "ace/OS_NS_strings.h"
 
 
-
 static const char NOTIFY_FACTORY_NAME[] = "NotifyEventChannelFactory";
 static const char NAMING_SERVICE_NAME[] = "NameService";
 
@@ -168,7 +167,6 @@ ReconnectionCallback_i::init (
 }
 
 
-
 /////////////////
 // Supplier_Main
 
@@ -368,7 +366,6 @@ int Supplier_Main::init (int argc, ACE_TCHAR *argv[])
     }
     case MODE_ANY:
     {
-
       init_any_proxy_consumer ();
       break;
     }
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
index 485055ef799..fa0a3988c89 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
@@ -124,7 +124,6 @@ class Supplier_Main
   ////////////////
   // Data members
  private:
-
   // set by command line parameters
   bool verbose_;             // -v make a glorious noise
   enum Mode_T {
@@ -171,5 +170,4 @@ class Supplier_Main
 };
 
 
-
 #endif /* RECONNECTNG_SUPPLIER_H */
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
index 102a6760b16..1cb8deed507 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
@@ -163,7 +163,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     sig->done ();
 
     return 0;
-
   }
   catch (const CORBA::Exception& e)
   {
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
index 11fca2d5a0c..dba718ad1d0 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
@@ -66,7 +66,6 @@ protected:
   virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void);
 
 protected:
-
   /// Lock to serialize access to data members.
   TAO_SYNCH_MUTEX lock_;
 
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
index ff86d67b4e7..b5299870f68 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
@@ -1,7 +1,6 @@
 #include "RT_Test_FilterFactory.h"
 
 
-
 #include "RT_Test_Filter.h"
 #include "tao/debug.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
index c80efafa937..b8c8f6c45bb 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
@@ -291,12 +291,10 @@ int ACE_TMAIN (int ac, ACE_TCHAR *av[])
       ////////////////////////////////
       // TODO make this not hardcoded
       ACE_OS::rename ("abc.xml", "loadtest.xml");
-
     } // end of pass 1
 
     if (pass2)
     {
-
       // Create a new ecf, which should load itself from loadtest.xml
       CosNotifyChannelAdmin::EventChannelFactory_var
         cosecf = TAO_Notify_EventChannelFactory_i::create(persistentPOA.in ());
diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
index 3ebb4709a2d..071e9000daf 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
@@ -1,7 +1,6 @@
 #include "Application_Command.h"
 
 
-
 #include "tao/PortableServer/PortableServer.h"
 #include "LookupManager.h"
 #include "Name.h"
@@ -127,7 +126,6 @@ TAO_Notify_Tests_Application_Command::handle_shutdown (void)
   LOOKUP_MANAGER->resolve (driver);
 
   driver->shutdown ();
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Command.cpp
index 96dff4a1d34..4b7de8fcb56 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command.cpp
@@ -6,7 +6,6 @@
 #include "ace/Log_Msg.h"
 
 
-
 TAO_Notify_Tests_Command::TAO_Notify_Tests_Command (void)
   :next_ (0), command_ (INVALID)
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
index 94c10a875ba..9b76abd6578 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
@@ -6,7 +6,6 @@
 #include "Name.h"
 
 
-
 TAO_Notify_Tests_Command_Builder::TAO_Notify_Tests_Command_Builder (void)
   : start_command_ (0),
     last_command_ (0)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp
index ecb1789c077..b9e7c2e70c3 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp
@@ -2,7 +2,6 @@
 #include "Command_Factory.h"
 
 
-
 TAO_Notify_Tests_Command_Factory::TAO_Notify_Tests_Command_Factory (void)
 {
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
index ad72f569edc..f4b2ebdf7b7 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
@@ -4,7 +4,6 @@
 #include "Command_Factory_T.h"
 
 
-
 #include "ace/Dynamic_Service.h"
 #include "tao/debug.h"
 #include "Command_Builder.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
index f64c5988d5f..7aa1dac3b08 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
@@ -1,7 +1,6 @@
 #include "ConsumerAdmin_Command.h"
 
 
-
 #include "LookupManager.h"
 #include "Name.h"
 #include "Options_Parser.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
index c211128edf0..221c3eceafb 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
@@ -44,7 +44,6 @@ public:
   static const char* name (void);
 
 protected:
-
   /// = Data Members
 #ifdef HPUX_11
    // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
index 615acf230fe..ab4ea2c7edf 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
@@ -4,7 +4,6 @@
 #include "Consumer_T.h"
 
 
-
 template <class Consumer_Traits>
 TAO_Notify_Tests_Consumer_T<Consumer_Traits>::TAO_Notify_Tests_Consumer_T (void)
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
index 7d967fc85e2..4c356f12e5d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
@@ -1,7 +1,6 @@
 #include "Direct_Consumer.h"
 
 
-
 #include "LookupManager.h"
 
 TAO_Notify_Tests_Direct_Consumer::TAO_Notify_Tests_Direct_Consumer (void)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
index e9c66c60d25..d45f244a88b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
@@ -5,7 +5,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 #include "LookupManager.h"
 
 TAO_Notify_Tests_Direct_Supplier::TAO_Notify_Tests_Direct_Supplier (ACE_CString& target)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
index 45850fbc5e2..32d9d5675a8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
@@ -1,7 +1,6 @@
 #include "Driver.h"
 
 
-
 #include "ace/Dynamic_Service.h"
 #include "ace/Thread_Manager.h"
 #include "ace/Arg_Shifter.h"
@@ -152,7 +151,6 @@ TAO_Notify_Tests_ORB_Run_Worker::svc (void)
       ACE_DEBUG ((LM_ERROR, "Running ORB, timeout in %d sec\n", this->run_period_.sec ()));
 
       this->orb_->run ();
-
     }
   catch (const CORBA::Exception&)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.h b/TAO/orbsvcs/tests/Notify/lib/Driver.h
index 054eba9e8f9..babb998dd5a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.h
@@ -50,7 +50,6 @@ private:
 };
 
 
-
 /**
  * Run a server thread
  *
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
index 16745bb20e5..7e23a78a5bb 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
@@ -2,7 +2,6 @@
 #include "ace/Log_Msg.h"
 
 
-
 #include "LookupManager.h"
 #include "Name.h"
 #include "Options_Parser.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp b/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp
index 1822f47896d..9311312b506 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp
@@ -1,7 +1,6 @@
 #include "Factories_Define.h"
 
 
-
 #include "Name.h"
 #include "Command_Factory_T.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
index 93fe8e5af33..64a1003095c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
@@ -2,7 +2,6 @@
 #include "ace/Log_Msg.h"
 
 
-
 #include "LookupManager.h"
 #include "Name.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
index 3389c9b0186..5b774ff10bd 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
@@ -44,7 +44,6 @@ public:
   static const char* name (void);
 
 protected:
-
 #ifdef HPUX_11
    // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h
 #undef COMMAND
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
index 492a6a2f2bf..d2cbf162200 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
@@ -2,7 +2,6 @@
 #include "ace/OS_NS_string.h"
 
 
-
 #include "Name.h"
 
 TAO_Notify_Tests_LookupManager::TAO_Notify_Tests_LookupManager (void)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Name.cpp b/TAO/orbsvcs/tests/Notify/lib/Name.cpp
index f86ec08f39e..e0594607bd6 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Name.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Name.cpp
@@ -1,7 +1,6 @@
 #include "Name.h"
 
 
-
 #define TAO_Notify_Tests_DECLARE_NAME(target, name) \
 const char* const TAO_Notify_Tests_Name::target = name;
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
index 42a2d0a676d..1f5f98fb996 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
@@ -95,7 +95,6 @@ TAO_Notify_Tests_Options_Parser::execute (CosNotification::QoSProperties& qos, A
       qos.length (1);
       qos[0].name = CORBA::string_dup (NotifyExt::ThreadPool);
       qos[0].value <<= tp_params;
-
     } /* ThreadPool */
   else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Lanes")) == 0) // -Lanes lane_count -Lane prio static_thr dy_thr
     {
@@ -149,6 +148,5 @@ TAO_Notify_Tests_Options_Parser::execute (CosNotification::QoSProperties& qos, A
       qos.length (1);
       qos[0].name = CORBA::string_dup (NotifyExt::ThreadPoolLanes);
       qos[0].value <<= tpl_params;
-
     } /* ThreadPoolLane */
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.h b/TAO/orbsvcs/tests/Notify/lib/Peer.h
index d4ee7d05813..35e8c0c23c7 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.h
@@ -48,7 +48,6 @@ public:
   const ACE_CString& get_name (void);
 
 protected:
-
   /// My name.
   ACE_CString name_;
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
index 3ce0155662e..2dec98e86d7 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
@@ -49,7 +49,6 @@ public:
   void dump_stats (ACE_TCHAR* msg, int dump_samples);
 
 protected:
-
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification);
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
index d3971798566..fabecb84dc7 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
@@ -83,7 +83,6 @@ TAO_Notify_Tests_Periodic_Consumer_Command::init (ACE_Arg_Shifter& arg_shifter)
          }
 
          consumer->init_state (arg_shifter);
-
         } /* -Create */
       else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Subscription")) == 0) // -Subscription admin_name +added_type1 +-added_type2 ... -added_type3 -added_type4..
         {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
index 77000e7abd5..f8d3ee9a8c4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
@@ -57,7 +57,6 @@ public:
   const char* proxy_name (void);
 
 protected:
-
   /// svc method.
   void handle_svc (void);
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
index 8d2be6a6a5b..7f91d2ecff8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
@@ -46,7 +46,6 @@ public:
   static const char* name (void);
 
 protected:
-
 #ifdef HPUX_11
    // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h
 #undef COMMAND
diff --git a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
index 19e60fa7c72..5b65827eef4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
@@ -1,7 +1,6 @@
 #include "Priority_Mapping.h"
 
 
-
 TAO_Notify_Tests_Priority_Mapping::~TAO_Notify_Tests_Priority_Mapping (void)
 {
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
index 9358f2326ba..21b198b5164 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
@@ -5,7 +5,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 TAO_Notify_Tests_PushConsumer_Traits::TAO_Notify_Tests_PushConsumer_Traits (void)
   :type_ (CosNotifyChannelAdmin::ANY_EVENT)
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
index e32616ff243..c06dc8c17a7 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
@@ -5,7 +5,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 TAO_Notify_Tests_PushSupplier_Traits::TAO_Notify_Tests_PushSupplier_Traits (void)
   :type_ (CosNotifyChannelAdmin::ANY_EVENT)
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
index 4e6aeca4a33..5341b868cdc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
@@ -1,7 +1,6 @@
 #include "Relay_Consumer.h"
 
 
-
 #include "LookupManager.h"
 
 TAO_Notify_Tests_Relay_Consumer::TAO_Notify_Tests_Relay_Consumer (ACE_CString& destination)
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
index a9d59c40b55..69f1580fac4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
@@ -5,7 +5,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 TAO_Notify_Tests_SequencePushConsumer_Traits::TAO_Notify_Tests_SequencePushConsumer_Traits (void)
   :type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT)
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
index bdb78afc0d3..7898a9101fb 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
@@ -5,7 +5,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 TAO_Notify_Tests_SequencePushSupplier_Traits::TAO_Notify_Tests_SequencePushSupplier_Traits (void)
   :type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT)
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
index 45d6bd1add4..9ef61bfdd45 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
@@ -1,7 +1,6 @@
 #include "StructuredEvent.h"
 
 
-
 TAO_Notify_Tests_StructuredEvent::TAO_Notify_Tests_StructuredEvent (void)
 {
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
index 3c47d0c1201..acd8e77f3d1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
@@ -5,7 +5,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 TAO_Notify_Tests_StructuredPushConsumer_Traits::TAO_Notify_Tests_StructuredPushConsumer_Traits (void)
   :type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT)
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
index b5ef2bfc9f6..02d9fae6808 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
@@ -5,7 +5,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 TAO_Notify_Tests_StructuredPushSupplier_Traits::TAO_Notify_Tests_StructuredPushSupplier_Traits (void)
   :type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT)
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
index 5735508d687..b3b91fae728 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
@@ -1,7 +1,6 @@
 #include "SupplierAdmin_Command.h"
 
 
-
 #include "LookupManager.h"
 #include "Name.h"
 #include "Options_Parser.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
index aa4119f149d..5652a2d05c8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
@@ -44,7 +44,6 @@ public:
   static const char* name (void);
 
 protected:
-
 #ifdef HPUX_11
    // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h
 #undef COMMAND
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
index 33fb119d383..75e2ce86f1b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
@@ -4,7 +4,6 @@
 #include "Supplier_T.h"
 
 
-
 template <class Supplier_Traits>
 TAO_Notify_Tests_Supplier_T<Supplier_Traits>::TAO_Notify_Tests_Supplier_T (void)
 {
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
index 7579b33c5c1..1fcdeaa6a64 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
@@ -66,7 +66,6 @@ private:
  */
 class RedGreen_Test
 {
-
  public:
   // = Initialization
   RedGreen_Test (void);
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index 5fbc76eb76d..d1aa014c192 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -440,7 +440,6 @@ else
 void
 Notify_Throughput::run_test (void)
 {
-
   ACE_DEBUG ((LM_DEBUG, "collocated_ec_ %d ,"
               "burst_count_ %d, "
               "burst_pause_ %d, "
@@ -563,7 +562,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       events.dump_results();
 
       ACE_DEBUG ((LM_DEBUG, "ending main...\n"));
-
     }
   catch (const CORBA::Exception& se)
     {