Removed extra newline before closing }

131 files changed, 0 insertions, 167 deletions

diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp
index 6d05f65ede8..b6e3c7877e1 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp
@@ -35,7 +35,6 @@ EventSequenceConsumer_i::disconnect_sequence_push_consumer ()
   PortableServer::POA_var poa = current->get_POA ();
   PortableServer::ObjectId_var objectId = current->get_object_id();
   poa->deactivate_object(objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp
index c47f465d145..e15da52477c 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp
@@ -16,7 +16,6 @@ EventSequenceSupplier_i::disconnect_sequence_push_supplier ()
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp
index 8d94d19eff7..0bfc413654b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp
@@ -67,7 +67,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
   }
 
   return 0;
-
 }
 
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp
index 9e0a217a91a..fc0488c9107 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp
@@ -116,6 +116,5 @@ CORBA::Boolean Messenger_i::send_message (const char * user_name,
   consumer_proxy_->push_structured_events(events);
 
   return 1;
-
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp
index 28e2fb05627..69b8b1bc3b1 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp
@@ -34,7 +34,6 @@ StructuredEventConsumer_i::disconnect_structured_push_consumer(
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp
index a8331596d84..ab5ad740764 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp
@@ -16,7 +16,6 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier ()
   PortableServer::POA_var poa = current->get_POA ();
   PortableServer::ObjectId_var objectId = current->get_object_id ();
   poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp
index 1163e577c31..d4f1ee8853a 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp
@@ -64,7 +64,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
   }
 
   return 0;
-
 }
 
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp
index 11cb57adaf5..97d8865479b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp
@@ -15,7 +15,6 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier ()
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp
index 6618dcbfce1..d32ac5960fc 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp
@@ -43,7 +43,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR * argv[])
 
   std::cout << "MessengerClient: success" << std::endl;
   return 0;
-
 }
 
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp
index a1c11e2cc82..81b6de4c263 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp
@@ -33,7 +33,6 @@ StructuredEventConsumer_i::disconnect_structured_push_consumer(
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp
index 0c3cf2b94d5..30701f30fbd 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp
@@ -16,7 +16,6 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier ()
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp
index e80efb54cee..24dd322ed0d 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp
@@ -34,7 +34,6 @@ StructuredEventConsumer_i::disconnect_structured_push_consumer()
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp
index b11df7abb34..03dbefa4624 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp
@@ -16,7 +16,6 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier ()
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp
index 1163e577c31..d4f1ee8853a 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp
@@ -64,7 +64,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
   }
 
   return 0;
-
 }
 
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp
index e80efb54cee..24dd322ed0d 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp
@@ -34,7 +34,6 @@ StructuredEventConsumer_i::disconnect_structured_push_consumer()
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp
index 263b4d03d66..159d860a26d 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp
@@ -16,7 +16,6 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier ()
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp
index 14e332e2672..c478ac9848b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp
@@ -82,7 +82,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
     return 1;
   }
   return 0;
-
 }
 
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp
index b3d363c0d52..9858d2f7ba8 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp
@@ -32,7 +32,6 @@ StructuredEventConsumer_i::disconnect_structured_push_consumer()
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp
index 8cf0e0abd35..a4f57a40858 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp
@@ -16,7 +16,6 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier ()
   PortableServer::POA_var poa = current->get_POA ();
   PortableServer::ObjectId_var objectId = current->get_object_id ();
   poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp
index 6bdd7c6a1de..86ba4505116 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp
@@ -84,7 +84,6 @@ ClientInterceptor::send_request (
   // reset recursion test
   flag <<= 0;
   pic->set_slot(slot,flag);
-
 }
 
 void
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
index 2d30ac02884..901816581ff 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
@@ -76,7 +76,6 @@ namespace TAO
     FT_DefaultFaultAnalyzer & operator = (const FT_DefaultFaultAnalyzer & rhs);
 
   };
-
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
index 6957f1f39db..b4aa54eb188 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
@@ -74,7 +74,6 @@ namespace TAO
     // Data Members
   private:
   };
-
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
index 3e3dd8afe9e..749409d43ab 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
@@ -145,7 +145,6 @@ namespace TAO
     size_t notifications_;
 
   };
-
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
index 1298d974555..f23699c8ba5 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
@@ -66,7 +66,6 @@ namespace TAO
     PortableGroup::FactoryInfos_var factories;
 
   };
-
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
index 306b1f23f16..1cbc87839bc 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
@@ -75,7 +75,6 @@ namespace TAO
     //@}
 
   };
-
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
index da1318e9869..da4c8d6809f 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
@@ -401,7 +401,6 @@ namespace TAO
     /// Quit flag.
     int quit_;
   };
-
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
index 70ce7f6ce0c..a7cfd9b7997 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
@@ -184,7 +184,6 @@ namespace TAO
     FT_ReplicationManager * replication_manager_;
 
   };
-
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
index 2c41bddea40..3c244cfdc9e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
@@ -592,7 +592,6 @@ Locator_Repository::link_peers (Server_Info_Ptr base,
   this->persistent_update (base, true);
 
   return 0;
-
 }
 
 // -------------------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
index 8f06171529d..5084fa7e53a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
@@ -895,7 +895,6 @@ Shared_Backing_Store::locator_service_ior (const char* peer_ior) const
   char* const combined_ior =
     this->orb_->object_to_string(locator_service.in ());
   return combined_ior;
-
 }
 
 void
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
index 1887780411e..74ad8a93515 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
@@ -181,7 +181,6 @@ TAO_NT_Naming_Service::arg_manip (char *args, DWORD arglen, bool query)
     }
 
   RegCloseKey (hkey);
-
 }
 
 int
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
index a561076517f..cde1f49c6c3 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
@@ -149,7 +149,6 @@ TAO_NT_Notify_Service::arg_manip (char *args, DWORD arglen, bool query)
     }
 
   RegCloseKey (hkey);
-
 }
 
 int
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
index 28543b33482..e9e5ff59a93 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
@@ -134,7 +134,6 @@ void TestClient::run()
   this->wait();
 
   ACE_DEBUG((LM_DEBUG, "* Client ended.\n"));
-
 }
 
 // Read in the stringified object references into an array
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
index bc3aa1ea8ea..431cbd63b0a 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
@@ -96,7 +96,6 @@ Consumer::push (const CORBA::Any &)
       ACE_DEBUG ((LM_DEBUG,
                   "Consumer (%P|%t): %d log generated events received\n",
                   this->event_count_));
-
 }
 
 void
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
index 96e35de1902..805a9900f3e 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
@@ -71,7 +71,6 @@ private:
   DsNotifyLogAdmin::NotifyLogFactory_var notify_log_factory_;
 
   CosNotifyChannelAdmin::ProxyPushSupplier_var proxy_supplier_;
-
 };
 
 #endif /* NOTIFY_CONSUMER_H */
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
index e288e2e04e0..9c831329b94 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
@@ -17,7 +17,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   Supplier supplier;
 
   return supplier.run (argc, argv);
-
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
index a6f96cbe249..93cd4e1f219 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
@@ -329,7 +329,6 @@ Subscribe_StructuredPushConsumer::push_structured_event
 
   if (++g_result_count == EVENT_COUNT)
     subscribe_->done ();
-
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index 2a53ea29c8e..6824b4bacf5 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -2151,7 +2151,6 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
     return 0;
 
   return 1;
-
 }
 
 // Sets the list of protocols this streamendpoint can understand.
@@ -2609,7 +2608,6 @@ TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep
 {
 
   throw AVStreams::notSupported ();
-
 }
 
 TAO_StreamEndPoint_A::~TAO_StreamEndPoint_A ()
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
index ed0f32ee71a..ce63260d5ae 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
@@ -259,7 +259,6 @@ TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &s
   stream_endpoint = AVStreams::StreamEndPoint_A::_duplicate( this->stream_endpoint_a_.in() );
   vdev = AVStreams::VDev::_duplicate( this->vdev_.in() );
   return 0;
-
 }
 
 // Gets the stream endpoint object reference from the naming service
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
index bbe3cfc9108..633df6b7cf2 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
@@ -239,7 +239,6 @@ TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::crea
   stream_endpoint = AVStreams::StreamEndPoint_A::_duplicate( this->stream_endpoint_a_.in() );
   vdev = AVStreams::VDev::_duplicate( this->vdev_.in() );
   return 0;
-
 }
 
 // Put the stream_endpoint into the POA
diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
index 8848fffcf47..57dfc5fc1e4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
@@ -167,7 +167,6 @@ TAO_AV_UDP_MCast_Transport::send (const char *buf,
 //   if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"to %s\n",addr));
 
   return this->handler_->get_mcast_socket ()->send (buf, len);
-
 }
 
 ssize_t
@@ -178,7 +177,6 @@ TAO_AV_UDP_MCast_Transport::send (const iovec *iov,
   return this->handler_->get_mcast_socket ()->send (iov,
                                                     iovcnt,
                                                     0);
-
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
index 4d3a2c5dc31..9d3baefcc29 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -180,7 +180,6 @@ TAO_AV_UDP_QoS_Session_Helper::activate_qos_handler (ACE_QoS_Session *qos_sessio
                       -1);
 
   return 0;
-
 }
 
 TAO_AV_UDP_QoS_Flow_Handler::TAO_AV_UDP_QoS_Flow_Handler (void)
@@ -1066,7 +1065,6 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
   this->entry_->handler (flow_handler);
 
   return 0;
-
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
index 0001e862225..d2d5b191171 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
@@ -436,7 +436,6 @@ TAO_AV_RTCP_Object::TAO_AV_RTCP_Object (TAO_AV_Callback *client_cb,
 {
   rtcp_cb = &this->rtcp_cb_;
   this->client_cb_ = client_cb;
-
 }
 
 TAO_AV_RTCP_Object::~TAO_AV_RTCP_Object ()
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
index 9423eef309a..3cc42ab145d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
@@ -66,7 +66,6 @@ RTCP_Packet::is_valid (char is_first)
     }
 
   return 1;
-
 }
 
 /*
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
index d320d327028..ee9d4f7a4b6 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
@@ -280,7 +280,6 @@ TAO_AV_UDP_Transport::send (const iovec *iov,
   return this->handler_->get_socket ()->send ((const iovec *) iov,
                                               iovcnt,
                                               this->peer_addr_);
-
 }
 
 ssize_t
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
index 77b9e1542a7..28dc0972ce7 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
@@ -649,7 +649,6 @@ TAO_SFP_Base::send_message (TAO_AV_Transport *transport,
       return -1;
     }
   return 1;
-
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
index 855026457a8..b07c2c26bc3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
@@ -170,7 +170,6 @@ TAO_ECG_CDR_Message_Sender::send_message  (const TAO_OutputCDR &cdr,
     }
   // ACE_ASSERT (total_length == fragment_offset);
   // ACE_ASSERT (fragment_id == fragment_count);
-
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
index 3768edc213e..444d5e710c3 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
@@ -215,7 +215,6 @@ void ACE_SupplierQOS_Factory::debug (const RtecEventChannelAdmin::SupplierQOS& q
                   buf, qos.publications[i].dependency_info.number_of_calls));
         }
   ORBSVCS_DEBUG ((LM_DEBUG, "}\n"));
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
index fd5333e870b..e1b6e9e36fd 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
@@ -64,7 +64,6 @@ TAO_FT_IOGR_Property::set_property (
 
   // Success
   return 1;
-
 }
 
 
@@ -139,7 +138,6 @@ TAO_FT_IOGR_Property::get_primary (
   stub = safe_stub.release ();
 
   return new_obj._retn ();
-
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
index 0627ab902c4..6a2392367b5 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
@@ -100,7 +100,6 @@ namespace TAO
 
     CORBA::ORB_var orb_;
   };
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
index 2e87871cfb0..9133eee20a7 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
@@ -82,7 +82,6 @@ TAO_FT_Service_Callbacks::object_is_nil (CORBA::Object_ptr obj)
 
   // If it reaches here then it should be nill
   return true;
-
 }
 
 TAO_Service_Callbacks::Profile_Equivalence
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
index c077a85b344..a86235cd2a5 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
@@ -270,7 +270,6 @@ TAO_FTEC_Event_Channel::connect_push_supplier (
       )
 {
   return ec_impl_->connect_push_supplier(push_supplier, qos);
-
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
index e845ed7d35f..932beb8d789 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
@@ -187,7 +187,6 @@ TAO_FTEC_Event_Channel_Impl::TAO_FTEC_Event_Channel_Impl(
     CORBA::Object::_duplicate (attributes.scheduler);
 
   this->create_strategies ();
-
 }
 
 TAO_FTEC_Event_Channel_Impl::~TAO_FTEC_Event_Channel_Impl()
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
index 50943253f93..bcdc0daaf3d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
@@ -96,7 +96,6 @@ retrieve_ft_request_context(
 
   if ((cdr >> ft_request_service_context) == 0)
     throw CORBA::BAD_PARAM ();
-
 }
 
 FTRT::TransactionDepth
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
index f146aa999f0..6308a9fb6ed 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
@@ -104,7 +104,6 @@ Request_Context_Repository::get_object_id(
   CORBA::Any_var a = ri->get_slot(object_id_slot);
 
   return ::get_object_id(a);
-
 }
 
 void
@@ -235,7 +234,6 @@ Request_Context_Repository::get_transaction_depth(
   FTRT::TransactionDepth result=0;
   a >>= result;
   return result;
-
 }
 
 FTRT::TransactionDepth
@@ -249,7 +247,6 @@ Request_Context_Repository::get_transaction_depth()
   FTRT::TransactionDepth result=0;
   a >>= result;
   return result;
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
index abe63a47620..1c437dd30ae 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
@@ -311,7 +311,6 @@ TAO::HTIOP::Connector::cancel_svc_handler (
     return 0;
 
   return -1;
-
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
index b0b30c1bf4b..7db2db3649d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
@@ -34,7 +34,6 @@ TAO_BasicLog_i::copy (DsLogAdmin::LogId &id)
   this->copy_attributes (log.in ());
 
   return log._retn ();
-
 }
 
 DsLogAdmin::Log_ptr
@@ -50,7 +49,6 @@ TAO_BasicLog_i::copy_with_id (DsLogAdmin::LogId id)
   this->copy_attributes (log.in ());
 
   return log._retn ();
-
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
index 6ede219f2e6..1929ea3e2be 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
@@ -48,7 +48,6 @@ TAO_EventLog_i::copy (DsLogAdmin::LogId &id)
   this->copy_attributes (log.in ());
 
   return log._retn ();
-
 }
 
 DsLogAdmin::Log_ptr
@@ -64,7 +63,6 @@ TAO_EventLog_i::copy_with_id (DsLogAdmin::LogId id)
   this->copy_attributes (log.in ());
 
   return log._retn ();
-
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
index 9d46942ca69..ef709e6d6c9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
@@ -34,7 +34,6 @@ TAO_Notify_LogConsumer::connect (
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
   proxy_supplier_->connect_any_push_consumer (objref.in ());
-
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp
index 05a80e20651..ec3195f1a1f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp
@@ -274,7 +274,6 @@ TAO_Storable_Naming_Context_ReaderWriter::read_global (TAO_NS_Persistence_Global
     }
 
   global.counter(counter);
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
index e83ee24703b..d369a3af82e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
@@ -62,7 +62,6 @@ TAO_Notify_Admin::init (TAO_Notify::Topology_Parent* parent)
   this->proxy_container_.reset (proxy_container);
 
   this->proxy_container().init ();
-
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h
index 4ae02ec2e94..0f5218fee01 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h
@@ -69,7 +69,6 @@ private:
   size_t first_set_bit_;
   size_t first_cleared_bit_;
 };
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
index 1117bda47e9..ec73cc7a992 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
@@ -120,7 +120,6 @@ private:
   ACE_CDR::Octet delivery_type_;
   IdVec destination_id_;
 };
-
 } // namespace
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
index eb9881eb2e9..7040b2eb878 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
@@ -29,7 +29,6 @@ TAO_Notify_ETCL_FilterFactory::~TAO_Notify_ETCL_FilterFactory ()
   }
 
   this->filters_.unbind_all ();
-
 }
 
 CosNotifyFilter::FilterFactory_ptr
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
index cb8d189001d..6dfd2180884 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
@@ -140,7 +140,6 @@ bool TAO_Notify_EventType::init(const TAO_Notify::NVPList& attrs)
     result = true;
   }
   return result;
-
 }
 
   // TAO_Notify::Topology_Object
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h
index f10ddea24a5..c2207438b3f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h
@@ -39,7 +39,6 @@ namespace TAO_Notify
     // release the current factory so a new one can be created
     virtual void reset () = 0;
   };
-
 } // namespace TAO_Notify
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
index 264f4ede97c..30af7a40e46 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
@@ -155,7 +155,6 @@ TAO_Notify_Method_Request_Lookup::unmarshal (
     }
   }
   return result;
-
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
index 316f93a140a..72564775ee2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
@@ -29,7 +29,6 @@ Persistent_Storage_Block::Persistent_Storage_Block(const size_t block_number,
 {
   ACE_NEW(this->data_, unsigned char[this->block_size_]);
   ACE_OS::memset(this->data_, 0, this->block_size_);
-
 }
 
 Persistent_Storage_Block::Persistent_Storage_Block(
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h
index d6b32f7d70c..3ac466ff73c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h
@@ -197,7 +197,6 @@ private:
   bool thread_active_;
   ACE_SYNCH_CONDITION wake_up_thread_;
 };
-
 } /* namespace TAO_Notify */
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h
index 4eefacf39be..7270b9264a0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h
@@ -83,7 +83,6 @@ private:
   size_t block_size_;
   mutable TAO_SYNCH_MUTEX lock_;
 };
-
 } /* namespace TAO_Notify */
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
index e32670b14f3..9fe228cb5a1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
@@ -232,7 +232,6 @@ private:
 
   static Routing_Slip_Queue persistent_queue_;
 };
-
 } // namespace
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
index c458f30d069..8354304bef2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
@@ -255,7 +255,6 @@ private:
   ACE_Message_Block * event_mb_;
   ACE_Message_Block * routing_slip_mb_;
 };
-
 } /* namespace TAO_Notify */
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
index 8b394884503..8f26f9e0280 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
@@ -27,7 +27,6 @@ TAO_Notify_Seq_Worker_T<TYPE>::create (CONTAINER &container)
   container.collection ()->for_each (this);
 
   return this->seq_._retn ();
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
index def15cc2749..71e6af692ff 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
@@ -71,7 +71,6 @@ public:
    */
   virtual void close (void);
 };
-
 } // namespace TAO_Notify
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
index de3803bc12b..6afb55621ab 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
@@ -200,7 +200,6 @@ namespace TAO_Notify
     /// \return false if save will never happen
     bool child_change (void);
   };
-
 } // namespace TAO_Notify
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
index 76094b30928..b4d535c045e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
@@ -71,7 +71,6 @@ private:
   /// If false, then we're just checking syntax of topology file.
   bool live_;
 };
-
 } // namespace TAO_Notify
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
index 32479952dd9..de945ca731a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
@@ -73,7 +73,6 @@ private:
   /// A string consisting of spaces that is our current indentation level.
   ACE_CString indent_;
 };
-
 } // namespace TAO_Notify
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h
index a567b11a3ac..952862c35a7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h
@@ -72,7 +72,6 @@ namespace TAO_Notify
     size_t backup_count_;
     bool timestamp_;
   };
-
 } // namespace TAO_Notify
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h
index adec27c6573..d8bd18cf11c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h
@@ -99,7 +99,6 @@ namespace TAO_PG
 
     virtual void cleanup (TAO_UIPMC_Mcast_Transport::Packets_Map &packets);
   };
-
 } // namespace TAO_PG
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
index fc271b1cbb5..afea09a6227 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
@@ -34,7 +34,6 @@ namespace TAO
 
   static int
   Requires_MIOP_Initializer = MIOP_Loader::Initializer ();
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
index f5c57843388..5364b87d4ea 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
@@ -169,7 +169,6 @@ void TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb, PortableServer::POA_ptr
 
   // and create a ior string
   this->ior_ = this->orb_->object_to_string (this->this_obj_.in ());
-
 }
 
 int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
index a13f035b279..45bf7719256 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
@@ -358,7 +358,6 @@ TAO::PG_Group_Factory::set_object_group_storable_factory (
   ACE_NEW_THROW_EX (this->list_store_,
                     TAO::PG_Group_List_Store (*this->storable_factory_),
                     CORBA::NO_MEMORY ());
-
 }
 
 TAO::PG_Group_Factory::Group_Map &
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
index 72065e982b1..b1ffb6120b6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
@@ -74,7 +74,6 @@ TAO_PG_ObjectGroupManager::add_member (
                              the_location,
                              member,
                              check_type_id);
-
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
index 9c8cb300bca..e40ce9263d4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
@@ -83,7 +83,6 @@ namespace TAO_PG
   private:
     NamedValueVec values_;
   };
-
 } //namespace TAO_PG
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h
index 5df8e585c27..c4d6577eabc 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h
@@ -46,7 +46,6 @@ namespace TAO_PG
   TAO_PortableGroup_Export void override_properties (
     const PortableGroup::Properties & overrides,
     PortableGroup::Properties &properties);
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h
index 821082e9cda..8d29cc82746 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h
@@ -97,7 +97,6 @@ namespace TAO_PG
                                  ACE_SYNCH_NULL_MUTEX> Fragments_Map;
     Fragments_Map fragments_;
   };
-
 } // namespace TAO_PG
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
index 553d7f7f777..548efc4572d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
@@ -101,7 +101,6 @@ namespace TAO
     bool setup_done_;
 
   };
-
 } // End TAO namespace.
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
index 8039af21ac4..e788d7e538d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
@@ -88,7 +88,6 @@ namespace TAO
     /// The connector initiating connection requests for IIOP_SSL.
     BASE_CONNECTOR base_connector_;
   };
-
 } // End TAO namespace.
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
index be7540ea0a6..35b27ccfeb3 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
@@ -31,7 +31,6 @@ TAO::SSLIOP::OwnCredentials_ptr
 TAO::SSLIOP::OwnCredentials::_nil ()
 {
   return (OwnCredentials *) 0;
-
 }
 
 SecurityLevel3::CredentialsType
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
index fee14157da2..c9e1b13d171 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -1856,7 +1856,6 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                    number_of_calls,
                    dependency_type,
                    enabled);
-
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 7c990e8f968..2d4d423f49e 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -677,7 +677,6 @@ ACE_Scheduler_Factory::log_scheduling_entries(TAO_Reconfig_Scheduler_Entry ** en
 
    ACE_OS::fclose (file);
    return 0;
-
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
index 2f20367d331..ec1cd67695e 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
@@ -177,7 +177,6 @@ TAO::Security::AccessDecision::access_allowed_i (OBJECT_KEY &key,
 
   // For now we just return the default.
   return access_decision;
-
 }
 
 CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
index a1f9556ebb6..001dd340523 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
@@ -111,7 +111,6 @@ TAO::SL3::CredentialsCurator::acquire_credentials (
     }
 
   throw CORBA::BAD_PARAM ();
-
 }
 
 SecurityLevel3::OwnCredentialsList *
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
index e04a1d22fcd..15a3da0fa7a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
@@ -583,7 +583,6 @@ Connection_Manager::destroy (const ACE_CString &flowname)
   this->receivers_.unbind (flowname);
 
   this->streamctrls_.unbind (flowname );
-
 }
 
 Connection_Manager::Receivers &
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
index 535b16c0b06..459ccf9fa56 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
@@ -127,7 +127,6 @@ Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flo
 
     }
   return true;
-
 }
 
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
index 49d8fc18d9b..aa0dcd94807 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
@@ -71,7 +71,6 @@ Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flows
 
     }
   return 1;
-
 }
 
 Receiver_Callback::Receiver_Callback (void)
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index 2a384f91291..9af75d01c61 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -181,7 +181,6 @@ Client::Client (void)
     protocol_ (ACE_OS::strdup ("UDP"))
 {
   endpoint_strategy_.init (TAO_AV_CORE::instance ()->orb (), TAO_AV_CORE::instance ()->poa ());
-
 }
 
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
index 805b34997c8..4b74dfdff1c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
@@ -60,7 +60,6 @@ Sender::shutdown (void)
 
       // Shut the orb down.
   TAO_AV_CORE::instance ()->orb ()->shutdown (0);
-
 }
 
 int
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
index 76f54988e36..562a0c7b7f3 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
@@ -101,5 +101,4 @@ protected:
 
   /// Receiver MMDevice.
   TAO_MMDevice *mmdevice_;
-
 };
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp
index 9c9670f5b46..f9ea2ede22a 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp
@@ -20,7 +20,6 @@ Server_ORBInitializer::post_init (
 {
   this->register_server_request_interceptors (info
                                               );
-
 }
 
 void
@@ -40,7 +39,6 @@ Server_ORBInitializer::register_server_request_interceptors (
 
   info->add_server_request_interceptor (server_interceptor.in ()
                                         );
-
 }
 
 
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp
index b23dc33a54e..632ebfabf87 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp
@@ -69,7 +69,6 @@ ACE_TMAIN(int argc, ACE_TCHAR * argv[])
   }
 
   return 0;
-
 }
 
 
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
index d17f53abbe8..4b49e5f9559 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
@@ -121,6 +121,5 @@ CORBA::Boolean Messenger_i::send_message (
   consumer_proxy_->push_structured_event(event);
 
   return 1;
-
 }
 
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp
index b11df7abb34..03dbefa4624 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp
@@ -16,7 +16,6 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier ()
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp
index 45d43b27eca..04d12398ace 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp
@@ -21,5 +21,4 @@ ClientORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
     client_interceptor = cri;
 
   info->add_client_request_interceptor (client_interceptor.in ());
-
 }
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
index c1b275f824f..d1ee5370765 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
@@ -70,5 +70,4 @@ Client_Task::svc (void)
     }
 
   return 0;
-
 }
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index 685fcba8db5..9473b645f16 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -380,7 +380,6 @@ Test_Consumer::connect (int event_a,
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
                                                 qos.get_ConsumerQOS ());
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
index 898287edee4..4723d3c58b0 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
@@ -102,7 +102,6 @@ EC_Schedule::execute_test (void)
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG,
                 "EC_Schedule (%P|%t) schedule dumped\n"));
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
index a48b544a703..939f3218210 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
@@ -47,7 +47,6 @@ EC_Counting_Consumer::deactivate (void)
   PortableServer::ObjectId_var consumer_id =
     consumer_poa->servant_to_id (this);
   consumer_poa->deactivate_object (consumer_id.in ());
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index a97beb2f677..086662e4d48 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -331,7 +331,6 @@ EC_Driver::deactivate_ec (void)
 
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) EC deactivated\n"));
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.h b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
index 4ff32c986ca..131f9e30512 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
@@ -106,7 +106,6 @@ namespace FTAPP
 
 
   };
-
 } // namespace TAO
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
index 4a2acdef8fc..3c5a3bab53d 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
@@ -96,7 +96,6 @@ namespace TAO
      */
     int have_replication_manager_;
   };
-
 } // namespace TAO
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
index b2a7b5e77dd..4276d42ff26 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
@@ -29,7 +29,6 @@ LB_server::destroy (void)
       return -1;
     }
   return 0;
-
 }
 
 CORBA::ORB_ptr
@@ -146,7 +145,6 @@ LB_server::start_orb_and_poa (void)
     }
 
   return 0;
-
 }
 
 int
@@ -200,7 +198,6 @@ LB_server::create_object_group (const char *group_name)
     }
 
   return 0;
-
 }
 
 int
@@ -265,7 +262,6 @@ LB_server::remove_servant (const char *loc)
     }
 
   return 0;
-
 }
 
 TAO_Naming_Client&
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
index 25323e14cad..d01246bfada 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
@@ -473,7 +473,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 
   return rc;
-
 }
 
 //==============================================================================
@@ -1324,7 +1323,6 @@ do_persistence_name_test (
   }
 
   return RC_SUCCESS;
-
 }
 
 
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
index 603eb0086e8..b51bfac2a0d 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
@@ -29,7 +29,6 @@ LB_server::destroy (void)
       return -1;
     }
   return 0;
-
 }
 
 CORBA::ORB_ptr
@@ -144,7 +143,6 @@ LB_server::start_orb_and_poa (void)
     }
 
   return 0;
-
 }
 
 int
@@ -186,7 +184,6 @@ LB_server::create_object_group (void)
     }
 
   return 0;
-
 }
 
 int
diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
index 88418d36e0c..4d2423caf54 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
@@ -676,5 +676,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 
   return 0;
-
 }
diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp
index 2e9fb65c602..17231082463 100644
--- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp
@@ -27,7 +27,6 @@ LB_server::destroy (void)
       return -1;
     }
   return 0;
-
 }
 
 CORBA::ORB_ptr
@@ -142,7 +141,6 @@ LB_server::start_orb_and_poa (void)
     }
 
   return 0;
-
 }
 
 int
@@ -217,7 +215,6 @@ LB_server::create_object_group (void)
     }
 
   return 0;
-
 }
 
 int
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
index 159b2cbcd5c..0d49d05f636 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
@@ -74,7 +74,6 @@ int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel)
     -1);
 
   return 0;
-
 }
 
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
index 8c8247294ea..283eaaf36c0 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
@@ -63,7 +63,6 @@ Ping_Death_Request_Interceptor::receive_request_service_contexts (
   throw ::CORBA::TRANSIENT
     ( CORBA::SystemException::_tao_minor_code (TAO_POA_HOLDING, 1),
       CORBA::COMPLETED_NO);
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp
index 524455780c1..2d6e14f416a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp
@@ -34,5 +34,4 @@ Test_i::abort (CORBA::Short delay_secs)
   ACE_NEW(mb, ACE_Message_Block(2));
   ACE_OS::sprintf(mb->wr_ptr (), "%d", delay_secs);
   terminator_.putq(mb);
-
 }
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
index d2ab16ff3a5..0afb62d3c28 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
@@ -138,7 +138,6 @@ NContextExt_Client_i::get_name ()
   *name_componentPtr = '\0';
 
   return name_component;
-
 }
 
 int
@@ -321,5 +320,4 @@ NContextExt_Client_i::print_values (CosNaming::Name name,
 
  ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("The URL form of the string is \n %C\n"),
              url_string.in ()));
-
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
index b269b4cd18a..78b94429c09 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
@@ -29,7 +29,6 @@ LB_server::destroy (void)
       return -1;
     }
   return 1;
-
 }
 
 CORBA::ORB_ptr
@@ -135,7 +134,6 @@ LB_server::start_orb_and_poa (void)
     }
 
   return 1;
-
 }
 
 int
@@ -178,7 +176,6 @@ LB_server::create_object_group (void)
     }
 
   return 1;
-
 }
 
 int
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp
index 86eb6d82c58..88dac29fa65 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp
@@ -36,7 +36,6 @@ LB_server::destroy (void)
       return -1;
     }
   return 1;
-
 }
 
 CORBA::ORB_ptr
@@ -117,7 +116,6 @@ LB_server::start_orb_and_poa (void)
     }
 
   return 1;
-
 }
 
 int
@@ -157,7 +155,6 @@ LB_server::create_object_group (void)
     }
 
   return 1;
-
 }
 
 
@@ -176,7 +173,6 @@ LB_server::get_object_group (void)
     }
 
   return 1;
-
 }
 
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
index cef4b099a21..5a9c2c5027b 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
@@ -44,7 +44,6 @@ LB_Factory_Server::run (void)
       return -1;
     }
   return 1;
-
 }
 
 
@@ -66,7 +65,6 @@ LB_Factory_Server::destroy (void)
       return -1;
     }
   return 1;
-
 }
 
 int
@@ -195,6 +193,5 @@ LB_Factory_Server::init (void)
     }
 
   return 1;
-
 }
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
index 6febfc8546c..53262b5b65e 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
@@ -45,7 +45,6 @@ LB_server::run (void)
       return -1;
     }
   return 1;
-
 }
 
 
@@ -67,7 +66,6 @@ LB_server::destroy (void)
       return -1;
     }
   return 1;
-
 }
 
 int
@@ -169,7 +167,6 @@ LB_server::init (void)
     }
 
   return 1;
-
 }
 
 int
@@ -270,5 +267,4 @@ LB_server::create_object_group (const char *loc_1, const char *loc_2, const char
     }
 
   return 1;
-
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
index 8c7b5ca40c2..135e228f1ef 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
@@ -51,7 +51,6 @@ Factory::create_object (
   this->oid_ = this->poa_->servant_to_id (servant);
 
   return servant->_this ();
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
index 6150e701400..c1fe0ef575c 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
@@ -35,7 +35,6 @@ LB_server::run (void)
       return -1;
     }
   return 1;
-
 }
 
 
@@ -57,7 +56,6 @@ LB_server::destroy (void)
       return -1;
     }
   return 1;
-
 }
 
 int
@@ -146,7 +144,6 @@ LB_server::start_orb_and_poa (void)
     }
 
   return 1;
-
 }
 
 int
@@ -242,5 +239,4 @@ LB_server::create_object_group (const char *loc_1, const char *loc_2)
     }
 
   return 1;
-
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
index ea93044934d..6433cb05cc7 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
@@ -31,7 +31,6 @@ LB_server::destroy (void)
       return -1;
     }
   return 1;
-
 }
 
 CORBA::ORB_ptr
@@ -100,7 +99,6 @@ LB_server::start_orb_and_poa (void)
     }
 
   return 1;
-
 }
 
 int
@@ -139,7 +137,6 @@ LB_server::create_basic_object_group (void)
     }
 
   return 1;
-
 }
 
 int
@@ -178,7 +175,6 @@ LB_server::create_simple_object_group (void)
     }
 
   return 1;
-
 }
 
 int
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
index d59481f87cd..370cffe3c23 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
@@ -55,7 +55,6 @@ BasicLog_Test::init (int argc, ACE_TCHAR *argv[])
     }
 
   ACE_RETURN(0);
-
 }
 
 int
@@ -249,7 +248,6 @@ int BasicLog_Test::display_records ()
                rec_list[j].id, rec_list[j].time));
 
   return 0;
-
 }
 */
 int BasicLog_Test::write_records (CORBA::ULongLong numberOfRecords)
@@ -711,5 +709,4 @@ BasicLog_Test::test_capacity_alarm_threshold (void)
   this->write_records (0);
 
   return 0;
-
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index 26893522ce8..753ac74d846 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
@@ -108,7 +108,6 @@ IdAssignment::init (int argc,
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (
         obj.in()
       );
-
 }
 
 CosNotifyChannelAdmin::ChannelID
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index 31b9baac697..e67251706c4 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -1560,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);
-
 }
 
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
index 3b89f49dbcc..071e9000daf 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
@@ -126,7 +126,6 @@ TAO_Notify_Tests_Application_Command::handle_shutdown (void)
   LOOKUP_MANAGER->resolve (driver);
 
   driver->shutdown ();
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
index 6d6c95ac717..6ff51a9ec3e 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
@@ -536,5 +536,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
   // All tests have passed up to this point
   return 0;
-
 }