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 857b9061edb4c..8627d18ee8893 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
@@ -570,9 +570,8 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname,
   if( streamctrl_any.in() >>= streamctrl )
   {
      // Any still owns the pointer, so we duplicate it
-     AVStreams::StreamCtrl::_duplicate( streamctrl );
-     this->streamctrls_.bind (flowname,
-                             streamctrl);
+     AVStreams::StreamCtrl::_duplicate( streamctrl);
+     this->streamctrls_.bind (flowname, streamctrl);
   }
 }
 
@@ -582,7 +581,7 @@ Connection_Manager::destroy (const ACE_CString &flowname)
   this->protocol_objects_.unbind (flowname);
   this->receivers_.unbind (flowname);
 
-  this->streamctrls_.unbind (flowname );
+  this->streamctrls_.unbind (flowname);
 }
 
 Connection_Manager::Receivers &
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
index 8ca32e2dd2143..92013d8ce7f41 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
@@ -394,10 +394,9 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname,
   {
     // the CORBA::Any_var owns the pointer, so we should
     // _duplicate it before passing it around
-    AVStreams::StreamCtrl::_duplicate( streamctrl );
+    AVStreams::StreamCtrl::_duplicate( streamctrl);
     this->streamctrls_.unbind(flowname);
-    this->streamctrls_.bind (flowname,
-                             streamctrl);
+    this->streamctrls_.bind (flowname, streamctrl);
   }
 }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index 90667f6c708a8..74372401d7c91 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -224,9 +224,9 @@ Client::init (int argc, ACE_TCHAR *argv[])
       this->parse_args (this->argc_, this->argv_);
 
       ACE_NEW_RETURN (this->streamendpoint_a_,
-                      TAO_StreamEndPoint_A, -1 );
+                      TAO_StreamEndPoint_A, -1);
 
-      ACE_NEW_RETURN (this->fep_a_, FTP_Client_Producer, -1 );
+      ACE_NEW_RETURN (this->fep_a_, FTP_Client_Producer, -1);
       this->flowname_ = "Data";
 
       sep_a_ = this->streamendpoint_a_->_this();
@@ -291,7 +291,7 @@ Client::run ()
 
 
       CORBA::Object_var obj_b = this->orb_->string_to_object("corbaname:rir:#Server_StreamEndPoint_b");
-      AVStreams::StreamEndPoint_B_var sep_b = AVStreams::StreamEndPoint_B::_narrow ( obj_b.in() );
+      AVStreams::StreamEndPoint_B_var sep_b = AVStreams::StreamEndPoint_B::_narrow (obj_b.in());
 
       CORBA::Boolean result =
         this->streamctrl_.bind (sep_a_.in(),
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
index 77bcbdfd30f1a..1d1d5ffd14c49 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
@@ -123,7 +123,7 @@ Server::init (int argc,
 
       fep_b_obj_ = this->fep_b_->_this ();
 
-      CORBA::String_var s1 = sep_b_->add_fep( fep_b_obj_.in() );
+      CORBA::String_var s1 = sep_b_->add_fep( fep_b_obj_.in());
 
      ACE_DEBUG ((LM_DEBUG, "(%N,%l) Added flowendpoint named: %C\n", s1.in() ));
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
index 4ea62edf998d5..42d6dddf6b404 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -178,7 +178,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           mmdevice->add_fdev (pong_fdev.in ());
         }
 
-      orb->run ( );
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
index 662c18e92174f..b81370f01dfe1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
@@ -125,11 +125,11 @@ Server::run ()
         CORBA::Boolean wp = orb->work_pending ();
         if (wp)
          {
-              orb->perform_work( );
+              orb->perform_work();
          }
       }
 
-      orb->shutdown( 1 );
+      orb->shutdown(true);
     }
     catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
index 9acfb82641a01..7dfca4aa58df9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
@@ -187,13 +187,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       while ( !done )
       {
-        if ( orb->work_pending( ) )
+        if ( orb->work_pending())
         {
           orb->perform_work ();
         }
       }
 
-      orb->shutdown( 1 );
+      orb->shutdown(1);
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
index 8eb96ccb63574..8f6b6f604db7f 100644
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
@@ -20,7 +20,7 @@ ORB_Task::svc ()
   {
     CORBA::Object_var ncRef =
         orb_->string_to_object(
-            "corbaloc:iiop:10.175.12.99:15025/NameService" );
+            "corbaloc:iiop:10.175.12.99:15025/NameService");
 
     CORBA::PolicyList policies;
 
@@ -31,8 +31,7 @@ ORB_Task::svc ()
 
     policies.length(1);
     policies[0] = orb_->create_policy(
-      Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-      timeoutAny );
+      Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, timeoutAny);
 
     CORBA::Object_var object = ncRef->_set_policy_overrides(
       policies, CORBA::SET_OVERRIDE );
@@ -40,7 +39,7 @@ ORB_Task::svc ()
     policies[0]->destroy();
 
     CosNaming::NamingContext_var namingContext =
-      CosNaming::NamingContext::_narrow( object.in() );
+      CosNaming::NamingContext::_narrow( object.in());
     namingContext->_non_existent();
   }
   catch ( const CORBA::TRANSIENT&)
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
index f51aa60d6c36a..c84ab8e88c890 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
@@ -90,8 +90,6 @@ Server_Request_Interceptor::receive_request (
           "object_group_ref_version is %d\n", group_component.object_group_ref_version));
         }
     }
-
-  return;
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
index f983ad306ddcf..968cfa836caae 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
@@ -161,8 +161,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // Get a ref to the IORManipulation object
       CORBA::Object_var IORM =
-        orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0);
+        orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0);
 
       // Narrow
       iorm =
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
index c63bd4a210c68..17735f6298445 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
@@ -15,11 +15,9 @@ Hello::shutdown ()
 void
 Hello::ping ()
 {
-  return;
 }
 
 void
 Hello::throw_location_forward ()
 {
-  return;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
index ad93057287577..7646627fd8ccc 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
@@ -44,24 +44,19 @@ class TAO249_ServerRequest_Interceptor2
   virtual void destroy ();
 
   virtual void receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    );
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
   //@}
 
   CORBA::Object_var server_iogr_;
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
index 74a4a85be4978..cd96b6ae3300e 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
@@ -163,8 +163,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // Get a ref to the IORManipulation object
       CORBA::Object_var IORM =
-        orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0);
+        orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0);
 
       // Narrow
       iorm =
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
index 51d7cae2ccc7b..982b2378a0bd8 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
@@ -17,7 +17,6 @@ Hello::shutdown ()
 void
 Hello::ping ()
 {
-  return;
 }
 
 CORBA::Boolean
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
index ea65e8cdb2da8..a1bab4f341a9e 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
@@ -128,7 +128,7 @@ int Client_Task::svc ()
 
       if (!collocated_server->_is_collocated())
         { // Collocation is disabled, just skip the test - it has no sense.
-          ACE_DEBUG ((LM_ERROR, "Test has no sense, because collocation is disabled.\n") );
+          ACE_DEBUG ((LM_ERROR, "Test has no sense, because collocation is disabled.\n"));
         }
       else
         {
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
index 457285eeac931..45c28d0776976 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
@@ -55,7 +55,7 @@ Server_Task::svc ()
           ACE_OS::fprintf (output_file, "%s", ior.in ());
           ACE_OS::fclose (output_file);
 
-          ACE_DEBUG ((LM_ERROR, "(%P): Server's IOR was written to file: %s.\n", output_) );
+          ACE_DEBUG ((LM_ERROR, "(%P): Server's IOR was written to file: %s.\n", output_));
         }
 
       // Signal the main thread before we call orb->run ();
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
index 63010aacfcfd7..66e0c5144a900 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
@@ -9,10 +9,9 @@ TestImpl::TestImpl (CORBA::ORB_ptr orb)
 // virtual
 void TestImpl::myMethod ()
 {
-  ACE_DEBUG ((LM_ERROR, "(%P): TestImpl::myMethod called!.\n") );
+  ACE_DEBUG ((LM_ERROR, "(%P): TestImpl::myMethod called!.\n"));
 }
 
-
 // virtual
 void TestImpl::shutdown ()
 {
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
index 783d061e8fe44..9c67a08bdf23e 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
@@ -115,7 +115,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
   if (failed)
     {
-      ACE_DEBUG ((LM_ERROR, "Test failed.\n") );
+      ACE_DEBUG ((LM_ERROR, "Test failed.\n"));
     }
 
   return 0;
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
index ec96028665464..20c682d5dc353 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
@@ -9,17 +9,15 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
 void
 Hello::shutdown ()
 {
-  this->orb_->shutdown (0 );
+  this->orb_->shutdown (0);
 }
 
 void
 Hello::ping ()
 {
-  return;
 }
 
 void
 Hello::throw_location_forward ()
 {
-  return;
 }
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
index bb71b45abeede..16c7694ca22ca 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
@@ -60,8 +60,7 @@ TAO249_ServerRequest_Interceptor2::receive_request (
 
 
   IOP::ServiceContext_var sc =
-    ri->get_request_service_context (IOP::FT_REQUEST
-                                   );
+    ri->get_request_service_context (IOP::FT_REQUEST);
 
 
   TAO_InputCDR cdr (reinterpret_cast <const char*>
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h
index ad93057287577..7646627fd8ccc 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h
@@ -44,24 +44,19 @@ class TAO249_ServerRequest_Interceptor2
   virtual void destroy ();
 
   virtual void receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    );
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
   //@}
 
   CORBA::Object_var server_iogr_;
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
index e98c6b869bebd..a54dca9e813e8 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
@@ -48,11 +48,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior );
+        orb->string_to_object(ior);
 
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () );
+        Test::Hello::_narrow(tmp.in ());
 
 
       if (CORBA::is_nil (hello.in ()))
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
index dcb138f4d1da4..d25bf49876201 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
@@ -50,7 +50,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
   iors [0] = CORBA::Object::_duplicate (ref);
 
   CORBA::Object_var new_ref =
-    iorm->merge_iors (iors );
+    iorm->merge_iors (iors);
 
   // Property values
 
@@ -72,18 +72,13 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
   TAO_FT_IOGR_Property iogr_prop (ft_tag_component);
 
   // Set the property
-  CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                              new_ref.in ()
-                                              );
+  CORBA::Boolean retval = iorm->set_property (&iogr_prop, new_ref.in ());
 
   // Set the primary
   // See we are setting the second ior as the primary
   if (retval != 0)
     {
-      retval = iorm->set_primary (&iogr_prop,
-                                  new_ref.in (),
-                                  new_ref.in ()
-                                  );
+      retval = iorm->set_primary (&iogr_prop, new_ref.in (), new_ref.in ());
     }
 
   return new_ref._retn ();
@@ -101,21 +96,17 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     );
-
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv);
 
-
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" );
+        orb->resolve_initial_references("RootPOA");
 
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () );
-
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -130,21 +121,16 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       policies.length (2);
 
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               );
-
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          );
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
 
       PortableServer::POA_var my_poa =
         root_poa->create_POA ("my_poa",
                               poa_manager.in (),
-                              policies
-                              );
-
+                              policies);
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
@@ -153,7 +139,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           policy->destroy ();
         }
 
-
       if (parse_args (argc, argv) != 0)
         return 1;
 
@@ -166,29 +151,21 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       PortableServer::ObjectId_var server_id =
         PortableServer::string_to_ObjectId ("server_id");
 
-      my_poa->activate_object_with_id (server_id.in (),
-                                       hello_impl
-                                       );
-
+      my_poa->activate_object_with_id (server_id.in (), hello_impl);
 
       CORBA::Object_var hello =
-        my_poa->id_to_reference (server_id.in () );
-
+        my_poa->id_to_reference (server_id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () );
-
+        orb->object_to_string (hello.in ());
 
       // Get a ref to the IORManipulation object
       CORBA::Object_var IORM =
-        orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0
-                                         );
-
+        orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0);
 
       // Narrow
       iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() );
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
 
       CORBA::Object_var iortmp =
         orb->string_to_object (ior.in ());
@@ -197,7 +174,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 
       CORBA::String_var iorgr_string =
-        orb->object_to_string (iogr.in () );
+        orb->object_to_string (iogr.in ());
 
 
       // Output the IOR to the <ior_output_file>
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp
index d3c150a24b6d1..1a59d8c484a33 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp
@@ -15,7 +15,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 void
 Hello::shutdown ()
 {
-  this->orb_->shutdown (0 );
+  this->orb_->shutdown (0);
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp
index 6362341414996..4d0d1796c938a 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp
@@ -6,25 +6,19 @@
 
 
 void
-Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    )
+Server_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr)
 {
 }
 
 void
-Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    )
+Server_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
 {
-  this->register_server_request_interceptors (info
-                                              );
+  this->register_server_request_interceptors (info);
 }
 
 void
 Server_ORBInitializer::register_server_request_interceptors (
-    PortableInterceptor::ORBInitInfo_ptr info
-    )
+    PortableInterceptor::ORBInitInfo_ptr info)
 {
   PortableInterceptor::ServerRequestInterceptor_ptr sri =
     PortableInterceptor::ServerRequestInterceptor::_nil ();
@@ -36,8 +30,5 @@ Server_ORBInitializer::register_server_request_interceptors (
   PortableInterceptor::ServerRequestInterceptor_var
     server_interceptor = sri;
 
-  info->add_server_request_interceptor (server_interceptor.in ()
-                                        );
+  info->add_server_request_interceptor (server_interceptor.in ());
 }
-
-
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h
index d7be192bce8fa..afa5abe2f14b9 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h
@@ -23,17 +23,13 @@ class Server_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         );
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          );
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
   /// Register the necessary interceptors.
-  void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info
-         );
+  void register_server_request_interceptors (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
index fe9ba1b094a1d..9afa555a78e3b 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
@@ -49,9 +49,7 @@ TAO249_ServerRequest_Interceptor::receive_request (
   try
   {
     IOP::ServiceContext_var sc =
-      ri->get_request_service_context (IOP::FT_GROUP_VERSION
-                                       );
-
+      ri->get_request_service_context (IOP::FT_GROUP_VERSION);
 
     TAO_InputCDR cdr (reinterpret_cast <const char*>
                      (sc->context_data.get_buffer ()),
@@ -65,7 +63,6 @@ TAO249_ServerRequest_Interceptor::receive_request (
                                CORBA::COMPLETED_NO);
       }
 
-
     cdr.reset_byte_order (static_cast <int> (byte_order));
 
     Hello::normal_context_ok_ = 0;
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h
index 78ed68f06313d..00bd3d8fea504 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h
@@ -43,24 +43,19 @@ virtual char * name ();
 virtual void destroy ();
 
 virtual void receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  );
+  PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    );
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    );
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    );
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    );
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 //@}
 private:
 CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
index 5affa4bc4c139..6d70dc6b4e403 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
@@ -45,7 +45,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       char *argv1[] = { CLIENT, 0 };
 
       CORBA::ORB_var orb1 =
-      CORBA::ORB_init (one, argv1, "orb1" );
+      CORBA::ORB_init (one, argv1, "orb1");
 
       int three = 3;
       char OPTION[] = "-ORBFTSendFullGroupTC"; // Copy const into non-const storage.
@@ -56,7 +56,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       try
         {
           orb2 =
-            CORBA::ORB_init (three, argv2, "orb2" );
+            CORBA::ORB_init (three, argv2, "orb2");
         }
       catch (const CORBA::BAD_PARAM&)
         {
@@ -68,10 +68,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         return 1;
 
       CORBA::Object_var tmp =
-        orb1->string_to_object (ior );
+        orb1->string_to_object (ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () );
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -93,10 +93,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 
       tmp =
-        orb2->string_to_object (ior );
+        orb2->string_to_object (ior);
 
       hello =
-        Test::Hello::_narrow(tmp.in () );
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
index 4fdbd6572c2f2..0db83fcb9b79f 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
@@ -48,7 +48,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
   iors [0] = CORBA::Object::_duplicate (ref);
 
   CORBA::Object_var new_ref =
-    iorm->merge_iors (iors );
+    iorm->merge_iors (iors);
 
   // Property values
 
@@ -70,18 +70,13 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
   TAO_FT_IOGR_Property iogr_prop (ft_tag_component);
 
   // Set the property
-  CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                              new_ref.in ()
-                                              );
+  CORBA::Boolean retval = iorm->set_property (&iogr_prop, new_ref.in ());
 
   // Set the primary
   // See we are setting the second ior as the primary
   if (retval != 0)
     {
-      retval = iorm->set_primary (&iogr_prop,
-                                  new_ref.in (),
-                                  new_ref.in ()
-                                  );
+      retval = iorm->set_primary (&iogr_prop, new_ref.in (), new_ref.in ());
     }
 
   return new_ref._retn ();
@@ -99,21 +94,16 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     );
-
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv);
 
-
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" );
-
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () );
-
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -123,26 +113,17 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
 
-
       CORBA::PolicyList policies (2);
       policies.length (2);
 
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               );
-
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          );
-
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       PortableServer::POA_var my_poa =
-        root_poa->create_POA ("my_poa",
-                              poa_manager.in (),
-                              policies
-                              );
-
+        root_poa->create_POA ("my_poa", poa_manager.in (), policies);
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
@@ -151,7 +132,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           policy->destroy ();
         }
 
-
       if (parse_args (argc, argv) != 0)
         return 1;
 
@@ -164,38 +144,26 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       PortableServer::ObjectId_var server_id =
         PortableServer::string_to_ObjectId ("server_id");
 
-      my_poa->activate_object_with_id (server_id.in (),
-                                       hello_impl
-                                       );
-
-
-      CORBA::Object_var hello =
-        my_poa->id_to_reference (server_id.in () );
-
+      my_poa->activate_object_with_id (server_id.in (),hello_impl);
 
-      CORBA::String_var ior =
-        orb->object_to_string (hello.in () );
+      CORBA::Object_var hello = my_poa->id_to_reference (server_id.in ());
 
+      CORBA::String_var ior = orb->object_to_string (hello.in ());
 
       // Get a ref to the IORManipulation object
       CORBA::Object_var IORM =
-        orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0
-                                         );
-
+        orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0);
 
       // Narrow
       iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() );
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
 
       CORBA::Object_var server = orb->string_to_object (ior.in ());
 
       CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, server.in ());
 
-
       CORBA::String_var iorgr_string =
-        orb->object_to_string (iogr.in () );
-
+        orb->object_to_string (iogr.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -209,7 +177,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       poa_manager->activate ();
 
-
       orb->run ();
 
 
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerClient.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerClient.cpp
index 7cf1bdd9bc1a9..5fef6eaaef28c 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerClient.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerClient.cpp
@@ -51,7 +51,7 @@ ACE_TMAIN(int argc, ACE_TCHAR * argv[])
     }
 
     // Narrow
-    Messenger_var messenger = Messenger::_narrow( obj.in() );
+    Messenger_var messenger = Messenger::_narrow( obj.in());
     if (CORBA::is_nil(messenger.in())) {
       std::cerr << "Argument is not a Messenger reference" << std::endl;
       return 1;
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h
index 1b5912e316ba6..54f32b3c9ea05 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h
@@ -11,13 +11,11 @@ class StructuredEventConsumer_i :
     StructuredEventConsumer_i(CORBA::ORB_ptr orb);
 
     virtual void push_structured_event(
-      const CosNotification::StructuredEvent &notification
-                                       );
+      const CosNotification::StructuredEvent &notification);
 
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed
-                              );
+        const CosNotification::EventTypeSeq & removed);
 
    virtual void disconnect_structured_push_consumer();
 
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h
index 152a368249ef1..d235de89f4978 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h
@@ -15,8 +15,7 @@ class StructuredEventSupplier_i :
 
     virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed
-                                      );
+        const CosNotification::EventTypeSeq & removed);
 
 private:
     CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp
index 7f74ae1d07580..4dc06d51e3451 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp
@@ -15,5 +15,5 @@ Hello::get_string ()
 void
 Hello::shutdown ()
 {
-  this->orb_->shutdown (0 );
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp
index 6ad127f255fd5..58d437c5f68fb 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp
@@ -61,7 +61,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         orb->string_to_object (ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () );
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp
index 951ccc19cb72d..f62002d9634ae 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp
@@ -39,10 +39,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" );
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () );
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -65,7 +65,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () );
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index 5ca3fcfad9197..d2a9f33c2a117 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -75,7 +75,7 @@ Driver::run (int argc, ACE_TCHAR* argv[])
                   this->event_a_,
                   this->event_b_,
 
-                  this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")) );
+                  this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")));
 
       if (this->pid_file_name_ != 0)
         {
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index 8c51234d3051a..66b26fc2ac209 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -69,7 +69,7 @@ ECMS_Driver::run (int argc, ACE_TCHAR* argv[])
                   this->event_a_,
                   this->event_b_,
 
-                  this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")) );
+                  this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")));
 
       if (this->pid_file_name_ != 0)
         {
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index 2c8792999f297..cfba8db9ba9e7 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -70,7 +70,7 @@ ECM_Driver::run (int argc, ACE_TCHAR* argv[])
                   this->event_count_,
 
                   this->config_filename_?this->config_filename_:ACE_TEXT("nil"),
-                  this->pid_filename_?this->pid_filename_:ACE_TEXT("nil")) );
+                  this->pid_filename_?this->pid_filename_:ACE_TEXT("nil")));
 
       int i;
       for (i = 0; i < this->local_federations_count_; ++i)
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index 5ab4ea8cdc84e..c0f9d4769541f 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -205,7 +205,7 @@ Test_ECG::run (int argc, ACE_TCHAR* argv[])
                   this->lpc_event_b_,
 
                   this->schedule_file_?this->schedule_file_:ACE_TEXT("nil"),
-                  this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")) );
+                  this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")));
 
       print_priority_info ("Test_ECG::run (Main)");
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index cdd00671df5d3..a10cc5b53ade1 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -79,7 +79,7 @@ ECT_Consumer_Driver::run (int argc, ACE_TCHAR* argv[])
                       this->type_start_,
                       this->type_count_,
 
-                      this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")) );
+                      this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")));
         }
 
       if (this->pid_file_name_ != 0)
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index b4db10c310784..4168b9c133c90 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -90,7 +90,7 @@ ECT_Supplier_Driver::run (int argc, ACE_TCHAR* argv[])
                       this->type_start_,
                       this->type_count_,
 
-                      this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")) );
+                      this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")));
         }
 
       if (this->pid_file_name_ != 0)
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 29e4c432adc1e..d2eaa541490e7 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -119,8 +119,7 @@ ECT_Throughput::run (int argc, ACE_TCHAR* argv[])
                       this->supplier_type_shift_,
 
                       this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil"),
-                      this->ec_concurrency_hwm_
-                      ) );
+                      this->ec_concurrency_hwm_));
         }
 
       if (this->pid_file_name_ != 0)
diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp
index a46f3074570e8..2ada2260e4abc 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp
@@ -70,7 +70,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_ERROR ((LM_ERROR,
                   "Caught CORBA::Exception\n%C (%C)\n",
                   exc._name (),
-                  exc._rep_id ()) );
+                  exc._rep_id ()));
     }
 #else
   ACE_UNUSED_ARG (argc);
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
index 275830979d28e..e467d33550389 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
@@ -237,8 +237,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 #endif  /* !TAO_LACKS_EVENT_CHANNEL_ANY */
 
     if (iorfile != 0) {
-      CORBA::String_var str = orb->object_to_string( ec.in() );
-      std::ofstream iorFile( ACE_TEXT_ALWAYS_CHAR(iorfile) );
+      CORBA::String_var str = orb->object_to_string( ec.in());
+      std::ofstream iorFile( ACE_TEXT_ALWAYS_CHAR(iorfile));
       iorFile << str.in() << std::endl;
       iorFile.close();
     }
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index 1cd92c02a782b..c297a9147e311 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -209,8 +209,7 @@ EC_Driver::print_args () const
               this->supplier_type_count_,
               this->supplier_type_shift_,
 
-              this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")
-              ) );
+              this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")));
 }
 
 int
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
index a1b93d3b0525e..dff92a135826b 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
@@ -34,9 +34,7 @@ class FTClientMain
     long & counter,         // inout
     int & more,             // out
     ACE_CString & command,  // inout
-    int retry               // in
-    );
-
+    int retry);             // in
 
   int next_replica ();
 
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
index c08d2e9e12c69..c584181925ac2 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
@@ -110,12 +110,10 @@ class  FT_ReplicaFactory_i
   virtual CORBA::Object_ptr create_object (
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
-    PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-  );
+    PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id);
 
   virtual void delete_object (
-    const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-  );
+    const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id);
 
   //////////////////////////////////////////
   // CORBA interface PullMonitorable methods
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
index 380de17d08c41..ef6bfbb12f69e 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
@@ -130,8 +130,7 @@ class FT_TestReplica_i : public virtual POA_FT_TEST::TestReplica
   virtual void tao_update_object_group (
       const char * iogr,
       PortableGroup::ObjectGroupRefVersion version,
-      CORBA::Boolean is_primary
-    );
+      CORBA::Boolean is_primary);
 
   /////////////////
   // implementation
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
index 3745856fce72b..7af8b3bacd921 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
@@ -72,16 +72,13 @@ class StubBatchConsumer
     // CORBA methods
 
     virtual void push_structured_events (
-        const CosNotification::EventBatch & notifications
-      );
+        const CosNotification::EventBatch & notifications);
 
-    virtual void disconnect_sequence_push_consumer (
-      );
+    virtual void disconnect_sequence_push_consumer ();
 
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed
-      );
+        const CosNotification::EventTypeSeq & removed);
 
   ////////////////////
   // Forbidden methods
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
index 4ca9fcc8b1a97..89500455fd8f6 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
@@ -75,13 +75,11 @@ class StubFaultConsumer
     ////////////////
     // CORBA methods
     virtual void push_structured_event(
-      const CosNotification::StructuredEvent &notification
-      );
+      const CosNotification::StructuredEvent &notification);
 
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed
-      );
+        const CosNotification::EventTypeSeq & removed);
 
    virtual void disconnect_structured_push_consumer();
 
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
index 04ed9cdc8d8d4..20ee652624c97 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
@@ -81,30 +81,24 @@ ::PortableServer::POA_ptr _default_POA ();
 
 
   virtual void push_structured_fault (
-      const CosNotification::StructuredEvent & event
-    );
+      const CosNotification::StructuredEvent & event);
 
   virtual void push_sequence_fault (
-    const CosNotification::EventBatch & events
-  );
+    const CosNotification::EventBatch & events);
 
   virtual ::CosNotifyFilter::Filter_ptr create_subscription_filter (
-    const char * constraint_grammar
-  );
+    const char * constraint_grammar);
 
   virtual FT::FaultNotifier::ConsumerId connect_structured_fault_consumer (
     CosNotifyComm::StructuredPushConsumer_ptr push_consumer,
-    CosNotifyFilter::Filter_ptr filter
-  );
+    CosNotifyFilter::Filter_ptr filter);
 
   virtual FT::FaultNotifier::ConsumerId connect_sequence_fault_consumer (
     CosNotifyComm::SequencePushConsumer_ptr push_consumer,
-    CosNotifyFilter::Filter_ptr filter
-  );
+    CosNotifyFilter::Filter_ptr filter);
 
   virtual void disconnect_consumer (
-    FT::FaultNotifier::ConsumerId connection
-  );
+    FT::FaultNotifier::ConsumerId connection);
 
   //////////////////////////////////////////
   // CORBA interface PullMonitorable methods
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
index 105cfa6298c95..0579e77736425 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
@@ -225,8 +225,7 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_infrastructure_managed_group
     group = this->replication_manager_->create_object (
       type_id,
       criteria,
-      creation_id
-      );
+      creation_id);
   }
   else
   {
@@ -291,8 +290,7 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
       group = this->replication_manager_->create_object (
         type_id.in (),
         criteria,
-        creation_id
-        );
+        creation_id);
 
       //@@ this is a bit of a hack
       creation_id >>= group_id;
@@ -331,8 +329,7 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
           group_id,
           info.the_location);
 
-        const char * replica_ior = orb_->object_to_string (created_obj.in () );
-
+        const char * replica_ior = orb_->object_to_string (created_obj.in ());
 
         if (write_iors)
         {
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
index de1c62ad434f4..9fd2d63703685 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
@@ -83,7 +83,7 @@ do_failover_name_test (
   ACE_TCHAR *ns1ref,
   int c_breadth,
   int c_depth,
-  int o_breadth );
+  int o_breadth);
 
 /// Failover ObjectGroup Test
 int
@@ -92,7 +92,7 @@ do_failover_objectgroup_test (
   ACE_TCHAR *nm1ref,
   int c_breadth,
   int c_depth,
-  int o_breadth );
+  int o_breadth);
 
 //==============================================================================
 //
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl
index 2fc343e1dd9b3..5cdc55e33a614 100755
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl
@@ -289,8 +289,8 @@ ()
     my $client_stderr_file     = $client->LocalFile ($stderr_file);
 
     print_msg("Backup Restart Test");
-    init_naming_context_directory ($server, $name_dir );
-    init_naming_context_directory ($server, $group_dir );
+    init_naming_context_directory ($server, $name_dir);
+    init_naming_context_directory ($server, $group_dir);
 
     # Run two Naming Servers
     my $ns1_args = "--primary ".
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl
index 8ae1cd596a1e2..4b62db16f688b 100755
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl
@@ -292,8 +292,8 @@ ()
     my $client_stderr_file     = $client->LocalFile ($stderr_file);
 
     print_msg("Failover Test");
-    init_naming_context_directory ($server, $name_dir );
-    init_naming_context_directory ($server, $group_dir );
+    init_naming_context_directory ($server, $name_dir);
+    init_naming_context_directory ($server, $group_dir);
 
     # Run two Naming Servers
     my $ns1_args = "--primary ".
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl
index 134f9d7b8d962..94a44d04d434b 100755
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl
@@ -305,8 +305,8 @@ ()
     my $client_nm_iorfile = $client->LocalFile ($nm_iorfile);
 
     print_msg("Persistence Test");
-    init_persistence_dir ($server, $name_dir );
-    init_persistence_dir ($server, $group_dir );
+    init_persistence_dir ($server, $name_dir);
+    init_persistence_dir ($server, $group_dir);
 
     my $ns_args       = "-ORBListenEndPoints $ns_endpoint1 ".
                         "-ORBDebugLevel $debug_level " .
@@ -447,8 +447,8 @@ ()
     my $client_nm_iorfile = $client->LocalFile ($nm_iorfile);
 
     print_msg("Backup/Restore Test");
-    init_persistence_dir ($server, $name_dir );
-    init_persistence_dir ($server, $group_dir );
+    init_persistence_dir ($server, $name_dir);
+    init_persistence_dir ($server, $group_dir);
 
     my $ns_args       = "-ORBListenEndPoints $ns_endpoint1 ".
                         "-ORBDebugLevel $debug_level " .
diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl
index 622752897bd8b..4a31ff70524fc 100755
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl
@@ -113,11 +113,11 @@ ($$)
                       "-c $ns2_iorfile -g $nm2_iorfile ".
                       "-r $name_dir2";
 
-$NS1_PRIMARY = $ns1->CreateProcess($tao_ft_naming, $ns1_primary_args );
-$NS1_BACKUP  = $ns1->CreateProcess($tao_ft_naming, $ns1_backup_args );
+$NS1_PRIMARY = $ns1->CreateProcess($tao_ft_naming, $ns1_primary_args);
+$NS1_BACKUP  = $ns1->CreateProcess($tao_ft_naming, $ns1_backup_args);
 
-$NS2_PRIMARY = $ns2->CreateProcess($tao_ft_naming, $ns2_primary_args );
-$NS2_BACKUP  = $ns2->CreateProcess($tao_ft_naming, $ns2_backup_args );
+$NS2_PRIMARY = $ns2->CreateProcess($tao_ft_naming, $ns2_primary_args);
+$NS2_BACKUP  = $ns2->CreateProcess($tao_ft_naming, $ns2_backup_args);
 
 my $replica_primary_ior     = "ns_replica_primary.ior";
 my $ns1_replica_primary_ior = "$name_dir1/$replica_primary_ior";
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
index 0d0b4d96e0043..a63a673ef3520 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
@@ -169,7 +169,6 @@ Server_Request_Interceptor::receive_request (
         }
 
     }
-  return;
 }
 
 void
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
index 548e0defdf788..8e21a491314e5 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
@@ -99,8 +99,6 @@ add_ft_prop (CORBA::ORB_ptr o,
                                   obj2,
                                   obj2);
     }
-
-  return;
 }
 
 void test_colocal (ForwardRequestTest::test_ptr server)
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
index 0fb9f72b9fb88..1f7ce7f23afbd 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
@@ -19,8 +19,6 @@ Simple_Server_i::remote_call ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Print out from process id (%P) hosting the servant\n")));
-
-  return;
 }
 
 
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
index 239abafce8921..278bcd1dd8402 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
@@ -19,11 +19,9 @@ public virtual POA_RtecEventComm::PushConsumer
   PushConsumer_impl(CORBA::ORB_ptr orb);
 
     virtual void push (
-        const RtecEventComm::EventSet & data
-      );
+        const RtecEventComm::EventSet & data);
 
-    virtual void disconnect_push_consumer (
-      );
+    virtual void disconnect_push_consumer ();
 private:
   CORBA::ORB_var orb_;
   PushConsumer_impl(const PushConsumer_impl&);
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
index 0179d7bcf06ce..c87fe55be0ac0 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
@@ -27,8 +27,7 @@ class PushSupplier_impl :
 
   int init(RtecEventChannelAdmin::EventChannel_ptr);
 
-    virtual void  disconnect_push_supplier (
-      );
+    virtual void  disconnect_push_supplier ();
 private:
   class ReactorTask : public ACE_Task_Base
   {
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
index 96b34e5cb6138..15ac48ac812db 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
@@ -147,7 +147,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
   ACE_LOG_MSG->msg_ostream (this->output_file ());
 #endif /* ACE_HAS_PHARLAP */
 
-  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER );
+  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER);
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
 
   return 0;
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
index 834bce82088cb..68204a73c165c 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
@@ -252,8 +252,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       poa_var->destroy (1,  // ethernalize objects
-                        0  // wait for completion
-                        );
+                        0);  // wait for completion
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
index 96b34e5cb6138..15ac48ac812db 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
@@ -147,7 +147,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
   ACE_LOG_MSG->msg_ostream (this->output_file ());
 #endif /* ACE_HAS_PHARLAP */
 
-  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER );
+  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER);
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
 
   return 0;
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp
index 96b34e5cb6138..15ac48ac812db 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp
@@ -147,7 +147,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
   ACE_LOG_MSG->msg_ostream (this->output_file ());
 #endif /* ACE_HAS_PHARLAP */
 
-  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER );
+  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER);
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
 
   return 0;
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp
index 2eba63f0baf87..80e2edc83c461 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp
@@ -40,7 +40,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
@@ -50,7 +50,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     try
       {
-        test = Test::_narrow( obj.in() );
+        test = Test::_narrow( obj.in());
         if (killit)
           {
             test->terminate ();
@@ -80,7 +80,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           {
             if (CORBA::is_nil (test.in()))
               {
-                test = Test::_narrow( obj.in() );
+                test = Test::_narrow( obj.in());
               }
             if (killit)
               {
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl
index ec46d5d9079d8..9d1d8cf1ba97f 100755
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl
@@ -220,7 +220,7 @@ sub shutdown_server
     }
     # Shutting down any server object within the server will shutdown the whole server
     $TI->Arguments ($ti_cmd_base .
-                    "shutdown TestObject_a" );
+                    "shutdown TestObject_a");
     $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
     if ($TI_status != 0  && $TI_status != 5) {
         print STDERR "ERROR: tao_imr shutdown returned $TI_status\n";
@@ -237,7 +237,7 @@ sub manual_start_server
     }
     # Shutting down any server object within the server will shutdown the whole server
     $TI->Arguments ($ti_cmd_base .
-                    "start TestObject_a" );
+                    "start TestObject_a");
     $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
     if ($TI_status != 0) {
         print STDERR "ERROR: tao_imr start returned $TI_status\n";
diff --git a/TAO/orbsvcs/tests/ImplRepo/MT_stress/run_test_ft.pl b/TAO/orbsvcs/tests/ImplRepo/MT_stress/run_test_ft.pl
index 7852d4129d146..2e82d4c0b9b2b 100755
--- a/TAO/orbsvcs/tests/ImplRepo/MT_stress/run_test_ft.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/MT_stress/run_test_ft.pl
@@ -477,7 +477,7 @@ sub scale_test
     }
 
     print "Stopping servers\n";
-    do_ti_command (0, $srv_count, 1, "shutdown", "-q" );
+    do_ti_command (0, $srv_count, 1, "shutdown", "-q");
     wait_for_servers ();
 
     my $test_time = time() - $start_time;
diff --git a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp
index f745ab49a6937..36e248801f440 100644
--- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp
@@ -36,7 +36,7 @@ class Worker : public ACE_Task_Base
   int svc ()
   {
     int offset = get_offset ();
-    CORBA::String_var message = CORBA::string_dup( "Hello!" );
+    CORBA::String_var message = CORBA::string_dup( "Hello!");
     char user [100];
     ACE_OS::snprintf(user, 100, "client %d", offset / 100);
     int try_count = 0;
@@ -50,7 +50,7 @@ class Worker : public ACE_Task_Base
         pic->set_slot (slot_id, in);
         try
           {
-            messenger->send_message( user, "Test 1", message.inout() );
+            messenger->send_message( user, "Test 1", message.inout());
 
             ACE_DEBUG ((LM_INFO,
                         ACE_TEXT("(%P|%t) received response for ")
@@ -205,13 +205,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         new ORB_Initializer ();
       PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
-      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+      CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      CORBA::Object_var obj = orb->string_to_object( ior );
-      Messenger_var messenger = Messenger::_narrow( obj.in() );
+      CORBA::Object_var obj = orb->string_to_object(ior);
+      Messenger_var messenger = Messenger::_narrow(obj.in());
 
       obj = orb->resolve_initial_references ("PICurrent");
       pic = PortableInterceptor::Current::_narrow (obj.in ());
diff --git a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test.idl b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test.idl
index 1d72c17782743..10f295ec2abbe 100644
--- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test.idl
@@ -2,6 +2,5 @@ interface Messenger
 {
   boolean send_message ( in    string user_name,
                          in    string subject,
-                         inout string message );
-
+                         inout string message);
 };
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/java/taoimrtest/reconnectServer/Client.java b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/java/taoimrtest/reconnectServer/Client.java
index bdf5bccb05c76..cb8b212a926ce 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/java/taoimrtest/reconnectServer/Client.java
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/java/taoimrtest/reconnectServer/Client.java
@@ -65,7 +65,7 @@ public static void main (String args[])
         props.setProperty ("jacorb.log.default.verbosity","3");
         try
         {
-            org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, props );
+            org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, props);
             client.timeObj = TimeSrvHelper.narrow (orb.string_to_object ("file://A.ior"));
             client.runTest ();
             if (!client.testPassed ())
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp
index 14661239937ee..c5c6d68476816 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp
@@ -58,15 +58,15 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
     // Servant Retention Policy
     policies[1] =
-      rootPOA->create_servant_retention_policy (PortableServer::RETAIN );
+      rootPOA->create_servant_retention_policy (PortableServer::RETAIN);
 
     // ID Assignment Policy
     policies[2] =
-      rootPOA->create_id_assignment_policy (PortableServer::USER_ID );
+      rootPOA->create_id_assignment_policy (PortableServer::USER_ID);
 
     // Request Processing Policy
     policies[3] =
-      rootPOA->create_request_processing_policy (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY );
+      rootPOA->create_request_processing_policy (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY);
 
     // Threading policy
     policies[4] =
@@ -74,12 +74,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
     PortableServer::POA_var poa_a = rootPOA->create_POA ("poaA",
         poa_manager.in (),
-        policies
-        );
+        policies);
     PortableServer::POA_var poa_c = rootPOA->create_POA ("poaC",
         poa_manager.in (),
-        policies
-        );
+        policies);
 
     for (CORBA::ULong i = 0;
       i < policies.length ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
index 9f338efb08c8d..9d9afb07ecd6d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
@@ -71,15 +71,15 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
     // Servant Retention Policy
     policies[1] =
-      rootPOA->create_servant_retention_policy (PortableServer::RETAIN );
+      rootPOA->create_servant_retention_policy (PortableServer::RETAIN);
 
     // ID Assignment Policy
     policies[2] =
-      rootPOA->create_id_assignment_policy (PortableServer::USER_ID );
+      rootPOA->create_id_assignment_policy (PortableServer::USER_ID);
 
     // Request Processing Policy
     policies[3] =
-      rootPOA->create_request_processing_policy (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY );
+      rootPOA->create_request_processing_policy (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY);
 
     // Threading policy
     policies[4] =
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/server.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/server.cpp
index 0c7648f65e96d..3d9167045c0da 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/server.cpp
@@ -60,15 +60,15 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
     // Servant Retention Policy
     policies[1] =
-      rootPOA->create_servant_retention_policy (PortableServer::RETAIN );
+      rootPOA->create_servant_retention_policy (PortableServer::RETAIN);
 
     // ID Assignment Policy
     policies[2] =
-      rootPOA->create_id_assignment_policy (PortableServer::USER_ID );
+      rootPOA->create_id_assignment_policy (PortableServer::USER_ID);
 
     // Request Processing Policy
     policies[3] =
-      rootPOA->create_request_processing_policy (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY );
+      rootPOA->create_request_processing_policy (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY);
 
     // Threading policy
     policies[4] =
@@ -76,12 +76,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
     PortableServer::POA_var poa_a = rootPOA->create_POA ("poaA",
         poa_manager.in (),
-        policies
-        );
+        policies);
     PortableServer::POA_var poa_c = rootPOA->create_POA ("poaC",
         poa_manager.in (),
-        policies
-        );
+        policies);
 
     for (CORBA::ULong i = 0;
       i < policies.length ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp
index 2b765fc66e305..27a7cc1090c9f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp
@@ -61,26 +61,26 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
 
     // Destringify ior
-    CORBA::Object_var obj = orb->string_to_object( ior );
+    CORBA::Object_var obj = orb->string_to_object(ior);
     if (CORBA::is_nil(obj.in())) {
       std::cerr << "Nil Messenger reference" << std::endl;
       return 1;
     }
 
     // Narrow
-    Messenger_var messenger = Messenger::_narrow( obj.in() );
+    Messenger_var messenger = Messenger::_narrow( obj.in());
     if (CORBA::is_nil(messenger.in())) {
       std::cerr << "Argument is not a Messenger reference" << std::endl;
       return 1;
     }
 
-    CORBA::String_var message = CORBA::string_dup( "Hello!" );
+    CORBA::String_var message = CORBA::string_dup( "Hello!");
 
     int try_count = 0;
     int succeeded = 0;
@@ -90,7 +90,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                   "(%P|%t) - Sending message <%d> to server\n", try_count));
 
       try {
-        messenger->send_message( "TAO User", "Test 1", message.inout() );
+        messenger->send_message( "TAO User", "Test 1", message.inout());
 
         ACE_DEBUG ((LM_INFO,
             "(%P|%t) - Successfully received response for message <%d> to server\n", try_count));
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp b/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp
index 64238368882a9..001226a837a40 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp
@@ -83,7 +83,7 @@ do_restart_test ()
   CORBA::Object_var obj = orb->string_to_object (ior);
   ACE_ASSERT (!CORBA::is_nil(obj.in ()));
   obj = set_timeout_policy (obj.in (), ACE_Time_Value (5,0));
-  Test_var test = Test::_narrow( obj.in () );
+  Test_var test = Test::_narrow( obj.in ());
   ACE_ASSERT (!CORBA::is_nil(test.in ()));
   int attempt = 2;
   while (attempt > 0)
@@ -128,7 +128,7 @@ int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
-    orb = CORBA::ORB_init( argc, argv );
+    orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp
index 65910197c2503..42d2f93c38101 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp
@@ -36,14 +36,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
 
     CORBA::Object_var obj = orb->resolve_initial_references("Test");
     ACE_ASSERT (!CORBA::is_nil(obj.in()));
-    Test_var test = Test::_narrow( obj.in() );
+    Test_var test = Test::_narrow( obj.in());
     ACE_ASSERT (!CORBA::is_nil(test.in()));
 
     CORBA::Short n = test->get_server_num ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl
index c5b8c84b3dcfa..f3c8678ab9758 100755
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl
@@ -323,7 +323,7 @@ ()
 
     ##### Run client against servers to active them #####
     for(my $i = 0; $i < $servers_count; $i++ ) {
-	$CLI->Arguments ("-ORBInitRef Test=corbaloc::localhost:$port/$objprefix" . '_' . $i . "_a" . $debug );
+	$CLI->Arguments ("-ORBInitRef Test=corbaloc::localhost:$port/$objprefix" . '_' . $i . "_a" . $debug);
 	$CLI_status = $CLI->SpawnWaitKill ($cli->ProcessStartWaitInterval());
 	if ($CLI_status != 0) {
 	    print STDERR "ERROR: client returned $CLI_status\n";
@@ -368,7 +368,7 @@ (@)
 	my $status_file_name = $objprefix . "_$i.status";
         # Shutting down any server object within the server will shutdown the whole server
         $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ".
-                        "kill $objprefix" . '_' . $i . "_a -s $signum" );
+                        "kill $objprefix" . '_' . $i . "_a -s $signum");
         $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
         if ($TI_status != 0 && $TI_status != 5) {
             print STDERR "ERROR: tao_imr kill returned $TI_status\n";
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp
index 7feb962aa1394..6067c46338b3b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp
@@ -34,7 +34,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
@@ -44,7 +44,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     try
       {
-        test = Test::_narrow( obj.in() );
+        test = Test::_narrow( obj.in());
         if (killit)
           {
             test->terminate ();
@@ -65,7 +65,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           {
             if (CORBA::is_nil (test.in()))
               {
-                test = Test::_narrow( obj.in() );
+                test = Test::_narrow( obj.in());
               }
             CORBA::Short n = test->get_server_num ();
             ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/run_test.pl
index ede38443f6932..1fc599fafd4ce 100755
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/run_test.pl
@@ -190,7 +190,7 @@ sub shutdown_server
     my $expected = shift;
     # Shutting down any server object within the server will shutdown the whole server
     $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ".
-                    "shutdown TestObject_a" );
+                    "shutdown TestObject_a");
     $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
     if ($TI_status != $expected) {
         print STDERR "ERROR: tao_imr shutdown returned $TI_status expected $expected\n";
@@ -202,7 +202,7 @@ sub kill_server
 {
     # Shutting down any server object within the server will shutdown the whole server
     $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ".
-                    "kill TestObject_a -s 9" );
+                    "kill TestObject_a -s 9");
     $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
     if ($TI_status != 0) {
         print STDERR "ERROR: tao_imr kill returned $TI_status\n";
@@ -214,7 +214,7 @@ sub start_server_no_wait
 {
     # Shutting down any server object within the server will shutdown the whole server
     $TINW->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ".
-                      "start TestObject_a" );
+                      "start TestObject_a");
     $TI_status = $TINW->Spawn ($tinw->ProcessStartWaitInterval());
 
     if ($TI_status != 0) {
@@ -238,7 +238,7 @@ sub manual_start_server
 {
     # Shutting down any server object within the server will shutdown the whole server
     $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ".
-                    "start TestObject_a" );
+                    "start TestObject_a");
     $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
     if ($TI_status != 0) {
         print STDERR "ERROR: tao_imr start returned $TI_status\n";
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp b/TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp
index ae911872025ed..6e9548a87778a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp
@@ -35,7 +35,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
@@ -45,7 +45,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     ior += ".ior";
     ACE_DEBUG ((LM_DEBUG, "using target = %c, iorstr %s\n", target, ior.c_str()));
     CORBA::Object_var obj = orb->string_to_object (ior.c_str());
-    Test_var test = Test::_narrow( obj.in() );
+    Test_var test = Test::_narrow( obj.in());
     ACE_ASSERT (!CORBA::is_nil(test.in()));
 
     CORBA::Long spid = test->server_pid ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl
index 8b49865299cb5..0a8da2b599ee1 100755
--- a/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl
@@ -91,7 +91,7 @@
 print "===== Updating a server\n";
 
 $TI->Arguments("-ORBInitRef ImplRepoService=file://$ti_imriorfile"
-                    . " update Foo -w foodir" );
+                    . " update Foo -w foodir");
 
 $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
 if ($TI_status != 0) {
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp b/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp
index 35ca8593ce2c8..aa6888fef990f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp
@@ -36,7 +36,7 @@ void
 do_test ()
 {
   CORBA::Object_var obj = orb->string_to_object (ior);
-  Test_var test = Test::_narrow( obj.in () );
+  Test_var test = Test::_narrow( obj.in ());
   ACE_ASSERT (!CORBA::is_nil(test.in ()));
 
   try
@@ -61,7 +61,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   try
   {
-    orb = CORBA::ORB_init( argc, argv );
+    orb = CORBA::ORB_init(argc, argv);
   }
   catch(const CORBA::Exception& ex)
   {
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp b/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp
index c8bc7e309a6f4..b6ad50e5207de 100644
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp
@@ -62,7 +62,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
-      PortableServer::POA_var test_poa = createPOA (root_poa.in(), poa_name );
+      PortableServer::POA_var test_poa = createPOA (root_poa.in(), poa_name);
 
       Test_i *impl = new Test_i ();
       PortableServer::Servant_var<Test_i> test_servant = impl;
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp
index ad7d8f3511fdc..e85d56a9b7ea4 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp
@@ -34,7 +34,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
@@ -45,7 +45,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         ACE_DEBUG ((LM_DEBUG, "Client could not RIR Test\n"));
         return 1;
       }
-    Test_var test = Test::_narrow( obj.in() );
+    Test_var test = Test::_narrow( obj.in());
     if (CORBA::is_nil(test.in()))
       {
         ACE_DEBUG ((LM_DEBUG, "Client could not narrow Test\n"));
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp
index 0833f106602ce..d6d0b8054f230 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp
@@ -33,7 +33,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
@@ -44,7 +44,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         ACE_DEBUG ((LM_DEBUG, "Client could not RIR Test\n"));
         return 1;
       }
-    Test_var test = Test::_narrow( obj.in() );
+    Test_var test = Test::_narrow( obj.in());
     if (CORBA::is_nil(test.in()))
       {
         ACE_DEBUG ((LM_DEBUG, "Client could not narrow Test\n"));
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/oneway/run_test.pl
index 9e1e79e519765..f7c3f4602ddc0 100755
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/run_test.pl
@@ -156,7 +156,7 @@ ($$)
     my $debug_args = "-ORBDebugLevel $debug_level -ORBLogFile client.log" if ($debug_level > 0);
 
     print "Making requests using $init_ref $svc_conf $debug_args\n";
-    $proc->Arguments ("$init_ref $svc_conf $debug_args" );
+    $proc->Arguments ("$init_ref $svc_conf $debug_args");
 
     $CLI_status = $proc->SpawnWaitKill ($cli->ProcessStartWaitInterval());
     if ($CLI_status != 0) {
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp
index 5ed5aae5ca3b6..d402292899d2e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp
@@ -61,7 +61,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
@@ -99,7 +99,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     ///// Get object reference /////
     obj = orb->resolve_initial_references("Test");
     ACE_ASSERT (!CORBA::is_nil(obj.in()));
-    Test_var test = Test::_narrow( obj.in() );
+    Test_var test = Test::_narrow( obj.in());
     ACE_ASSERT (!CORBA::is_nil(test.in()));
 
     if (max_tries > 1)
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
index 9161b4765f418..d33667ecc5bd8 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
@@ -47,7 +47,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+      CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl
index b07c749f85ddc..613e48b714de0 100755
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl
@@ -25,8 +25,8 @@
 my $expect_transient = "";
 my $notify_locator = "";
 my $debuglog = "";
-my @srvlogfile = ( "", "", "" );
-my @cltlogfile = ( "", "", "" );
+my @srvlogfile = ( "", "", "");
+my @cltlogfile = ( "", "", "");
 my $actlogfile = "";
 my $loclogfile = "";
 my $back_store_flag = "";
@@ -46,8 +46,8 @@
 	    $debug_level = 10;
 	    $imr_debug_level = 3;
             $debuglog = "-ORBVerboseLogging 1 -ORBLogFile ";
-            @srvlogfile = ( "server1.log", "server2.log", "server3.log" );
-            @cltlogfile = ( "client1.log", "client2.log", "client3.log" );
+            @srvlogfile = ( "server1.log", "server2.log", "server3.log");
+            @cltlogfile = ( "client1.log", "client2.log", "client3.log");
             $actlogfile = "imr_act.log";
             $loclogfile = "imr_loc.log";
 	}
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/Test.idl b/TAO/orbsvcs/tests/ImplRepo/servers_list/Test.idl
index 33bd08b6fa756..f1978c9a4c18f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/Test.idl
@@ -1,12 +1,10 @@
 interface Test
 {
-
   // Return the number of the server after a delay
   short get_server_num (in short delay_secs);
 
   // After replying, abort process
   // delay_secs seconds.
-  oneway void abort ( in short delay_secs );
-
+  oneway void abort ( in short delay_secs);
 };
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp
index 6577003664afe..4804350e1b91b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp
@@ -42,14 +42,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
 
     CORBA::Object_var obj = orb->resolve_initial_references("Test");
     ACE_ASSERT (!CORBA::is_nil(obj.in()));
-    Test_var test = Test::_narrow( obj.in() );
+    Test_var test = Test::_narrow( obj.in());
     ACE_ASSERT (!CORBA::is_nil(test.in()));
 
     if (server_abort)
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
index 8b460c190def0..b4b1349834114 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
@@ -53,8 +53,7 @@ class IDL3_Client
                       const char *prefix);
 
   int component_attribute_test (
-      CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var &
-    );
+      CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var &);
 
   int component_inheritance_test (CORBA::ComponentIR::ComponentDef_var &);
 
@@ -75,23 +74,19 @@ class IDL3_Client
 
   int valuetype_attribute_test (
       CORBA::ExtValueDef::ExtFullValueDescription_var &,
-      const char *prefix
-    );
+      const char *prefix);
 
   int valuetype_operation_test (
       CORBA::ExtValueDef::ExtFullValueDescription_var &,
-      const char *prefix
-    );
+      const char *prefix);
 
   int valuetype_member_test (
       CORBA::ExtValueDef::ExtFullValueDescription_var &,
-      const char *prefix
-    );
+      const char *prefix);
 
   int valuetype_factory_test (
       CORBA::ExtValueDef::ExtFullValueDescription_var &,
-      const char *prefix
-    );
+      const char *prefix);
 
   int home_inheritance_test (CORBA::ComponentIR::HomeDef_var &);
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index d5ed2f7df0deb..a74c19130e27f 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
@@ -68,9 +68,7 @@ Admin_Client::init (int argc, ACE_TCHAR *argv[])
           ACE_ERROR_RETURN ((
               LM_ERROR,
               "Null objref from resolve_initial_references\n"
-            ),
-            -1
-          );
+            ), -1);
         }
 
       this->repo_ =
@@ -114,8 +112,7 @@ Admin_Client::run ()
         {
           for (CORBA::ULong j = 0; j < this->iterations_; ++j)
             {
-              (this->*test_array_[this->which_test_])(
-                );
+              (this->*test_array_[this->which_test_])();
             }
         }
     }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
index bbe381aecc46c..1535d3bc8e6b0 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
@@ -42,9 +42,7 @@ Latency_Query_Client::init (int argc,
           ACE_ERROR_RETURN ((
               LM_ERROR,
               "Null objref from resolve_initial_references\n"
-            ),
-            -1
-          );
+            ), -1);
         }
 
       this->repo_ =
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
index 7c97cfe3fe322..6cb797b60e03b 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
@@ -33,9 +33,7 @@ Ptest::init (int argc, ACE_TCHAR *argv[])
           ACE_ERROR_RETURN ((
               LM_ERROR,
               "Null objref from resolve_initial_references\n"
-            ),
-            -1
-          );
+            ), -1);
         }
 
       this->repo_ =
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
index 275395b536042..dcbbda028a574 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
@@ -122,7 +122,7 @@ NContextExt_Client_i::get_name ()
         case 7:
         case 8:
         case 9:
-          *name_componentPtr = 'A' + ( ACE_OS::rand () % 26 );
+          *name_componentPtr = 'A' + ( ACE_OS::rand () % 26);
           ++name_componentPtr;
           break;
 
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 371e7cdc3e904..b06fc0584e274 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
@@ -440,7 +440,7 @@ BasicLog_Test::test_logCompaction(CORBA::ULong lifeExpectancy)
       ACE_ERROR_RETURN((LM_ERROR,
                         "Log compaction failed, because %d records remain.\n",
                         ACE_U64_TO_U32 (new_n_records)),
-                       -1 );
+                       -1);
     }
 
   return 0;
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
index b3988e5bb1a28..3a3075b2b7bae 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
@@ -85,7 +85,7 @@ delete_records (CORBA::ULongLong numberOfRecords);
   // 4. retrieve the records backwards. Compare to records writen.
   // 5. repeat 3 and 4 using iterator.
 
-  int test_query(CORBA::ULong numberOfRecords  = 1000 );
+  int test_query(CORBA::ULong numberOfRecords  = 1000);
   // 1. write the records with NVList.
   // 2. query the records and compare the records
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
index 43f27debf0ea4..38901d4fdc1c2 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
@@ -28,8 +28,7 @@ class AdminProperties_StructuredPushConsumer : public TAO_Notify_Tests_Structure
   AdminProperties_StructuredPushConsumer (AdminProperties* client);
 
   // = StructuredPushSupplier methods
-  virtual void push_structured_event (const CosNotification::StructuredEvent & notification
-                                      );
+  virtual void push_structured_event (const CosNotification::StructuredEvent & notification);
 
 protected:
   AdminProperties* client_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
index 746340a167182..84eb77280601e 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
@@ -124,7 +124,7 @@ ConnectDisconnect::init (int argc,
                   TAO_Notify_Tests_SequencePushSupplier*[this->suppliers_],
                   -1);
 
-  consumer_start( 0 );
+  consumer_start(0);
   return 0;
 }
 
@@ -248,12 +248,10 @@ ConnectDisconnect::run_test ()
           this->any_consumer_[i]->disconnect ();
 
           // Disconnect Structured Consumers.
-          this->structured_consumer_[i]->disconnect (
-                                           );
+          this->structured_consumer_[i]->disconnect ();
 
           // Disconnect Sequence Consumers.
-          this->sequence_consumer_[i]->disconnect (
-                                     );
+          this->sequence_consumer_[i]->disconnect ();
         }
 
       for (i = 0; i < this->suppliers_; ++i)
@@ -262,12 +260,10 @@ ConnectDisconnect::run_test ()
           this->any_supplier_[i]->disconnect ();
 
           // Disconnect Structured Suppliers.
-          this->structured_supplier_[i]->disconnect (
-                                           );
+          this->structured_supplier_[i]->disconnect ();
 
           // Disconnect Sequence Suppliers.
-          this->sequence_supplier_[i]->disconnect (
-                                         );
+          this->sequence_supplier_[i]->disconnect ();
         }
     }
 }
@@ -275,7 +271,7 @@ ConnectDisconnect::run_test ()
 void
 ConnectDisconnect::end_test ()
 {
-  consumer_done( 0 );
+  consumer_done(0);
 }
 
 int
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
index 7885ea0f7f21a..faffb62ee9083 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -111,7 +111,7 @@ Events::init (int argc,
 
   this->supplier_->connect (this->supplier_admin_.in ());
 
-  consumer_start( 0 );
+  consumer_start(0);
 
   return 0;
 }
@@ -259,7 +259,7 @@ Events::run_test ()
 void
 Events::end_test ()
 {
-  consumer_done( 0 );
+  consumer_done(0);
 }
 
 int
@@ -301,7 +301,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       events.run_test ();
 
-      events.ORB_run( );
+      events.ORB_run();
     }
   catch (const CORBA::Exception& se)
     {
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.h b/TAO/orbsvcs/tests/Notify/Basic/Events.h
index 7c00500116c7e..49ae0f05c330b 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.h
@@ -33,8 +33,7 @@ class Event_StructuredPushConsumer : public TAO_Notify_Tests_StructuredPushConsu
 
   // = StructuredPushSupplier methods.
   virtual void push_structured_event (
-      const CosNotification::StructuredEvent & notification
-    );
+      const CosNotification::StructuredEvent & notification);
 
 protected:
   Events * test_client_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp
index 82617521dc8da..172062a51ee4b 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp
@@ -104,7 +104,7 @@ ExtendedFilter::run_filter_test (CosNotifyFilter::FilterAdmin_ptr filter_admin)
   CosNotifyFilter::FilterID id_dup = extffact->get_filterid (filter.in());
   ACE_ASSERT (id_dup == id_1);
 #if defined (ACE_NDEBUG)
-  ACE_UNUSED_ARG (id_dup );
+  ACE_UNUSED_ARG (id_dup);
 #endif
 
   if (TAO_debug_level)
@@ -113,13 +113,13 @@ ExtendedFilter::run_filter_test (CosNotifyFilter::FilterAdmin_ptr filter_admin)
   bool id_lookup_failed = false;
   try {
     CosNotifyFilter::FilterID id_ne = extffact2->get_filterid (filter.in());
-    ACE_UNUSED_ARG (id_ne );
+    ACE_UNUSED_ARG (id_ne);
   } catch (const CORBA::INTERNAL& ) {
     id_lookup_failed = true;
     }
-  ACE_ASSERT (id_lookup_failed );
+  ACE_ASSERT (id_lookup_failed);
 #if defined (ACE_NDEBUG)
-  ACE_UNUSED_ARG (id_lookup_failed );
+  ACE_UNUSED_ARG (id_lookup_failed);
 #endif
 
   if (TAO_debug_level)
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index 1aa200406590b..f4185a34d3af9 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
@@ -104,9 +104,7 @@ IdAssignment::init (int argc,
     }
 
   this->notify_factory_ =
-    CosNotifyChannelAdmin::EventChannelFactory::_narrow (
-        obj.in()
-      );
+    CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in());
 }
 
 CosNotifyChannelAdmin::ChannelID
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
index 4f55c09ecce68..19b8e23ac7afc 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
@@ -32,11 +32,9 @@ class IdAssignment
   void destroy_ec (CosNotifyChannelAdmin::ChannelID id);
 
   CosNotifyChannelAdmin::AdminID create_supplier_admin (
-      CosNotifyChannelAdmin::ChannelID channel_id
-    );
+      CosNotifyChannelAdmin::ChannelID channel_id);
   CosNotifyChannelAdmin::AdminID create_consumer_admin (
-      CosNotifyChannelAdmin::ChannelID channel_id
-    );
+      CosNotifyChannelAdmin::ChannelID channel_id);
 
   void destroy_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id,
                                CosNotifyChannelAdmin::AdminID admin_id);
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
index 35efeb81fee70..fff98c3ee41f6 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
@@ -79,9 +79,7 @@ LifeCycle::init (int argc, ACE_TCHAR *argv[])
   CORBA::Object_var obj = rootNC->resolve (name);
 
   notify_factory_ =
-    CosNotifyChannelAdmin::EventChannelFactory::_narrow (
-        obj.in()
-      );
+    CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in());
 
   if (CORBA::is_nil (notify_factory_.in ()))
     {
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index c44e33bd11796..d79734344147f 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
@@ -184,7 +184,7 @@ MultiTypes::init (int argc,
 
   sequence_supplier_->connect (this->supplier_admin_.in ());
 
-  consumer_start( 0 );
+  consumer_start(0);
 
   return 0;
 }
@@ -311,7 +311,7 @@ MultiTypes::wait_for_all_consumers (int expected_count_per_consumer)
 void
 MultiTypes::end_test ()
 {
-  consumer_done( 0 );
+  consumer_done(0);
 }
 
 int
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
index 42bf14f16ec20..1deb3c1001cca 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
@@ -35,9 +35,7 @@ class MultiTypes_PushConsumer : public TAO_Notify_Tests_PushConsumer
 public:
   MultiTypes_PushConsumer (MultiTypes* client);
 
-  void push (
-             const CORBA::Any & data
-             );
+  void push (const CORBA::Any & data);
 
 protected:
   MultiTypes* client_;
@@ -51,8 +49,7 @@ class MultiTypes_StructuredPushConsumer : public TAO_Notify_Tests_StructuredPush
   MultiTypes_StructuredPushConsumer (MultiTypes* client);
 
   // = StructuredPushSupplier methods
-  virtual void push_structured_event (const CosNotification::StructuredEvent & notification
-                                      );
+  virtual void push_structured_event (const CosNotification::StructuredEvent & notification);
 
 protected:
   MultiTypes* client_;
@@ -65,8 +62,7 @@ class MultiTypes_SequencePushConsumer : public TAO_Notify_Tests_SequencePushCons
 
   // = SequencePushConsumer methods
   virtual void push_structured_events (
-        const CosNotification::EventBatch & notifications
-      );
+        const CosNotification::EventBatch & notifications);
 
 protected:
   MultiTypes* client_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
index 95c018b7b9178..3a12f9a84ff22 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
@@ -294,7 +294,7 @@ Sequence::run_test ()
 void
 Sequence::end_test ()
 {
-  consumer_done( 0 );
+  consumer_done(0);
 }
 
 int
@@ -335,7 +335,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       events.run_test ();
 
-      events.ORB_run( );
+      events.ORB_run();
     }
   catch (const CORBA::Exception& se)
     {
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
index eae8c77fbb88e..81c53e7c4fd18 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
@@ -92,7 +92,7 @@ Simple_Test::init (int argc,
 
   this->supplier_->connect (this->supplier_admin_.in ());
 
-  consumer_start( 0 );
+  consumer_start(0);
 
   return 0;
 }
@@ -178,7 +178,7 @@ Simple_Test::run_test ()
 void
 Simple_Test::end_test ()
 {
-  consumer_done( 0 );
+  consumer_done(0);
 }
 
 int
@@ -220,7 +220,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       events.run_test ();
 
-      events.ORB_run( );
+      events.ORB_run();
     }
   catch (const CORBA::Exception& se)
     {
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
index 0a63e19b23b05..0c54c254799f5 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
@@ -33,9 +33,7 @@ class Event_AnyPushConsumer : public TAO_Notify_Tests_PushConsumer
   Event_AnyPushConsumer (Simple_Test *test_client);
 
   // = PushSupplier methods
-  virtual void push (
-      const CORBA::Any & data
-    );
+  virtual void push (const CORBA::Any & data);
 
 protected:
   Simple_Test * test_client_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
index cbe9439b9b739..5910612b6fb26 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
@@ -209,9 +209,7 @@ Updates::test_subscription_change ()
         this->print_event_types (removed);
       }
 
-    this->consumer_->get_proxy_supplier ()->subscription_change (added,
-                                                                 removed
-                                                                 );
+    this->consumer_->get_proxy_supplier ()->subscription_change (added, removed);
 
     this->wait_for_updates (3, 0); // The supplier should receive Added (RED, GREEN, BLUE)
 
@@ -245,9 +243,7 @@ Updates::test_subscription_change ()
         this->print_event_types (removed);
       }
 
-    this->consumer_->get_proxy_supplier ()->subscription_change (added,
-                                                                 removed
-                                                                 );
+    this->consumer_->get_proxy_supplier ()->subscription_change (added, removed);
 
     this->wait_for_updates (1, 0); // The supplier should receive Added (PURPLE).
 
@@ -279,9 +275,7 @@ Updates::test_subscription_change ()
         this->print_event_types (removed);
       }
 
-    this->consumer_->get_proxy_supplier ()->subscription_change (added,
-                                                                 removed
-                                                                 );
+    this->consumer_->get_proxy_supplier ()->subscription_change (added, removed);
 
     this->wait_for_updates (0, 4);
     // The supplier should receive Remove {RED, GREEN} out of the 4 actally removed (RED, GREEN, BLUE, PURPLE) becaue that whats it offered for.
@@ -327,9 +321,7 @@ Updates::test_offer_change ()
         this->print_event_types (removed);
       }
 
-    this->supplier_->get_proxy_consumer ()->offer_change (added,
-                                                          removed
-                                                          );
+    this->supplier_->get_proxy_consumer ()->offer_change (added, removed);
 
     this->wait_for_updates (3, 0); // The consumer should receive Added (RED, GREEN, BLUE)
 
@@ -363,9 +355,7 @@ Updates::test_offer_change ()
         this->print_event_types (removed);
       }
 
-    this->supplier_->get_proxy_consumer ()->offer_change (added,
-                                                          removed
-                                                                 );
+    this->supplier_->get_proxy_consumer ()->offer_change (added, removed);
 
     this->wait_for_updates (1, 0); // The consumer should receive Added (PURPLE).
 
@@ -397,9 +387,7 @@ Updates::test_offer_change ()
         this->print_event_types (removed);
       }
 
-    this->supplier_->get_proxy_consumer ()->offer_change (added,
-                                                          removed
-                                                          );
+    this->supplier_->get_proxy_consumer ()->offer_change (added, removed);
 
     this->wait_for_updates (0, 4);
     // The consumer should receive Remove {RED, GREEN} out of the 4 actally removed (RED, GREEN, BLUE, PURPLE) becaue that whats it offered for.
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.h b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
index 821a4b5453cd1..635f581017eb0 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
@@ -53,8 +53,7 @@ class Updates_StructuredPushSupplier : public TAO_Notify_Tests_StructuredPushSup
   /// Subscription change is conveyed here.
   virtual void subscription_change (
       const CosNotification::EventTypeSeq & added,
-      const CosNotification::EventTypeSeq & removed
-    );
+      const CosNotification::EventTypeSeq & removed);
 
 protected:
   Updates* test_client_;
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
index 80642923154c7..c75a790f8c54d 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
@@ -178,7 +178,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       CORBA::ORB_ptr orb = client.orb ();
 
       // Activate the signaler with the POA
-      sig_impl.reset( new sig_i( orb ) );
+      sig_impl.reset( new sig_i(orb));
       sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
index 78d30d45a732d..7da4193f69434 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
@@ -187,7 +187,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           CORBA::ORB_ptr orb = client.orb ();
 
           // Activate the signaler with the POA
-          sig_impl.reset ( new sig_i ( orb ) );
+          sig_impl.reset ( new sig_i (orb));
           sig_var sig = sig_impl->_this ();
 
           CORBA::String_var ior =
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
index 6c6fe50abf2d4..d18e1b903c772 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
@@ -194,7 +194,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       CORBA::ORB_ptr orb = client.orb ();
 
-      sig_impl.reset( new sig_i( orb ) );
+      sig_impl.reset( new sig_i(orb));
       sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
index 5be7ee1c1434e..b6b31728320d0 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
@@ -90,8 +90,7 @@ void loadunloadcycle()
   v_ec = v_notifyFactory->create_channel(
     initialQos,
     initialAdmin,
-    id
-  );
+    id);
 
   ACE_DEBUG((
     LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp
index 83261e62705ca..2e9f2f5cf5c82 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp
@@ -74,8 +74,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[])
 
   this->activate(
     THR_NEW_LWP|THR_JOINABLE|THR_INHERIT_SCHED,
-    threadCnt
-  );
+    threadCnt);
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("init mp_barrier->wait() ...\n")));
   ma_barrier_->wait();
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("init mp_barrier->wait() done\n")));
@@ -83,7 +82,6 @@ DllOrb::init (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-
 int
 DllOrb::fini ()
 {
@@ -163,7 +161,7 @@ int DllOrb::svc ()
   }
 
   return 0;
-} /* end of DllOrb::svc ( ) */
+} /* end of DllOrb::svc () */
 
 
 ACE_FACTORY_DEFINE (bug_3252, DllOrb)
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
index 23a8719f7831a..a766af31cb0ba 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
@@ -69,9 +69,7 @@ loadNotify(ACE_Service_Config & service_config)
     p_notifyService->init_service(v_orb.in());
 
     CosNotifyChannelAdmin::EventChannelFactory_var v_notifyFactory =
-      p_notifyService->create(
-        v_rootPOA.in()
-      );
+      p_notifyService->create(v_rootPOA.in());
     ACE_DEBUG ((LM_INFO, ACE_TEXT ("got EventChannelFactory\n")));
 
     // create an event channel
@@ -84,8 +82,7 @@ loadNotify(ACE_Service_Config & service_config)
       v_notifyFactory->create_channel(
         initialQos,
         initialAdmin,
-        id
-      );
+        id);
     ACE_DEBUG ((LM_INFO, ACE_TEXT ("got EventChannel\n")));
 
     CosNotifyFilter::FilterFactory_var v_filterFactory =
@@ -156,8 +153,7 @@ ACE_TMAIN(int, ACE_TCHAR **argv)
                                ACE_DEFAULT_LOGGER_KEY,
                                true, // ignore_static_svcs = 1,
                                true, // ignore_default_svc_conf_file = 0,
-                               false  // ignore_debug_flag = 0
-                               );
+                               false);  // ignore_debug_flag = 0
 
   if(0 != result)
     {
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp
index 596cb624502b4..482ffe8721c37 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp
@@ -40,22 +40,18 @@ bool TestBroadcaster::connect(
     v_supplierAdmin =
       v_eventChannel->new_for_suppliers (
       CosNotifyChannelAdmin::OR_OP,
-      supplierAdminId
-    );
+      supplierAdminId);
 
     v_proxyConsumer = v_supplierAdmin->obtain_notification_push_consumer(
       CosNotifyChannelAdmin::SEQUENCE_EVENT,
-      proxyConsumerId
-    );
+      proxyConsumerId);
 
     mv_sequenceProxyPushConsumer =
       CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow(
-        v_proxyConsumer.in()
-      );
+        v_proxyConsumer.in());
 
     mv_sequenceProxyPushConsumer->connect_sequence_push_supplier(
-      CosNotifyComm::SequencePushSupplier::_nil()
-    );
+      CosNotifyComm::SequencePushSupplier::_nil());
   }
   catch(...)
   {
@@ -85,7 +81,7 @@ bool TestBroadcaster::disconnect()
 } /* end of TestBroadcaster::disconnect */
 
 
-bool TestBroadcaster::sendData( )
+bool TestBroadcaster::sendData()
 {
   try
   {
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h
index 3438aff5c4351..8685542fc1c81 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h
@@ -12,22 +12,21 @@ class bug3688_Export TestBroadcaster
   // public types and methods
   public:
     /// Default constructor.
-    TestBroadcaster ( );
+    TestBroadcaster ();
 
     /// Destructor.
-    ~TestBroadcaster ( )
+    ~TestBroadcaster ()
       throw ();
 
     bool connect(
       CORBA::ORB_ptr p_orb,
-      std::string const & rc_channelIor
-    );
+      std::string const & rc_channelIor);
 
-    bool disconnect( );
+    bool disconnect();
 
-    bool isConnected( ) const;
+    bool isConnected() const;
 
-    bool sendData( );
+    bool sendData();
 
   // protected types and methods
   protected:
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp
index bd387c2fd5b24..0b12de46451a0 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp
@@ -22,8 +22,7 @@ TestListener::TestListener(
 
   mv_consumerAdmin = mv_eventChannel->new_for_consumers(
     CosNotifyChannelAdmin::AND_OP,
-    m_consumerAdminId
-  );
+    m_consumerAdminId);
 
   CosNotifyFilter::FilterFactory_var v_filterFactory =
     mv_eventChannel->default_filter_factory();
@@ -53,13 +52,11 @@ TestListener::TestListener(
   CosNotifyChannelAdmin::ProxySupplier_var v_proxySupplier =
     mv_consumerAdmin->obtain_notification_push_supplier(
       CosNotifyChannelAdmin::STRUCTURED_EVENT,
-      m_proxySupplierId
-    );
+      m_proxySupplierId);
 
   mv_proxySupplier =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow(
-      v_proxySupplier.in()
-    );
+      v_proxySupplier.in());
 
   mv_proxySupplier->connect_structured_push_consumer(mv_structuredPushConsumer.in());
 }
@@ -83,8 +80,7 @@ TestListener::~TestListener()
 
 
 void TestListener::push_structured_event (
-  const CosNotification::StructuredEvent & notification
-)
+  const CosNotification::StructuredEvent & notification)
 {
   CORBA::Long data;
   notification.remainder_of_body >>= data;
@@ -92,12 +88,10 @@ void TestListener::push_structured_event (
   m_receivedData.push_back(data);
 }
 
-
-void TestListener::disconnect_structured_push_consumer ( )
+void TestListener::disconnect_structured_push_consumer ()
 {
 }
 
-
 void TestListener::offer_change(
   const CosNotification::EventTypeSeq & ,
   const CosNotification::EventTypeSeq &
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h
index ee832c1a75905..3315f08aad0f9 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h
@@ -17,21 +17,18 @@ struct bug3688_Export TestListener
   TestListener(
     CORBA::ORB * p_orb,
     std::string const & rc_channelIor,
-    std::string const & rc_filterExpression = ""
-  );
+    std::string const & rc_filterExpression = "");
 
   ~TestListener();
 
   virtual void push_structured_event (
-    const CosNotification::StructuredEvent & notification
-  );
+    const CosNotification::StructuredEvent & notification);
 
-  virtual void disconnect_structured_push_consumer ( );
+  virtual void disconnect_structured_push_consumer ();
 
   virtual void offer_change(
     const CosNotification::EventTypeSeq & added,
-    const CosNotification::EventTypeSeq & removed
-  );
+    const CosNotification::EventTypeSeq & removed);
 
   PortableServer::POA_var mv_rootPOA;
   PortableServer::ObjectId_var mv_oid;
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
index b60ec30150f2a..788178afc46f3 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
@@ -59,8 +59,7 @@ int publish()
 
   testBroadcaster.connect(
     v_orb.in(),
-    "corbaname:rir:#Channel1"
-  );
+    "corbaname:rir:#Channel1");
 
   TestListener testListener(
     v_orb.in(),
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
index 16973aee91052..7c6a81077d0c2 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
@@ -157,7 +157,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     ACE_DEBUG((LM_DEBUG, "Consumer waiting for events...\n"));
 
-    client.ORB_run( );
+    client.ORB_run();
 
     ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
     consumer_1->disconnect();
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
index 20465eccd264b..690f94e507d2b 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
@@ -219,7 +219,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         ec->set_qos (qos);
       }
 
-      sig_impl.reset( new sig_i( client.orb() ) );
+      sig_impl.reset( new sig_i(client.orb()));
       sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
index 3b4e95cdb0357..c7516eca02eb7 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
@@ -158,7 +158,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
               ACE_DEBUG((LM_DEBUG, "Consumer waiting for events...\n"));
 
-              client.ORB_run( );
+              client.ORB_run();
 
               ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
               consumer_1->disconnect();
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
index 2b91c8ab7e8fa..2fb1055dc3783 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
@@ -201,7 +201,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         ec->set_qos (qos);
       }
 
-      sig_impl.reset( new sig_i( client.orb() ) );
+      sig_impl.reset( new sig_i(client.orb()));
       sig_var sig = sig_impl->_this ();
 
       // If the ior_output_file exists, output the ior to it
diff --git a/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp
index 9765a241f0fd7..7b3ec37371c62 100644
--- a/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp
@@ -178,7 +178,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       client.ORB_run ();
 #ifdef PAUSE_ON_EXIT
       _cputs( "All events received. Still connected.\n");
-      _cputs( "Hit a key to exit consumer: " );
+      _cputs( "Hit a key to exit consumer: ");
       _getch();
 #endif // PAUSE_ON_EXIT
       ACE_DEBUG ((LM_DEBUG, "Consumer done.\n"));
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
index da526b3a03831..bac88e1151dd6 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
@@ -153,7 +153,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         // Tell the supplier to go
         sig->go ();
 
-        client.ORB_run( );
+        client.ORB_run();
 
         disconnect_consumers();
 
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
index 02e67aa9e60c4..06435cd4c45dc 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
@@ -196,7 +196,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     CORBA::ORB_ptr orb = client.orb ();
 
-    sig_impl.reset( new sig_i( orb ) );
+    sig_impl.reset( new sig_i(orb));
     sig_var sig = sig_impl->_this ();
 
     CORBA::String_var ior =
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
index 635d393a0ce02..c586dd0e012ee 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
@@ -149,7 +149,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     sig->go ();
 
-    client.ORB_run( );
+    client.ORB_run();
 
     ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
     consumer_1->disconnect();
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
index 305da5fe9b7bd..7af661f903f33 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
@@ -211,7 +211,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     CORBA::ORB_ptr orb = client.orb ();
 
-    sig_impl.reset( new sig_i( orb ) );
+    sig_impl.reset( new sig_i(orb));
     sig_var sig = sig_impl->_this ();
 
     CORBA::String_var ior =
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
index bec30a6d1f06c..0df3dded20358 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
@@ -145,7 +145,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     sig->go ();
 
-    client.ORB_run( );
+    client.ORB_run();
 
     ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
     consumer_1->disconnect();
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
index f1e9fae8521ce..7e7b31b43ef8a 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
@@ -207,7 +207,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     CORBA::ORB_ptr orb = client.orb ();
 
-    sig_impl.reset( new sig_i( orb ) );
+    sig_impl.reset( new sig_i(orb));
     sig_var sig = sig_impl->_this ();
 
     CORBA::String_var ior =
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
index ea18634280e0c..84674908576cf 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
@@ -248,11 +248,10 @@ class Filter_StructuredPushSupplier : public POA_CosNotifyComm::StructuredPushSu
   // = NotifySubscribe
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed
-                                    );
+        const CosNotification::EventTypeSeq & removed);
 
   // = StructuredPushSupplier method
-    virtual void disconnect_structured_push_supplier ();
+  virtual void disconnect_structured_push_supplier ();
 };
 
 /***************************************************************************/
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp
index 3cce413cf5b98..b1cd05702fdcb 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp
@@ -214,7 +214,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       CORBA::ORB_ptr orb = client.orb ();
 
       // Activate the signaler with the POA
-      sig_impl.reset( new sig_i( orb ) );
+      sig_impl.reset( new sig_i(orb));
       sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index 4ac6284aa8173..664ee1f26461f 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -994,7 +994,7 @@ Consumer_Main::save_ids()
       static_cast<int> (structured_proxy_id_),
       static_cast<int> (sequence_proxy_id_),
       static_cast<int> (any_proxy_id_),
-      static_cast<int> (endflag) );
+      static_cast<int> (endflag));
     ACE_OS::fclose (idf);
   }
 }
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
index 39589a2c2fc98..a4dd8f1e0f334 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
@@ -26,15 +26,12 @@ class StructuredPushConsumer_i : public virtual POA_CosNotifyComm::StructuredPus
   StructuredPushConsumer_i ();
   virtual void offer_change (
       const CosNotification::EventTypeSeq & added,
-      const CosNotification::EventTypeSeq & removed
-    );
+      const CosNotification::EventTypeSeq & removed);
 
   virtual void push_structured_event (
-        const CosNotification::StructuredEvent & notification
-      );
+        const CosNotification::StructuredEvent & notification);
 
-  virtual void disconnect_structured_push_consumer (
-    );
+  virtual void disconnect_structured_push_consumer ();
 
   size_t received () const;
   void set_expectations (size_t expecte, size_t fail, size_t serial_number, bool verbose);
@@ -63,15 +60,12 @@ class SequencePushConsumer_i : public virtual POA_CosNotifyComm::SequencePushCon
   SequencePushConsumer_i ();
   virtual void offer_change (
       const CosNotification::EventTypeSeq & added,
-      const CosNotification::EventTypeSeq & removed
-    );
+      const CosNotification::EventTypeSeq & removed);
 
   virtual void push_structured_events (
-        const CosNotification::EventBatch & notifications
-      );
+        const CosNotification::EventBatch & notifications);
 
-  virtual void disconnect_sequence_push_consumer (
-    );
+  virtual void disconnect_sequence_push_consumer ();
 
   size_t received () const;
   void set_expectations (size_t expecte, size_t fail, size_t serial_number, bool verbose);
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
index 1e58c719da227..346246d79cc3b 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
@@ -402,7 +402,7 @@ Supplier_Main::save_ids()
       static_cast<int> (structured_proxy_id_),
       static_cast<int> (sequence_proxy_id_),
       static_cast<int> (any_proxy_id_),
-      static_cast<int> (endflag) );
+      static_cast<int> (endflag));
     ACE_OS::fclose (idf);
   }
 }
@@ -742,9 +742,7 @@ Supplier_Main::init_structured_proxy_consumer ()
   {
     try
     {
-      proxy = this->sa_->get_proxy_consumer (
-                          this->structured_proxy_id_
-                        );
+      proxy = this->sa_->get_proxy_consumer (this->structured_proxy_id_);
       ok = ! CORBA::is_nil (proxy.in ());
       if (ok && this->verbose_)
       {
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
index b2fd42bbe1eca..4741cdba81c61 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
@@ -164,7 +164,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
               // Tell the supplier to go
               sig->go ();
 
-              client.ORB_run( );
+              client.ORB_run();
               ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
 
               sig->done ();
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
index e4a5a5264015b..cc37a479d4dbd 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
@@ -208,7 +208,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       CORBA::ORB_ptr orb = client.orb ();
 
-      sig_impl.reset( new sig_i( orb ) );
+      sig_impl.reset( new sig_i(orb));
       sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
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 1cb8deed5079c..f12c165053941 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
@@ -157,7 +157,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     // Tell the supplier to go
     sig->go ();
 
-    client.ORB_run( );
+    client.ORB_run();
     ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
 
     sig->done ();
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
index 1c243044ec6cc..ac1715fd5a3e3 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
@@ -210,7 +210,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       CORBA::ORB_ptr orb = client.orb ();
 
-      sig_impl.reset( new sig_i( orb ) );
+      sig_impl.reset( new sig_i(orb));
       sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
index 51ddc643cc320..3379933474d18 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
@@ -131,7 +131,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     sig->go ();
 
-    client.ORB_run( );
+    client.ORB_run();
 
     ACE_DEBUG((LM_DEBUG, "\nConsumer done.\n"));
 
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
index c7dd4fc303b6d..eef03ef2f3bc8 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
@@ -168,7 +168,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     CORBA::ORB_ptr orb = client.orb ();
 
-    sig_impl.reset( new sig_i( orb ) );
+    sig_impl.reset( new sig_i(orb));
     sig_var sig = sig_impl->_this ();
 
     CosNotifyChannelAdmin::SupplierAdmin_var admin =
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
index afaedc73a36ed..d58e385912871 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
@@ -151,7 +151,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     sig->go ();
 
-    client.ORB_run( );
+    client.ORB_run();
 
     ACE_DEBUG((LM_DEBUG, "\nConsumer done.\n"));
 
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
index 551a8146bd232..d8678048838c9 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
@@ -206,7 +206,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     CORBA::ORB_ptr orb = client.orb ();
 
-    sig_impl.reset( new sig_i( orb ) );
+    sig_impl.reset( new sig_i(orb));
     sig_var sig = sig_impl->_this ();
 
     CosNotifyChannelAdmin::SupplierAdmin_var admin =
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
index 012f0d7d19bdf..ffd3c21b456e0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
@@ -34,8 +34,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Relay_Consumer : public TAO_Notify
   /// Connect using options parsed and set initial QoS.
   virtual void connect ();
 
-  void push_structured_event (const CosNotification::StructuredEvent &/*notification*/
-                              );
+  void push_structured_event (const CosNotification::StructuredEvent &/*notification*/);
 
 protected:
   /// Destination object.
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
index b6ddc735664c8..fd735f871b416 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
@@ -71,7 +71,7 @@ Notify_Sequence_Push_Consumer::push_structured_events(
   if (this->count_ >= this->expected_)
   {
     this->client_.consumer_done (this);
-    ACE_Time_Value totaltime = ( ACE_OS::gettimeofday() - this->first_ );
+    ACE_Time_Value totaltime = ( ACE_OS::gettimeofday() - this->first_);
     double events_per_ms = static_cast<double>(this->count_) /
       static_cast<double>(totaltime.msec());
     ACE_DEBUG((LM_DEBUG, "\nConsumer %s received %d at %.2f events/ms\n", name_.c_str(), this->count_, events_per_ms ));
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
index 034893d48e2de..c27ddbc0c9081 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
@@ -65,7 +65,7 @@ Notify_Structured_Push_Consumer::push_structured_event(
   if (this->count_ == this->expected_)
     {
       this->client_.consumer_done (this);
-      ACE_Time_Value totaltime = ( ACE_OS::gettimeofday() - this->first_ );
+      ACE_Time_Value totaltime = ( ACE_OS::gettimeofday() - this->first_);
       double events_per_ms = static_cast<double>(this->count_) /
         static_cast<double>(totaltime.msec());
       ACE_DEBUG((LM_DEBUG, "Consumer %s received %d at %.2f events/ms\n", name_.c_str(), this->count_, events_per_ms ));
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
index 476f7066653b2..04d4b41ce83a2 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
@@ -130,7 +130,7 @@ SendEvents (int id)
 
   for(CORBA::ULong z = 0; z < amount; z++)
   {
-    const char* type = ( (z & 1) == 1 ? "odd" : "even" );
+    const char* type = ( (z & 1) == 1 ? "odd" : "even");
     events[z].header.fixed_header.event_type.domain_name =
       CORBA::string_dup("Orbix 2000 Demos");
     events[z].header.fixed_header.event_type.type_name =
@@ -189,7 +189,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       CORBA::ORB_ptr orb = client.orb ();
 
-      sig_impl.reset(new sig_i( orb ) );
+      sig_impl.reset(new sig_i(orb));
       sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
index 2fb227c9be39c..92efbea6c63a3 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
@@ -183,7 +183,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
               // Tell the supplier to go
               sig->go ();
 
-              client.ORB_run( );
+              client.ORB_run();
               ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
 
               sig->done ();
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
index 1394465509684..8e647d69ae604 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
@@ -123,7 +123,7 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 static void
 SendEvent (int id)
 {
-  const char* type = ( (id & 1) == 1 ? "odd" : "even" );
+  const char* type = ( (id & 1) == 1 ? "odd" : "even");
   CosNotification::StructuredEvent event;
 
   event.header.fixed_header.event_type.domain_name =
@@ -183,7 +183,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       CORBA::ORB_ptr orb = client.orb ();
 
-      sig_impl.reset( new sig_i( orb ) );
+      sig_impl.reset( new sig_i(orb));
       sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
index 433ee9953a7b5..224aa3988d9de 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
@@ -207,9 +207,7 @@ RedGreen_Test::resolve_Notify_factory ()
     this->naming_context_->resolve (name);
 
   this->notify_factory_ =
-    CosNotifyChannelAdmin::EventChannelFactory::_narrow (
-        obj.in ()
-      );
+    CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ());
 }
 
 void
@@ -281,10 +279,7 @@ RedGreen_Test::send_events ()
   added_1[0].domain_name =  CORBA::string_dup (DOMAIN_GREEN);
   added_1[0].type_name = CORBA::string_dup (TYPE_GREEN);
 
-  this->normal_consumer_->get_proxy_supplier ()->subscription_change (
-                                                     added_1,
-                                                     removed_1
-                                                   );
+  this->normal_consumer_->get_proxy_supplier ()->subscription_change (added_1, removed_1);
 
   // Setup the Consumer 2 to receive event_type : "DOMAIN_RED", "TYPE_RED"
   CosNotification::EventTypeSeq added_2(1);
@@ -295,10 +290,7 @@ RedGreen_Test::send_events ()
   added_2[0].domain_name =  CORBA::string_dup (DOMAIN_RED);
   added_2[0].type_name = CORBA::string_dup (TYPE_RED);
 
-  this->slow_consumer_->get_proxy_supplier ()->subscription_change (
-                                                   added_2,
-                                                   removed_2
-                                                 );
+  this->slow_consumer_->get_proxy_supplier ()->subscription_change (added_2, removed_2);
 
   // Create the events - one of each type
 
@@ -420,16 +412,14 @@ RedGreen_Test_StructuredPushConsumer::connect (
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
         CosNotifyChannelAdmin::STRUCTURED_EVENT,
-        proxy_supplier_id_
-      );
+        proxy_supplier_id_);
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
 
   // narrow
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
-        proxysupplier.in ()
-      );
+        proxysupplier.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
@@ -525,22 +515,16 @@ SlowConsumer::push_structured_event (
   // Slow it down ...
   ACE_OS::sleep (1);
 
-  RedGreen_Test_StructuredPushConsumer::push_structured_event (
-      notification
-    );
+  RedGreen_Test_StructuredPushConsumer::push_structured_event (notification);
 }
 
 // *****************************************************************
 
-RedGreen_Test_StructuredPushSupplier::RedGreen_Test_StructuredPushSupplier (
-    void
-  )
+RedGreen_Test_StructuredPushSupplier::RedGreen_Test_StructuredPushSupplier ()
 {
 }
 
-RedGreen_Test_StructuredPushSupplier::~RedGreen_Test_StructuredPushSupplier (
-    void
-  )
+RedGreen_Test_StructuredPushSupplier::~RedGreen_Test_StructuredPushSupplier ()
 {
 }
 
@@ -570,16 +554,14 @@ RedGreen_Test_StructuredPushSupplier::connect (
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
     supplier_admin->obtain_notification_push_consumer (
         CosNotifyChannelAdmin::STRUCTURED_EVENT,
-        proxy_consumer_id_
-      );
+        proxy_consumer_id_);
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->proxy_consumer_ =
     CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (
-        proxyconsumer.in ()
-      );
+        proxyconsumer.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
@@ -591,23 +573,20 @@ RedGreen_Test_StructuredPushSupplier::disconnect ()
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  this->proxy_consumer_->disconnect_structured_push_consumer (
-                           );
+  this->proxy_consumer_->disconnect_structured_push_consumer ();
 }
 
 void
 RedGreen_Test_StructuredPushSupplier::subscription_change (
     const CosNotification::EventTypeSeq & /*added*/,
-    const CosNotification::EventTypeSeq & /*removed */
-  )
+    const CosNotification::EventTypeSeq &) /*removed */
 {
   //No-Op.
 }
 
 void
 RedGreen_Test_StructuredPushSupplier::send_event (
-    CosNotification::StructuredEvent& event
-  )
+    CosNotification::StructuredEvent& event)
 {
   event.filterable_data.length (1);
   event.filterable_data[0].name = CORBA::string_dup("latency_base");
@@ -629,8 +608,7 @@ RedGreen_Test_StructuredPushSupplier::send_event (
 }
 
 void
-RedGreen_Test_StructuredPushSupplier::disconnect_structured_push_supplier (
-  )
+RedGreen_Test_StructuredPushSupplier::disconnect_structured_push_supplier ()
 {
   // No-Op.
 }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl
index 107472cd39034..9411ec61050fd 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl
@@ -10,7 +10,7 @@
 
 $status = 0;
 
-@test_configs = ( "reactive.conf", "lookup.conf", "listener.conf" );
+@test_configs = ( "reactive.conf", "lookup.conf", "listener.conf");
 
 my $nm_service = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 my $test = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index 7b7ea8fbf234a..8705f8d4586d5 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -285,8 +285,7 @@ Notify_Throughput::init (int argc, ACE_TCHAR* argv [])
                       Throughput_StructuredPushSupplier (this),
                       -1);
       suppliers_[i]->TAO_Notify_Tests_StructuredPushSupplier::init (
-                         root_poa_.in ()
-                       );
+                         root_poa_.in ());
       suppliers_[i]->connect (this->supplier_admin_.in ());
     }
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
index 041cee324e215..c59c08aca1107 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
@@ -63,8 +63,7 @@ class Throughput_StructuredPushConsumer
 
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
-        const CosNotification::StructuredEvent & notification
-      );
+        const CosNotification::StructuredEvent & notification);
 
   /// Accumulate the throughput statistics into <throughput>
   void accumulate_into (ACE_Throughput_Stats &throughput) const;
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
index d29a5967756ac..17af9a4bd31df 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
@@ -399,8 +399,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                 add_dependency (config_infos[i].handle,
                                 config_infos[i - (operation_count / 2)].handle,
                                 2,                             // number of calls
-                                RtecBase::ONE_WAY_CALL    // type of dependency
-                                );
+                                RtecBase::ONE_WAY_CALL);    // type of dependency
             }
         }
 
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
index f3fc41ea831b5..c6d9e993aa812 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
@@ -252,8 +252,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         add_dependency (config_infos[1].handle,
                         config_infos[0].handle,
                         1,                            // number of calls
-                        RtecBase::ONE_WAY_CALL  // type of dependency
-                        );
+                        RtecBase::ONE_WAY_CALL);  // type of dependency
 
       // register dependency of consumer that will have unresolved remote
       // dependencies on supplier with unresolved remote dependencies
@@ -261,9 +260,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         add_dependency (config_infos[3].handle,
                         config_infos[2].handle,
                         1,                            // number of calls
-                        RtecBase::ONE_WAY_CALL  // type of dependency
-                        );
-
+                        RtecBase::ONE_WAY_CALL);  // type of dependency
 
       // register dependency of consumer that will have unresolved local
       // dependencies on supplier with unresolved local dependencies
@@ -271,9 +268,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         add_dependency (config_infos[5].handle,
                         config_infos[4].handle,
                         1,                            // number of calls
-                        RtecBase::ONE_WAY_CALL  // type of dependency
-                        );
-
+                        RtecBase::ONE_WAY_CALL);  // type of dependency
 
       // register dependencies on each supplier of first consumer that will
       // have both unresolved local and unresolved remote dependencies.
@@ -281,22 +276,19 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         add_dependency (config_infos[6].handle,
                         config_infos[0].handle,
                         1,                            // number of calls
-                        RtecBase::ONE_WAY_CALL  // type of dependency
-                        );
+                        RtecBase::ONE_WAY_CALL);  // type of dependency
 
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[6].handle,
                         config_infos[2].handle,
                         1,                            // number of calls
-                        RtecBase::ONE_WAY_CALL  // type of dependency
-                        );
+                        RtecBase::ONE_WAY_CALL);  // type of dependency
 
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[6].handle,
                         config_infos[4].handle,
                         1,                            // number of calls
-                        RtecBase::ONE_WAY_CALL  // type of dependency
-                        );
+                        RtecBase::ONE_WAY_CALL);  // type of dependency
 
       // Register dependencies on each of the other consumers by second
       // consumer that will have both unresolved local and unresolved remote
@@ -305,29 +297,25 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         add_dependency (config_infos[7].handle,
                         config_infos[1].handle,
                         1,                            // number of calls
-                        RtecBase::ONE_WAY_CALL  // type of dependency
-                        );
+                        RtecBase::ONE_WAY_CALL);  // type of dependency
 
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[7].handle,
                         config_infos[3].handle,
                         1,                            // number of calls
-                        RtecBase::ONE_WAY_CALL  // type of dependency
-                        );
+                        RtecBase::ONE_WAY_CALL);  // type of dependency
 
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[7].handle,
                         config_infos[5].handle,
                         1,                            // number of calls
-                        RtecBase::ONE_WAY_CALL  // type of dependency
-                        );
+                        RtecBase::ONE_WAY_CALL);  // type of dependency
 
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[7].handle,
                         config_infos[6].handle,
                         1,                            // number of calls
-                        RtecBase::ONE_WAY_CALL  // type of dependency
-                        );
+                        RtecBase::ONE_WAY_CALL);  // type of dependency
 
       RtecScheduler::RT_Info_Set_var infos;
       RtecScheduler::Dependency_Set_var deps;
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger.idl b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger.idl
index 791102d90eba2..e6201b088d5bd 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger.idl
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger.idl
@@ -2,7 +2,7 @@ interface Messenger
   {
     boolean send_message (in string user_name,
                           in string subject,
-                          inout string message );
+                          inout string message);
 
     boolean call_message(in string user_name);
 
@@ -12,4 +12,3 @@ interface Messenger
      */
     oneway void shutdown ();
   };
-
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp
index 53e4756bb70a2..939ac5713d9bc 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp
@@ -35,7 +35,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   try
   {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp
index 9e692470a235d..e347070986f26 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp
@@ -42,8 +42,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       return 1;
 
     //Get reference to Root POA
-    CORBA::Object_var POA_obj = orb->resolve_initial_references( "RootPOA" );
-    PortableServer::POA_var poa = PortableServer::POA::_narrow( POA_obj.in() );
+    CORBA::Object_var POA_obj = orb->resolve_initial_references( "RootPOA");
+    PortableServer::POA_var poa = PortableServer::POA::_narrow( POA_obj.in());
 
     // Activate POA Manager
     PortableServer::POAManager_var mgr = poa->the_POAManager();
diff --git a/TAO/orbsvcs/tests/Security/Callback/client.cpp b/TAO/orbsvcs/tests/Security/Callback/client.cpp
index 723a82b50068c..fcbdaf63893fb 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client.cpp
@@ -55,7 +55,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       // Get the Root POA.
       //
       CORBA::Object_var obj =
-        orb->resolve_initial_references ( "RootPOA" );
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa =
         PortableServer::POA::_narrow (obj.in ());
@@ -63,7 +63,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       //
       // Get a reference to the server.
       //
-      obj = orb->string_to_object ( ior );
+      obj = orb->string_to_object (ior);
 
       if (CORBA::is_nil (obj.in ()))
         {
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.cpp b/TAO/orbsvcs/tests/Security/Callback/server.cpp
index b08537aa8251f..61182c9d451f4 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server.cpp
@@ -40,7 +40,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     {
       ACE_TString env (ACE_TEXT("SSL_CERT_FILE="));
       env += cert_file;
-      ACE_OS::putenv ( ACE_TEXT_ALWAYS_CHAR(env.c_str ()) );
+      ACE_OS::putenv ( ACE_TEXT_ALWAYS_CHAR(env.c_str ()));
 
       //
       // Initialize the ORB
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
index 06520b66af106..d1d6d3cec2311 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
@@ -13,7 +13,6 @@
 void
 Simple_Server_i::ping ()
 {
-  return;
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp
index 3db89d561de30..5bdb0cc165770 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp
@@ -113,7 +113,7 @@ publish_ior (CORBA::ORB_ptr orb, CORBA::Object_ptr o, const ACE_TCHAR* filename)
                                      errno);
     }
 
-  ACE_OS::fprintf (output_file, "%s", ior.in() );
+  ACE_OS::fprintf (output_file, "%s", ior.in());
   ACE_OS::fclose (output_file);
 }
 
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger.idl b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger.idl
index 2c3d7a968a587..633430af539bc 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger.idl
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger.idl
@@ -1,11 +1,7 @@
-/* -*- C++ -*-  */
-
 // messenger.idl
-
 interface Messenger
     {
         boolean send_message ( in    string user_name,
                                in    string subject,
-                               inout string message );
+                               inout string message);
     };
-
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp b/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp
index 72b4e40c9e741..d4fc8e017869d 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp
@@ -42,24 +42,24 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       return 1;
 
     // Destringify ior
-    CORBA::Object_var obj = orb->string_to_object( ior );
+    CORBA::Object_var obj = orb->string_to_object(ior);
     if (CORBA::is_nil(obj.in())) {
       std::cerr << "Nil Messenger reference" << std::endl;
       return 1;
     }
 
     // Narrow
-    Messenger_var messenger = Messenger::_narrow( obj.in() );
+    Messenger_var messenger = Messenger::_narrow( obj.in());
     if (CORBA::is_nil(messenger.in())) {
       std::cerr << "Argument is not a Messenger reference" << std::endl;
       return 1;
     }
 
     CORBA::String_var message = CORBA::string_dup(
-      "Implementing security policy now!" );
+      "Implementing security policy now!");
     messenger->send_message( "Chief of Security",
                              "New Directive",
-                             message.inout() );
+                             message.inout());
     std::cout << "message was sent" << std::endl;
 
     orb->destroy ();
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp b/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp
index d34cb1fa329aa..67cab2ac5f0b1 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp
@@ -44,8 +44,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       return 1;
 
     //Get reference to Root POA
-    CORBA::Object_var obj = orb->resolve_initial_references( "RootPOA" );
-    PortableServer::POA_var poa = PortableServer::POA::_narrow( obj.in() );
+    CORBA::Object_var obj = orb->resolve_initial_references( "RootPOA");
+    PortableServer::POA_var poa = PortableServer::POA::_narrow( obj.in());
 
     // Activate POA Manager
     PortableServer::POAManager_var mgr = poa->the_POAManager();
@@ -57,10 +57,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     // Register the servant with the RootPOA, obtain its object
     // reference, stringify it, and write it to a file.
     PortableServer::ObjectId_var oid =
-      poa->activate_object( &messenger_servant );
-    CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in() );
-    CORBA::String_var str = orb->object_to_string( messenger_obj.in() );
-    std::ofstream iorFile( ACE_TEXT_ALWAYS_CHAR(ior_output_file) );
+      poa->activate_object( &messenger_servant);
+    CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in());
+    CORBA::String_var str = orb->object_to_string( messenger_obj.in());
+    std::ofstream iorFile( ACE_TEXT_ALWAYS_CHAR(ior_output_file));
     iorFile << str.in() << std::endl;
     iorFile.close();
     std::cout << "IOR written to file " << ACE_TEXT_ALWAYS_CHAR(ior_output_file) << std::endl;
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h
index 32f6b0c7f83c4..ba669aea22409 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h
@@ -22,8 +22,7 @@ class  Messenger_i : public virtual POA_Messenger
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
-    char *& message
-    );
+    char *& message);
 };
 
 
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
index 47622cda2950f..cd921327d7a29 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
@@ -29,8 +29,7 @@ class TAO_Simple_Dynamic_Property : public TAO_Dynamic_Property
 
   virtual CORBA::Any* evalDP (const char* /* name */,
                               CORBA::TypeCode_ptr /* returned_type */,
-                              const CORBA::Any& /* extra_info */
-                              );
+                              const CORBA::Any&); /* extra_info */
 
 private:
   T dp_;
diff --git a/TAO/tests/BiDirectional/test_i.cpp b/TAO/tests/BiDirectional/test_i.cpp
index 354f30e5e11f1..61c908bca61c8 100644
--- a/TAO/tests/BiDirectional/test_i.cpp
+++ b/TAO/tests/BiDirectional/test_i.cpp
@@ -17,7 +17,7 @@ Callback_i::shutdown ()
 }
 
 void
-Callback_i::callback_method ( /**/)
+Callback_i::callback_method (/**/)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Callback method called\n"));
diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
index 750ad83399d76..8ac743bb37651 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
@@ -16,7 +16,7 @@ Callback_i::shutdown ()
 }
 
 void
-Callback_i::callback_method ( /**/)
+Callback_i::callback_method (/**/)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Callback method called\n"));
diff --git a/TAO/tests/Big_AMI/client.cpp b/TAO/tests/Big_AMI/client.cpp
index 1c9c80b7f6d08..906b70f4f4b97 100644
--- a/TAO/tests/Big_AMI/client.cpp
+++ b/TAO/tests/Big_AMI/client.cpp
@@ -212,8 +212,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       poa_var->destroy (1,  // ethernalize objects
-                        0  // wait for completion
-                       );
+                        0);  // wait for completion
 
       orb->destroy ();
     }
diff --git a/TAO/tests/Big_Reply/Big_Reply_i.cpp b/TAO/tests/Big_Reply/Big_Reply_i.cpp
index a8c3761c15d54..87529585baf00 100644
--- a/TAO/tests/Big_Reply/Big_Reply_i.cpp
+++ b/TAO/tests/Big_Reply/Big_Reply_i.cpp
@@ -12,7 +12,7 @@ Big_Reply_i::~Big_Reply_i ()
 }
 
 Test::Octet_Seq *
-Big_Reply_i::get_big_reply ( /**/)
+Big_Reply_i::get_big_reply (/**/)
 {
   Test::Octet_Seq_var reply_mesg =
     new Test::Octet_Seq (this->length_);
@@ -23,12 +23,12 @@ Big_Reply_i::get_big_reply ( /**/)
 }
 
 void
-Big_Reply_i::ping ( /**/)
+Big_Reply_i::ping (/**/)
 {
 }
 
 void
-Big_Reply_i::shutdown ( /**/)
+Big_Reply_i::shutdown (/**/)
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
index f2f0bb05caf65..5c85837527c84 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
@@ -21,8 +21,6 @@ Echo_Caller::start_task(Test::Echo_ptr client)
     }
 
   ACE_Thread_Manager::instance ()->wait ();
-
-  return;
 }
 
 void
diff --git a/TAO/tests/Bug_1254_Regression/BlobServer.h b/TAO/tests/Bug_1254_Regression/BlobServer.h
index e6c77019a200c..dfde196a963d3 100644
--- a/TAO/tests/Bug_1254_Regression/BlobServer.h
+++ b/TAO/tests/Bug_1254_Regression/BlobServer.h
@@ -15,8 +15,7 @@ class BlobServerImpl
   // = The skeleton methods
     virtual void test(
         BlobType1& blob1,
-        BlobType2& blob2
-      );
+        BlobType2& blob2);
   virtual void shutdown ();
 
 private:
diff --git a/TAO/tests/Bug_1361_Regression/run_test.pl b/TAO/tests/Bug_1361_Regression/run_test.pl
index f32e3ddfda997..35e1a499994e3 100755
--- a/TAO/tests/Bug_1361_Regression/run_test.pl
+++ b/TAO/tests/Bug_1361_Regression/run_test.pl
@@ -73,7 +73,7 @@
 }
 
 my $client_idx = 0;
-while (($elapsed < $max_running_time) ) {
+while (($elapsed < $max_running_time)) {
     # Start all clients in parallel
     my $args_saved = $CL->Arguments ();
     $CL->Arguments ("$args_saved$client_idx.log") unless $debug_opts eq '';
diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
index 6318b3f533c1c..4cf7b821414d9 100644
--- a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
+++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
@@ -8,7 +8,6 @@ Reply_Handler::Reply_Handler (CORBA::ORB_ptr o)
 void
 Reply_Handler::next_prime (CORBA::ULong)
 {
-  return;
 }
 
 void
diff --git a/TAO/tests/Bug_1628_Regression/run_test.pl b/TAO/tests/Bug_1628_Regression/run_test.pl
index 9f8d0df012239..7ed14a284a6d2 100755
--- a/TAO/tests/Bug_1628_Regression/run_test.pl
+++ b/TAO/tests/Bug_1628_Regression/run_test.pl
@@ -46,7 +46,7 @@
 # Body_dup is there, then all the Body_* methods are also there.
 #
 $found = 0 ;
-open (I_FILE, "$server_TestCaseC_i") ;
+open (I_FILE, "$server_TestCaseC_i");
 while( <I_FILE> ){
    chomp ;
    if( $_ =~ /Body_dup/ ){
diff --git a/TAO/tests/Bug_1639_Regression/struct_client.cpp b/TAO/tests/Bug_1639_Regression/struct_client.cpp
index 12bee12cfae57..251ecf57ffcac 100644
--- a/TAO/tests/Bug_1639_Regression/struct_client.cpp
+++ b/TAO/tests/Bug_1639_Regression/struct_client.cpp
@@ -76,13 +76,13 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     try {
       DynAny_var da_struct_alias = daf->create_dyn_any_from_type_code (tc_struct_alias.in());
-    } catch ( const CORBA::UNKNOWN &) {
+    } catch (const CORBA::UNKNOWN &) {
       cout << "CORBA::UNKNOWN exception when calling create_dyn_any_from_type_code (tc_struct_alias)" << endl;
     }
 
     try {
       DynAny_var da_struct_alias = daf->create_dyn_any (any_struct_alias);
-    } catch ( const CORBA::UNKNOWN &) {
+    } catch (const CORBA::UNKNOWN &) {
       cout << "CORBA::UNKNOWN exception when calling create_dyn_any (any_struct_alias)" << endl;
     }
 
@@ -90,13 +90,13 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     try {
       DynAny_var da_union_alias = daf->create_dyn_any_from_type_code (tc_union_alias.in());
-    } catch ( const CORBA::UNKNOWN &) {
+    } catch (const CORBA::UNKNOWN &) {
       cout << "CORBA::UNKNOWN exception when calling create_dyn_any_from_type_code (tc_union_alias)" << endl;
     }
 
     try {
       DynAny_var da_union_alias = daf->create_dyn_any (any_union_alias);
-    } catch ( const CORBA::UNKNOWN &) {
+    } catch (const CORBA::UNKNOWN &) {
       cout << "CORBA::UNKNOWN exception when calling create_dyn_any (any_union_alias)" << endl;
     }
 
diff --git a/TAO/tests/Bug_1676_Regression/client.cpp b/TAO/tests/Bug_1676_Regression/client.cpp
index f4f86e89b645c..ec66b9af10eac 100644
--- a/TAO/tests/Bug_1676_Regression/client.cpp
+++ b/TAO/tests/Bug_1676_Regression/client.cpp
@@ -132,7 +132,5 @@ void get_stringList2(Test::Hello_var hello)
     {
       ex._tao_print_exception ("get_stringList2");
     }
-
-
-    return;
+  return;
 }
diff --git a/TAO/tests/Bug_2084_Regression/Client_Task.cpp b/TAO/tests/Bug_2084_Regression/Client_Task.cpp
index 498f02b387a05..328a193e2dfac 100644
--- a/TAO/tests/Bug_2084_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_2084_Regression/Client_Task.cpp
@@ -70,7 +70,7 @@ Client_Task::svc ()
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Client starting\n"));
 
-      evNode->registerHello( hello_servant.in() );
+      evNode->registerHello( hello_servant.in());
 
       evNode->shutdown ();
     }
diff --git a/TAO/tests/Bug_2084_Regression/EventNode.cpp b/TAO/tests/Bug_2084_Regression/EventNode.cpp
index f2eeb79b35ff6..a5f2ad5b655ab 100644
--- a/TAO/tests/Bug_2084_Regression/EventNode.cpp
+++ b/TAO/tests/Bug_2084_Regression/EventNode.cpp
@@ -10,7 +10,7 @@ EventNode::EventNode (CORBA::ORB_ptr orb, ACE_thread_t thrid)
 {
 }
 
-void EventNode::registerHello ( ::Test::Hello_ptr h )
+void EventNode::registerHello (::Test::Hello_ptr h)
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) EventNode: registerHello will call get_string...\n"));
diff --git a/TAO/tests/Bug_2084_Regression/EventNode.h b/TAO/tests/Bug_2084_Regression/EventNode.h
index af70fd55ddc96..e60f77c429c83 100644
--- a/TAO/tests/Bug_2084_Regression/EventNode.h
+++ b/TAO/tests/Bug_2084_Regression/EventNode.h
@@ -18,7 +18,7 @@ class EventNode
              ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual void registerHello ( ::Test::Hello_ptr h);
+  virtual void registerHello (::Test::Hello_ptr h);
 
   virtual void shutdown ();
 
diff --git a/TAO/tests/Bug_2084_Regression/Hello.h b/TAO/tests/Bug_2084_Regression/Hello.h
index 65fba82d8f0d3..32cac8239344c 100644
--- a/TAO/tests/Bug_2084_Regression/Hello.h
+++ b/TAO/tests/Bug_2084_Regression/Hello.h
@@ -18,7 +18,7 @@ class Hello
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string ( ::Test::ThreadId caller_threadid);
+  virtual char * get_string (::Test::ThreadId caller_threadid);
 
   virtual void shutdown ();
 
diff --git a/TAO/tests/Bug_2122_Regression/Test.idl b/TAO/tests/Bug_2122_Regression/Test.idl
index ed40e939aaf30..e459fe09c9f05 100644
--- a/TAO/tests/Bug_2122_Regression/Test.idl
+++ b/TAO/tests/Bug_2122_Regression/Test.idl
@@ -9,8 +9,8 @@ module Test
 
    interface Foo
    {
-      void op1( in MyStringType s );
-      void op2( in MyOtherStringType s );
+      void op1( in MyStringType s);
+      void op2( in MyOtherStringType s);
    };
 };
 
@@ -22,7 +22,7 @@ module Foo
 
       interface Whatever
       {
-         void someOp( in MyString s );
+         void someOp( in MyString s);
       };
    };
 
@@ -32,7 +32,7 @@ module Foo
 
       interface WhoCares
       {
-         void someOp( in MyString s );
+         void someOp( in MyString s);
       };
    };
 
@@ -42,7 +42,7 @@ module Foo
 
       interface WhoCares
       {
-         void someOp( in MyString s );
+         void someOp( in MyString s);
       };
    };
 };
diff --git a/TAO/tests/Bug_2124_Regression/Test.idl b/TAO/tests/Bug_2124_Regression/Test.idl
index edee92ac64d5e..0d006d331a2e1 100644
--- a/TAO/tests/Bug_2124_Regression/Test.idl
+++ b/TAO/tests/Bug_2124_Regression/Test.idl
@@ -9,8 +9,8 @@ module Test
 
    interface Foo
    {
-      void op1( in MyString s );
-      void op2( in OtherString s );
+      void op1( in MyString s);
+      void op2( in OtherString s);
    };
 };
 
diff --git a/TAO/tests/Bug_2188_Regression/broken_i.h b/TAO/tests/Bug_2188_Regression/broken_i.h
index aec85dd444ebc..37cb737907efa 100644
--- a/TAO/tests/Bug_2188_Regression/broken_i.h
+++ b/TAO/tests/Bug_2188_Regression/broken_i.h
@@ -76,201 +76,146 @@ class  ArrayTest_i : public virtual POA_ArrayTest
   ::LongArray_slice * longArrayOp (
       const ::LongArray p1,
       ::LongArray p2,
-      ::LongArray_out p3
-    );
+      ::LongArray_out p3);
 
   virtual
   ::StringArray_slice * stringArrayOp (
       const ::StringArray p1,
       ::StringArray p2,
-      ::StringArray_out p3
-    );
+      ::StringArray_out p3);
 
   virtual
   ::ShortArray_slice * shortArrayOp (
       const ::ShortArray p1,
       ::ShortArray p2,
-      ::ShortArray_out p3
-    );
+      ::ShortArray_out p3);
 
   virtual
   ::UShortArray_slice * ushortArrayOp (
       const ::UShortArray p1,
       ::UShortArray p2,
-      ::UShortArray_out p3
-    );
+      ::UShortArray_out p3);
 
   virtual
   ::CharArray_slice * charArrayOp (
       const ::CharArray p1,
       ::CharArray p2,
-      ::CharArray_out p3
-    );
+      ::CharArray_out p3);
 
   virtual
   ::OctetArray_slice * octetArrayOp (
       const ::OctetArray p1,
       ::OctetArray p2,
-      ::OctetArray_out p3
-    );
+      ::OctetArray_out p3);
 
   virtual
   ::DoubleArray_slice * doubleArrayOp (
       const ::DoubleArray p1,
       ::DoubleArray p2,
-      ::DoubleArray_out p3
-    );
+      ::DoubleArray_out p3);
 
   virtual
-  ::LongArray_slice * a_longArray (
-
-    );
+  ::LongArray_slice * a_longArray ();
 
   virtual
   void a_longArray (
-      const ::LongArray a_longArray
-    );
+      const ::LongArray a_longArray);
 
   virtual
-  ::ULongArray_slice * a_ulongArray (
-
-    );
+  ::ULongArray_slice * a_ulongArray ();
 
   virtual
   void a_ulongArray (
-      const ::ULongArray a_ulongArray
-    );
+      const ::ULongArray a_ulongArray);
 
   virtual
-  ::StringArray_slice * a_stringArray (
-
-    );
+  ::StringArray_slice * a_stringArray ();
 
   virtual
   void a_stringArray (
-      const ::StringArray a_stringArray
-    );
+      const ::StringArray a_stringArray);
 
   virtual
-  ::ShortArray_slice * a_shortArray (
-
-    );
+  ::ShortArray_slice * a_shortArray ();
 
   virtual
   void a_shortArray (
-      const ::ShortArray a_shortArray
-    );
+      const ::ShortArray a_shortArray);
 
   virtual
-  ::UShortArray_slice * a_ushortArray (
-
-    );
+  ::UShortArray_slice * a_ushortArray ();
 
   virtual
   void a_ushortArray (
-      const ::UShortArray a_ushortArray
-    );
+      const ::UShortArray a_ushortArray);
 
   virtual
-  CORBA::Char a_char (
-
-    );
+  CORBA::Char a_char ();
 
   virtual
-  void a_char (
-      ::CORBA::Char a_char
-    );
+  void a_char (::CORBA::Char a_char);
 
   virtual
-  ::CharArray_slice * a_charArray (
-
-    );
+  ::CharArray_slice * a_charArray ();
 
   virtual
-  void a_charArray (
-      const ::CharArray a_charArray
-    );
+  void a_charArray (const ::CharArray a_charArray);
 
   virtual
-  ::OctetArray_slice * a_octetArray (
-
-    );
+  ::OctetArray_slice * a_octetArray ();
 
   virtual
   void a_octetArray (
-      const ::OctetArray a_octetArray
-    );
+      const ::OctetArray a_octetArray);
 
   virtual
-  ::DoubleArray_slice * a_doubleArray (
-
-    );
+  ::DoubleArray_slice * a_doubleArray ();
 
   virtual
   void a_doubleArray (
-      const ::DoubleArray a_doubleArray
-    );
+      const ::DoubleArray a_doubleArray);
 
   virtual
-  ::FloatArray_slice * a_floatArray (
-
-    );
+  ::FloatArray_slice * a_floatArray ();
 
   virtual
   void a_floatArray (
-      const ::FloatArray a_floatArray
-    );
+      const ::FloatArray a_floatArray);
 
   virtual
-  ::BucketArray_slice * a_bucketArray (
-
-    );
+  ::BucketArray_slice * a_bucketArray ();
 
   virtual
   void a_bucketArray (
-      const ::BucketArray a_bucketArray
-    );
+      const ::BucketArray a_bucketArray);
 
   virtual
-  ::AccountArray_slice * a_accountArray (
-
-    );
+  ::AccountArray_slice * a_accountArray ();
 
   virtual
   void a_accountArray (
-      const ::AccountArray a_accountArray
-    );
+      const ::AccountArray a_accountArray);
 
   virtual
-  ::BooleanArray_slice * a_booleanArray (
-
-    );
+  ::BooleanArray_slice * a_booleanArray ();
 
   virtual
   void a_booleanArray (
-      const ::BooleanArray a_booleanArray
-    );
+      const ::BooleanArray a_booleanArray);
 
   virtual
-  ::LongArrayArray_slice * a_longArrayArray (
-
-    );
+  ::LongArrayArray_slice * a_longArrayArray ();
 
   virtual
   void a_longArrayArray (
-      const ::LongArrayArray a_longArrayArray
-    );
+      const ::LongArrayArray a_longArrayArray);
 
   virtual
-  ::MyEnumArray_slice * a_myEnumArray (
-
-    );
+  ::MyEnumArray_slice * a_myEnumArray ();
 
   virtual
   void a_myEnumArray (
-      const ::MyEnumArray a_myEnumArray
-    );
+      const ::MyEnumArray a_myEnumArray);
 };
 
-
 #endif /* BROKEN_I_H_  */
diff --git a/TAO/tests/Bug_2234_Regression/Test.idl b/TAO/tests/Bug_2234_Regression/Test.idl
index a6eab054a7170..4fe9d2dc5368b 100644
--- a/TAO/tests/Bug_2234_Regression/Test.idl
+++ b/TAO/tests/Bug_2234_Regression/Test.idl
@@ -28,15 +28,15 @@ module Test
 
     interface Foo
     {
-       long TestLong( in long a, out long b, inout long c );
-       string TestString( in string a, out string b, inout string c );
-       MyNonVarStruct TestNonVarStruct( in MyNonVarStruct a, out MyNonVarStruct b, inout MyNonVarStruct c );
-       MyVarStruct TestVarStruct( in MyVarStruct a, out MyVarStruct b, inout MyVarStruct c );
-       MyNonVarUnion TestNonVarUnion( in MyNonVarUnion a, out MyNonVarUnion b, inout MyNonVarUnion c );
-       MyVarUnion TestVarUnion( in MyVarUnion a, out MyVarUnion b, inout MyVarUnion c );
-       MySeqOfLong TestSeqOfLong( in MySeqOfLong a, out MySeqOfLong b, inout MySeqOfLong c );
-       any TestAny( in any a, out any b, inout any c );
-       MyArray TestArray( in MyArray a, out MyArray b, inout MyArray c );
+       long TestLong( in long a, out long b, inout long c);
+       string TestString( in string a, out string b, inout string c);
+       MyNonVarStruct TestNonVarStruct( in MyNonVarStruct a, out MyNonVarStruct b, inout MyNonVarStruct c);
+       MyVarStruct TestVarStruct( in MyVarStruct a, out MyVarStruct b, inout MyVarStruct c);
+       MyNonVarUnion TestNonVarUnion( in MyNonVarUnion a, out MyNonVarUnion b, inout MyNonVarUnion c);
+       MyVarUnion TestVarUnion( in MyVarUnion a, out MyVarUnion b, inout MyVarUnion c);
+       MySeqOfLong TestSeqOfLong( in MySeqOfLong a, out MySeqOfLong b, inout MySeqOfLong c);
+       any TestAny( in any a, out any b, inout any c);
+       MyArray TestArray( in MyArray a, out MyArray b, inout MyArray c);
        Object TestObject( in Object a, out Object b, inout Object c);
        oneway void ShutdownServer();
     };
diff --git a/TAO/tests/Bug_2234_Regression/client.cpp b/TAO/tests/Bug_2234_Regression/client.cpp
index 76d6d2e61a9da..427849d9a12d2 100644
--- a/TAO/tests/Bug_2234_Regression/client.cpp
+++ b/TAO/tests/Bug_2234_Regression/client.cpp
@@ -50,9 +50,9 @@ ACE_TMAIN (
       return 1;
 
     CORBA::Object_var
-       object= orb->string_to_object( ior );
+       object= orb->string_to_object(ior);
     Test::Foo_var
-       foo= Test::Foo::_narrow( object.in() );
+       foo= Test::Foo::_narrow( object.in());
 
     //-----------------------------------------------------------------------
     CORBA::Long
@@ -60,19 +60,19 @@ ACE_TMAIN (
        bL,
        cL= 3,
        rL= 0;
-    ACE_DEBUG( (LM_INFO, ". Long()            ") );
+    ACE_DEBUG( (LM_INFO, ". Long()            "));
     rL= foo->TestLong( aL, bL, cL);
-    ACE_DEBUG( (LM_INFO, "a is %d, b is %d, c is %d, r is %d:  ", aL, bL, cL, rL) );
+    ACE_DEBUG( (LM_INFO, "a is %d, b is %d, c is %d, r is %d:  ", aL, bL, cL, rL));
     if (static_cast<CORBA::Long>(1) != aL) {
-       ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "a is wrong\n")); testFailed= 1;}
     else if (static_cast<CORBA::Long>(2) != bL) {
-       ACE_DEBUG( (LM_ERROR, "b is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "b is wrong\n")); testFailed= 1;}
     else if (static_cast<CORBA::Long>(4) != cL) {
-       ACE_DEBUG( (LM_ERROR, "c is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "c is wrong\n")); testFailed= 1;}
     else if (static_cast<CORBA::Long>(7) != rL) {
-       ACE_DEBUG( (LM_ERROR, "r is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "r is wrong\n")); testFailed= 1;}
     else
-       ACE_DEBUG( (LM_INFO, "OK\n") );
+       ACE_DEBUG( (LM_INFO, "OK\n"));
 
     //-----------------------------------------------------------------------
     CORBA::String_var
@@ -80,19 +80,19 @@ ACE_TMAIN (
        bS,
        cS= CORBA::string_dup("3"),
        rS;
-    ACE_DEBUG( (LM_INFO, ". String()          ") );
+    ACE_DEBUG( (LM_INFO, ". String()          "));
     rS= foo->TestString( aS.in(), bS.out(), cS.inout());
     ACE_DEBUG( (LM_INFO, "a is %C, b is %C, c is %C, r is %C:  ", aS.in (), bS.in (), cS.in (), rS.in ()));
     if ((0 != *aS.in()) && (0 != ACE_OS::strcmp(aS.in(), "1"))) {
-       ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "a is wrong\n")); testFailed= 1;}
     else if ((0 != *aS.in()) && (0 != ACE_OS::strcmp(bS.in(), "2"))) {
-       ACE_DEBUG( (LM_ERROR, "b is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "b is wrong\n")); testFailed= 1;}
     else if ((0 != *aS.in()) && (0 != ACE_OS::strcmp(cS.in(), "4"))) {
-       ACE_DEBUG( (LM_ERROR, "c is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "c is wrong\n")); testFailed= 1;}
     else if ((0 != *aS.in()) && (0 != ACE_OS::strcmp(rS.in(), "7"))) {
-       ACE_DEBUG( (LM_ERROR, "r is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "r is wrong\n")); testFailed= 1;}
     else
-       ACE_DEBUG( (LM_INFO, "OK\n") );
+       ACE_DEBUG( (LM_INFO, "OK\n"));
 
     //-----------------------------------------------------------------------
     Test::MyNonVarStruct_var
@@ -102,19 +102,19 @@ ACE_TMAIN (
        rFS;
     aFS->val= 1;
     cFS->val= 3;
-    ACE_DEBUG( (LM_INFO, ". MyNonVarStruct()  ") );
+    ACE_DEBUG( (LM_INFO, ". MyNonVarStruct()  "));
     rFS= foo->TestNonVarStruct( aFS.in(), bFS.out(), cFS.inout());
-    ACE_DEBUG( (LM_INFO, "a is %d, b is %d, c is %d, r is %d:  ", aFS.in().val, bFS.in().val, cFS.in().val, rFS.in().val) );
+    ACE_DEBUG( (LM_INFO, "a is %d, b is %d, c is %d, r is %d:  ", aFS.in().val, bFS.in().val, cFS.in().val, rFS.in().val));
     if (static_cast<CORBA::Long>(1) != aFS->val) {
-       ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "a is wrong\n")); testFailed= 1;}
     else if (static_cast<CORBA::Long>(2) != bFS->val) {
-       ACE_DEBUG( (LM_ERROR, "b is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "b is wrong\n")); testFailed= 1;}
     else if (static_cast<CORBA::Long>(4) != cFS->val) {
-       ACE_DEBUG( (LM_ERROR, "c is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "c is wrong\n")); testFailed= 1;}
     else if (static_cast<CORBA::Long>(7) != rFS->val) {
-       ACE_DEBUG( (LM_ERROR, "r is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "r is wrong\n")); testFailed= 1;}
     else
-       ACE_DEBUG( (LM_INFO, "OK\n") );
+       ACE_DEBUG( (LM_INFO, "OK\n"));
 
     //-----------------------------------------------------------------------
     Test::MyVarStruct_var
@@ -124,19 +124,19 @@ ACE_TMAIN (
        rVS;
     aVS->val= CORBA::string_dup("1");
     cVS->val= CORBA::string_dup("3");
-    ACE_DEBUG( (LM_INFO, ". MyVarStruct()     ") );
+    ACE_DEBUG( (LM_INFO, ". MyVarStruct()     "));
     rVS= foo->TestVarStruct( aVS.in(), bVS.out(), cVS.inout());
     ACE_DEBUG( (LM_INFO, "a is %C, b is %C, c is %C, r is %C:  ", aVS->val.in(), bVS->val.in (), cVS->val.in (), rVS->val.in ()));
     if ((0 != *aVS->val) && (0 != ACE_OS::strcmp(aVS->val, "1"))) {
-       ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "a is wrong\n")); testFailed= 1;}
     else if ((0 != *bVS->val) && (0 != ACE_OS::strcmp(bVS->val, "2"))) {
-       ACE_DEBUG( (LM_ERROR, "b is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "b is wrong\n")); testFailed= 1;}
     else if ((0 != *cVS->val) && (0 != ACE_OS::strcmp(cVS->val, "4"))) {
-       ACE_DEBUG( (LM_ERROR, "c is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "c is wrong\n")); testFailed= 1;}
     else if ((0 != *rVS->val) && (0 != ACE_OS::strcmp(rVS->val, "7"))) {
-       ACE_DEBUG( (LM_ERROR, "r is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "r is wrong\n")); testFailed= 1;}
     else
-       ACE_DEBUG( (LM_INFO, "OK\n") );
+       ACE_DEBUG( (LM_INFO, "OK\n"));
 
     //-----------------------------------------------------------------------
     Test::MyNonVarUnion_var
@@ -144,41 +144,41 @@ ACE_TMAIN (
        bFU= new Test::MyNonVarUnion(),
        cFU= new Test::MyNonVarUnion(),
        rFU;
-    aFU->valLong( static_cast<CORBA::Long>(1) );
-    cFU->valLong( static_cast<CORBA::Long>(3) );
-    ACE_DEBUG( (LM_INFO, ". MyNonVarUnion()   ") );
+    aFU->valLong( static_cast<CORBA::Long>(1));
+    cFU->valLong( static_cast<CORBA::Long>(3));
+    ACE_DEBUG( (LM_INFO, ". MyNonVarUnion()   "));
     rFU= foo->TestNonVarUnion( aFU.in(), bFU.out(), cFU.inout());
-    ACE_DEBUG( (LM_INFO, "a is ") );
+    ACE_DEBUG( (LM_INFO, "a is "));
     if (static_cast<CORBA::Short>(1) != aFU->_d())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", aFU->valLong()) );
-    ACE_DEBUG( (LM_INFO, ", b is ") );
+       ACE_DEBUG( (LM_INFO, "%d", aFU->valLong()));
+    ACE_DEBUG( (LM_INFO, ", b is "));
     if (static_cast<CORBA::Short>(1) != bFU->_d())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", bFU->valLong()) );
-    ACE_DEBUG( (LM_INFO, ", c is ") );
+       ACE_DEBUG( (LM_INFO, "%d", bFU->valLong()));
+    ACE_DEBUG( (LM_INFO, ", c is "));
     if (static_cast<CORBA::Short>(1) != cFU->_d())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", cFU->valLong()) );
-    ACE_DEBUG( (LM_INFO, ", r is ") );
+       ACE_DEBUG( (LM_INFO, "%d", cFU->valLong()));
+    ACE_DEBUG( (LM_INFO, ", r is "));
     if (static_cast<CORBA::Short>(1) != rFU->_d())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", rFU->valLong()) );
-    ACE_DEBUG( (LM_INFO, ":  ") );
+       ACE_DEBUG( (LM_INFO, "%d", rFU->valLong()));
+    ACE_DEBUG( (LM_INFO, ":  "));
     if ((static_cast<CORBA::Short>(1) != aFU->_d()) || (static_cast<CORBA::Long>(1) != aFU->valLong())) {
-       ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "a is wrong\n")); testFailed= 1;}
     else if ((static_cast<CORBA::Short>(1) != bFU->_d()) || (static_cast<CORBA::Long>(2) != bFU->valLong())) {
-       ACE_DEBUG( (LM_ERROR, "b is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "b is wrong\n")); testFailed= 1;}
     else if ((static_cast<CORBA::Short>(1) != cFU->_d()) || (static_cast<CORBA::Long>(4) != cFU->valLong())) {
-       ACE_DEBUG( (LM_ERROR, "c is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "c is wrong\n")); testFailed= 1;}
     else if ((static_cast<CORBA::Short>(1) != rFU->_d()) || (static_cast<CORBA::Long>(7) != rFU->valLong())) {
-       ACE_DEBUG( (LM_ERROR, "r is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "r is wrong\n")); testFailed= 1;}
     else
-       ACE_DEBUG( (LM_INFO, "OK\n") );
+       ACE_DEBUG( (LM_INFO, "OK\n"));
 
     //-----------------------------------------------------------------------
     Test::MyVarUnion_var
@@ -186,41 +186,41 @@ ACE_TMAIN (
        bVU,
        cVU= new Test::MyVarUnion(),
        rVU;
-    aVU->valLong( static_cast<CORBA::Long>(1) );
-    cVU->valLong( static_cast<CORBA::Long>(3) );
-    ACE_DEBUG( (LM_INFO, ". MyVarUnion()      ") );
+    aVU->valLong( static_cast<CORBA::Long>(1));
+    cVU->valLong( static_cast<CORBA::Long>(3));
+    ACE_DEBUG( (LM_INFO, ". MyVarUnion()      "));
     rVU= foo->TestVarUnion( aVU.in(), bVU.out(), cVU.inout());
-    ACE_DEBUG( (LM_INFO, "a is ") );
+    ACE_DEBUG( (LM_INFO, "a is "));
     if (static_cast<CORBA::Short>(1) != aVU->_d())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", aVU->valLong()) );
-    ACE_DEBUG( (LM_INFO, ", b is ") );
+       ACE_DEBUG( (LM_INFO, "%d", aVU->valLong()));
+    ACE_DEBUG( (LM_INFO, ", b is "));
     if (static_cast<CORBA::Short>(1) != bVU->_d())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", bVU->valLong()) );
-    ACE_DEBUG( (LM_INFO, ", c is ") );
+       ACE_DEBUG( (LM_INFO, "%d", bVU->valLong()));
+    ACE_DEBUG( (LM_INFO, ", c is "));
     if (static_cast<CORBA::Short>(1) != cVU->_d())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", cVU->valLong()) );
-    ACE_DEBUG( (LM_INFO, ", r is ") );
+       ACE_DEBUG( (LM_INFO, "%d", cVU->valLong()));
+    ACE_DEBUG( (LM_INFO, ", r is "));
     if (static_cast<CORBA::Short>(1) != rVU->_d())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", rVU->valLong()) );
-    ACE_DEBUG( (LM_INFO, ":  ") );
+       ACE_DEBUG( (LM_INFO, "%d", rVU->valLong()));
+    ACE_DEBUG( (LM_INFO, ":  "));
     if ((static_cast<CORBA::Short>(1) != aVU->_d()) || (static_cast<CORBA::Long>(1) != aVU->valLong())) {
-       ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "a is wrong\n")); testFailed= 1;}
     else if ((static_cast<CORBA::Short>(1) != bVU->_d()) || (static_cast<CORBA::Long>(2) != bVU->valLong())) {
-       ACE_DEBUG( (LM_ERROR, "b is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "b is wrong\n")); testFailed= 1;}
     else if ((static_cast<CORBA::Short>(1) != cVU->_d()) || (static_cast<CORBA::Long>(4) != cVU->valLong())) {
-       ACE_DEBUG( (LM_ERROR, "c is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "c is wrong\n")); testFailed= 1;}
     else if ((static_cast<CORBA::Short>(1) != rVU->_d()) || (static_cast<CORBA::Long>(7) != rVU->valLong())) {
-       ACE_DEBUG( (LM_ERROR, "r is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "r is wrong\n")); testFailed= 1;}
     else
-       ACE_DEBUG( (LM_INFO, "OK\n") );
+       ACE_DEBUG( (LM_INFO, "OK\n"));
 
     //-----------------------------------------------------------------------
     Test::MySeqOfLong_var
@@ -232,39 +232,39 @@ ACE_TMAIN (
     aSL[0]= static_cast<CORBA::Long>(1);
     cSL->length(1);
     cSL[0]= static_cast<CORBA::Long>(3);
-    ACE_DEBUG( (LM_INFO, ". MySeqOfLong()     ") );
+    ACE_DEBUG( (LM_INFO, ". MySeqOfLong()     "));
     rSL= foo->TestSeqOfLong( aSL.in(), bSL.out(), cSL.inout());
-    ACE_DEBUG( (LM_INFO, "a is ") );
+    ACE_DEBUG( (LM_INFO, "a is "));
     if (1u != aSL->length())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", aSL[0]) );
-    ACE_DEBUG( (LM_INFO, ", b is ") );
+       ACE_DEBUG( (LM_INFO, "%d", aSL[0]));
+    ACE_DEBUG( (LM_INFO, ", b is "));
     if (1u != bSL->length())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", bSL[0]) );
-    ACE_DEBUG( (LM_INFO, ", c is ") );
+       ACE_DEBUG( (LM_INFO, "%d", bSL[0]));
+    ACE_DEBUG( (LM_INFO, ", c is "));
     if (1u != cSL->length())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", cSL[0]) );
-    ACE_DEBUG( (LM_INFO, ", r is ") );
+       ACE_DEBUG( (LM_INFO, "%d", cSL[0]));
+    ACE_DEBUG( (LM_INFO, ", r is "));
     if (1u != rSL->length())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", rSL[0]) );
-    ACE_DEBUG( (LM_INFO, ":  ") );
+       ACE_DEBUG( (LM_INFO, "%d", rSL[0]));
+    ACE_DEBUG( (LM_INFO, ":  "));
     if ((1u != aSL->length()) || (static_cast<CORBA::Long>(1) != aSL[0])) {
-       ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "a is wrong\n")); testFailed= 1;}
     else if ((1u != bSL->length()) || (static_cast<CORBA::Long>(2) != bSL[0])) {
-       ACE_DEBUG( (LM_ERROR, "b is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "b is wrong\n")); testFailed= 1;}
     else if ((1u != cSL->length()) || (static_cast<CORBA::Long>(4) != cSL[0])) {
-       ACE_DEBUG( (LM_ERROR, "c is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "c is wrong\n")); testFailed= 1;}
     else if ((1u != rSL->length()) || (static_cast<CORBA::Long>(7) != rSL[0])) {
-       ACE_DEBUG( (LM_ERROR, "r is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "r is wrong\n")); testFailed= 1;}
     else
-       ACE_DEBUG( (LM_INFO, "OK\n") );
+       ACE_DEBUG( (LM_INFO, "OK\n"));
 
     //-----------------------------------------------------------------------
     CORBA::Any_var
@@ -274,44 +274,44 @@ ACE_TMAIN (
        rA;
     aA<<= static_cast<CORBA::Long>(1);
     cA<<= static_cast<CORBA::Long>(3);
-    ACE_DEBUG( (LM_INFO, ". Any()             ") );
+    ACE_DEBUG( (LM_INFO, ". Any()             "));
     rA= foo->TestAny( aA.in(), bA.out(), cA.inout());
     CORBA::Boolean
        aB,
        bB,
        cB,
        rB;
-    ACE_DEBUG( (LM_INFO, "a is ") );
+    ACE_DEBUG( (LM_INFO, "a is "));
     if (0 != (aB= (aA>>= aL)))
-       ACE_DEBUG( (LM_INFO, "%d", aL) );
+       ACE_DEBUG( (LM_INFO, "%d", aL));
     else
-       ACE_DEBUG( (LM_INFO, "?") );
-    ACE_DEBUG( (LM_INFO, ", b is ") );
+       ACE_DEBUG( (LM_INFO, "?"));
+    ACE_DEBUG( (LM_INFO, ", b is "));
     if (0 != (bB= (bA>>= bL)))
-       ACE_DEBUG( (LM_INFO, "%d", bL) );
+       ACE_DEBUG( (LM_INFO, "%d", bL));
     else
-       ACE_DEBUG( (LM_INFO, "?") );
-    ACE_DEBUG( (LM_INFO, ", c is ") );
+       ACE_DEBUG( (LM_INFO, "?"));
+    ACE_DEBUG( (LM_INFO, ", c is "));
     if (0 != (cB= (cA>>= cL)))
-       ACE_DEBUG( (LM_INFO, "%d", cL) );
+       ACE_DEBUG( (LM_INFO, "%d", cL));
     else
-       ACE_DEBUG( (LM_INFO, "?") );
-    ACE_DEBUG( (LM_INFO, ", r is ") );
+       ACE_DEBUG( (LM_INFO, "?"));
+    ACE_DEBUG( (LM_INFO, ", r is "));
     if (0 != (rB= (rA>>= rL)))
-       ACE_DEBUG( (LM_INFO, "%d", rL) );
+       ACE_DEBUG( (LM_INFO, "%d", rL));
     else
-       ACE_DEBUG( (LM_INFO, "?") );
-    ACE_DEBUG( (LM_INFO, ":  ") );
+       ACE_DEBUG( (LM_INFO, "?"));
+    ACE_DEBUG( (LM_INFO, ":  "));
     if (!aB || (static_cast<CORBA::Long>(1) != aL)) {
-       ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "a is wrong\n")); testFailed= 1;}
     else if (!bB || (static_cast<CORBA::Long>(2) != bL)) {
-       ACE_DEBUG( (LM_ERROR, "b is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "b is wrong\n")); testFailed= 1;}
     else if (!cB || (static_cast<CORBA::Long>(4) != cL)) {
-       ACE_DEBUG( (LM_ERROR, "c is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "c is wrong\n")); testFailed= 1;}
     else if (!rB || (static_cast<CORBA::Long>(7) != rL)) {
-       ACE_DEBUG( (LM_ERROR, "r is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "r is wrong\n")); testFailed= 1;}
     else
-       ACE_DEBUG( (LM_INFO, "OK\n") );
+       ACE_DEBUG( (LM_INFO, "OK\n"));
 
     //-----------------------------------------------------------------------
     {
@@ -329,35 +329,35 @@ ACE_TMAIN (
       arr_c[1].length (1);
       arr_c[1][0] = 9;
 
-      ACE_DEBUG( (LM_INFO, ". MyArray()     ") );
+      ACE_DEBUG( (LM_INFO, ". MyArray()     "));
       Test::MyArray_var arr_ret = foo->TestArray (arr_a, arr_b.out (), arr_c);
       CORBA::ULong zero (0), one (1); //Use ULong to avoid ambiguity
       if (arr_c[0].length () != 1 || arr_c[0][0] != 24)
         {
-          ACE_DEBUG( (LM_ERROR, "arr_c[0] is wrong\n") ); testFailed = 1;
+          ACE_DEBUG( (LM_ERROR, "arr_c[0] is wrong\n")); testFailed = 1;
         }
       else if (arr_c[1].length () != 1 || arr_c[1][0] != 10)
         {
-          ACE_DEBUG( (LM_ERROR, "arr_c[1] is wrong\n") ); testFailed = 1;
+          ACE_DEBUG( (LM_ERROR, "arr_c[1] is wrong\n")); testFailed = 1;
         }
       else if (arr_b[zero].length () != 1 || arr_b[zero][0] != 8)
         {
-          ACE_DEBUG( (LM_ERROR, "arr_b[0] is wrong\n") ); testFailed = 1;
+          ACE_DEBUG( (LM_ERROR, "arr_b[0] is wrong\n")); testFailed = 1;
         }
       else if (arr_b[one].length () != 1 || arr_b[one][0] != 22)
         {
-          ACE_DEBUG( (LM_ERROR, "arr_b[1] is wrong\n") ); testFailed = 1;
+          ACE_DEBUG( (LM_ERROR, "arr_b[1] is wrong\n")); testFailed = 1;
         }
       else if (arr_ret[zero].length () != 1 || arr_ret[zero][0] != 7)
         {
-          ACE_DEBUG( (LM_ERROR, "arr_ret[0] is wrong\n") ); testFailed = 1;
+          ACE_DEBUG( (LM_ERROR, "arr_ret[0] is wrong\n")); testFailed = 1;
         }
       else if (arr_ret[one].length () != 1 || arr_ret[one][0] != 21)
         {
-          ACE_DEBUG( (LM_ERROR, "arr_ret[1] is wrong\n") ); testFailed = 1;
+          ACE_DEBUG( (LM_ERROR, "arr_ret[1] is wrong\n")); testFailed = 1;
         }
       else
-        ACE_DEBUG( (LM_INFO, "OK\n") );
+        ACE_DEBUG( (LM_INFO, "OK\n"));
     }
 
     //-----------------------------------------------------------------------
@@ -369,11 +369,11 @@ ACE_TMAIN (
     }
 
     //-----------------------------------------------------------------------
-    foo->ShutdownServer( );
+    foo->ShutdownServer();
 
     //-----------------------------------------------------------------------
-    orb->shutdown( true );
-    orb->destroy( );
+    orb->shutdown(true);
+    orb->destroy();
   }
   catch (const CORBA::SystemException& ex)
   {
@@ -387,15 +387,15 @@ ACE_TMAIN (
   }
   catch (...)
   {
-    ACE_DEBUG( (LM_ERROR, "Unexpected general exception!\n") );
+    ACE_DEBUG( (LM_ERROR, "Unexpected general exception!\n"));
     testFailed= 1;
   }
 
-  ACE_DEBUG( (LM_INFO, "Regression test for Bug 2234 ") );
+  ACE_DEBUG( (LM_INFO, "Regression test for Bug 2234 "));
   if (testFailed)
-    ACE_DEBUG( (LM_ERROR, "Failed\n") );
+    ACE_DEBUG( (LM_ERROR, "Failed\n"));
   else
-    ACE_DEBUG( (LM_INFO, "Passed\n") );
+    ACE_DEBUG( (LM_INFO, "Passed\n"));
 
   return testFailed? -1 : 0;
 }
diff --git a/TAO/tests/Bug_2234_Regression/server.cpp b/TAO/tests/Bug_2234_Regression/server.cpp
index 0fc3e0396fa29..cc86ca282038d 100644
--- a/TAO/tests/Bug_2234_Regression/server.cpp
+++ b/TAO/tests/Bug_2234_Regression/server.cpp
@@ -71,22 +71,22 @@ class FooImpl : public POA_Test::Foo
     CORBA::Long &c
  )
   {
-    ACE_DEBUG( (LM_INFO, ". in TestLong\n") );
-    if (static_cast<CORBA::Long>( 1 ) != a)
+    ACE_DEBUG( (LM_INFO, ". in TestLong\n"));
+    if (static_cast<CORBA::Long>(1) != a)
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
-    if (static_cast<CORBA::Long>( 3 ) != c)
+    if (static_cast<CORBA::Long>(3) != c)
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
 
-    b= static_cast<CORBA::Long>(  a << 1 );
+    b= static_cast<CORBA::Long>(  a << 1);
 
-    c+= static_cast<CORBA::Long>( 1 );
-    return static_cast<CORBA::Long>( 7 );
+    c+= static_cast<CORBA::Long>( 1);
+    return static_cast<CORBA::Long>( 7);
   }
 
   //-----------------------------------------------------------
@@ -97,46 +97,46 @@ class FooImpl : public POA_Test::Foo
     char *&c
  )
   {
-    ACE_DEBUG( (LM_INFO, ". in TestString\n") );
+    ACE_DEBUG( (LM_INFO, ". in TestString\n"));
     if (0 == a)
     {
       //FUZZ: disable check_for_NULL
-      ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter a\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter a\n"));
       //FUZZ: enable check_for_NULL
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (1 != ACE_OS::strlen( a ))
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect string length for parameter a\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect string length for parameter a\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if ('1' != *a)
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (0 == c)
     {
       //FUZZ: disable check_for_NULL
-      ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter c\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter c\n"));
       //FUZZ: enable check_for_NULL
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (1 != ACE_OS::strlen( c ))
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect string length for parameter c\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect string length for parameter c\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if ('3' != *c)
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
 
-    b= CORBA::string_dup( "0" ); // Create a one character output buffer
+    b= CORBA::string_dup("0"); // Create a one character output buffer
     *b= a[0] + 1;
     *c+= 1;
-    return CORBA::string_dup( "7" );
+    return CORBA::string_dup("7");
   }
 
   //-----------------------------------------------------------
@@ -150,22 +150,22 @@ class FooImpl : public POA_Test::Foo
     Test::MyNonVarStruct
       newret;
 
-    ACE_DEBUG( (LM_INFO, ". in TestNonVarStruct\n") );
-    if (static_cast<CORBA::Long>( 1 ) != a.val)
+    ACE_DEBUG( (LM_INFO, ". in TestNonVarStruct\n"));
+    if (static_cast<CORBA::Long>(1) != a.val)
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
-    if (static_cast<CORBA::Long>( 3 ) != c.val)
+    if (static_cast<CORBA::Long>(3) != c.val)
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
 
-    newret.val= static_cast<CORBA::Long>( 7 );
+    newret.val= static_cast<CORBA::Long>( 7);
 
     Test::MyNonVarStruct *newval_p;
-    ACE_NEW_RETURN( newval_p, Test::MyNonVarStruct, newret );
+    ACE_NEW_RETURN( newval_p, Test::MyNonVarStruct, newret);
     Test::MyNonVarStruct_var
       newval= newval_p;
 
@@ -184,39 +184,39 @@ class FooImpl : public POA_Test::Foo
     Test::MyVarStruct &c
  )
   {
-    ACE_DEBUG( (LM_INFO, ". in TestVarStruct\n") );
+    ACE_DEBUG( (LM_INFO, ". in TestVarStruct\n"));
     if (0 == a.val.in())
     {
       //FUZZ: disable check_for_NULL
-      ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter a\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter a\n"));
       //FUZZ: enable check_for_NULL
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (1 != ACE_OS::strlen( a.val.in() ))
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect string length for parameter a\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect string length for parameter a\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if ('1' != *a.val.in())
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (0 == c.val.in())
     {
       //FUZZ: disable check_for_NULL
-      ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter c\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter c\n"));
       //FUZZ: enable check_for_NULL
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (1 != ACE_OS::strlen( c.val.in() ))
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect string length for parameter c\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect string length for parameter c\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if ('3' != *c.val.in())
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
 
@@ -226,18 +226,18 @@ class FooImpl : public POA_Test::Foo
     Test::MyVarStruct_var
       newval_p,
       newret_p;
-    ACE_NEW_RETURN( newval_p, Test::MyVarStruct(), 0 );
+    ACE_NEW_RETURN( newval_p, Test::MyVarStruct(), 0);
     Test::MyVarStruct_var
       newval= newval_p;
-    ACE_NEW_RETURN( newret_p, Test::MyVarStruct(), 0 );
+    ACE_NEW_RETURN( newret_p, Test::MyVarStruct(), 0);
     Test::MyVarStruct_var
       newret= newret_p;
 
-    newval->val= CORBA::string_dup( ca );
+    newval->val= CORBA::string_dup( ca);
 
     *c.val.inout()+= 1;
 
-    newret->val= CORBA::string_dup( "7" );
+    newret->val= CORBA::string_dup( "7");
 
     b= newval._retn();
     return newret._retn();
@@ -248,29 +248,28 @@ class FooImpl : public POA_Test::Foo
   Test::MyNonVarUnion TestNonVarUnion(
     const Test::MyNonVarUnion &a,
     Test::MyNonVarUnion_out b,
-    Test::MyNonVarUnion &c
- )
+    Test::MyNonVarUnion &c)
   {
     Test::MyNonVarUnion
       newret;
 
-    ACE_DEBUG( (LM_INFO, ". in TestNonVarUnion\n") );
-    if (static_cast<CORBA::Short>( 1 ) != a._d())
+    ACE_DEBUG( (LM_INFO, ". in TestNonVarUnion\n"));
+    if (static_cast<CORBA::Short>(1) != a._d())
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect type of parameter a\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect type of parameter a\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
-    if (static_cast<CORBA::Long>( 1 ) != a.valLong())
+    if (static_cast<CORBA::Long>(1) != a.valLong())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
-    if (static_cast<CORBA::Short>( 1 ) != c._d())
+    if (static_cast<CORBA::Short>(1) != c._d())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect type of parameter c\n") );
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
-    if (static_cast<CORBA::Long>( 3 ) != c.valLong())
+    if (static_cast<CORBA::Long>(3) != c.valLong())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
@@ -284,7 +283,7 @@ class FooImpl : public POA_Test::Foo
     newval->valLong( a.valLong() << 1 );
     c.valLong( c.valLong() + 1 );
 
-    newret.valLong( static_cast<CORBA::Long>( 7 ) );
+    newret.valLong( static_cast<CORBA::Long>(7));
 
     b= newval._retn();
     return newret;
@@ -299,22 +298,22 @@ class FooImpl : public POA_Test::Foo
  )
   {
     ACE_DEBUG( (LM_INFO, ". in TestVarUnion\n") );
-    if (static_cast<CORBA::Short>( 1 ) != a._d())
+    if (static_cast<CORBA::Short>(1) != a._d())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect type of parameter a\n") );
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
-    if (static_cast<CORBA::Long>( 1 ) != a.valLong())
+    if (static_cast<CORBA::Long>(1) != a.valLong())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
-    if (static_cast<CORBA::Short>( 1 ) != c._d())
+    if (static_cast<CORBA::Short>(1) != c._d())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect type of parameter c\n") );
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
-    if (static_cast<CORBA::Long>( 3 ) != c.valLong())
+    if (static_cast<CORBA::Long>(3) != c.valLong())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
@@ -330,10 +329,10 @@ class FooImpl : public POA_Test::Foo
 
     Test::MyVarUnion_var
       newret_p;
-    ACE_NEW_RETURN( newret_p, Test::MyVarUnion(), 0 );
+    ACE_NEW_RETURN( newret_p, Test::MyVarUnion(), 0);
     Test::MyVarUnion_var
       newret= newret_p;
-    newret->valLong( static_cast<CORBA::Short>( 7 ) );
+    newret->valLong( static_cast<CORBA::Short>(7) );
 
     b= newval._retn();
     return newret._retn();
@@ -353,7 +352,7 @@ class FooImpl : public POA_Test::Foo
       ACE_DEBUG( (LM_INFO, "* Incorrect length of parameter a\n") );
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
-    if (static_cast<CORBA::Long>( 1 ) != a[0])
+    if (static_cast<CORBA::Long>(1) != a[0])
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
@@ -363,7 +362,7 @@ class FooImpl : public POA_Test::Foo
       ACE_DEBUG( (LM_INFO, "* Incorrect length of parameter c\n") );
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
-    if (static_cast<CORBA::Long>( 3 ) != c[0])
+    if (static_cast<CORBA::Long>(3) != c[0])
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
@@ -402,7 +401,7 @@ class FooImpl : public POA_Test::Foo
     CORBA::Long cL;
     if (a >>= aL)
     {
-      if (static_cast<CORBA::Long>( 1 ) != aL)
+      if (static_cast<CORBA::Long>(1) != aL)
       {
         ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
         throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
@@ -415,7 +414,7 @@ class FooImpl : public POA_Test::Foo
     }
     if (c >>= cL)
     {
-      if (static_cast<CORBA::Long>( 3 ) != cL)
+      if (static_cast<CORBA::Long>(3) != cL)
       {
         ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
         throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
diff --git a/TAO/tests/Bug_2417_Regression/server.cpp b/TAO/tests/Bug_2417_Regression/server.cpp
index a0f37b7afa215..b9fa51e3b41d7 100644
--- a/TAO/tests/Bug_2417_Regression/server.cpp
+++ b/TAO/tests/Bug_2417_Regression/server.cpp
@@ -84,8 +84,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       poa_manager->activate();
 
-      const CORBA::Object_var pmobj (orb->resolve_initial_references("ORBPolicyManager" ) );
-      CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow(pmobj.in() );
+      const CORBA::Object_var pmobj (orb->resolve_initial_references("ORBPolicyManager" ));
+      CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow(pmobj.in());
 
       CORBA::Any orb_level;
       orb_level <<= Messaging::SYNC_NONE;
diff --git a/TAO/tests/Bug_2560_Regression/Quoter.idl b/TAO/tests/Bug_2560_Regression/Quoter.idl
index 755b72240ad6c..d3ba6eb79048c 100644
--- a/TAO/tests/Bug_2560_Regression/Quoter.idl
+++ b/TAO/tests/Bug_2560_Regression/Quoter.idl
@@ -27,7 +27,6 @@ module Quoter
     // = DESCRIPTION
     //   Return the price and name of a single stock
     //
-
     typedef sequence<double> StockHistory ;
 
     readonly attribute string symbol;
@@ -39,7 +38,6 @@ module Quoter
     double price ();
     // Get the price
 
-    StockHistory history() ;
-
+    StockHistory history();
   };
 };
diff --git a/TAO/tests/Bug_2560_Regression/Stock_i.cpp b/TAO/tests/Bug_2560_Regression/Stock_i.cpp
index dd3e473e8f873..0df17c0ef9ba0 100644
--- a/TAO/tests/Bug_2560_Regression/Stock_i.cpp
+++ b/TAO/tests/Bug_2560_Regression/Stock_i.cpp
@@ -38,14 +38,14 @@ Quoter_Stock_i::history ()
 
   // delay a little bit so we have chance to kill client
   // before this method returns
-  ACE_OS::sleep(5) ;
+  ACE_OS::sleep(5);
 
   const unsigned hsize = 200000 ;
-  hist->length(hsize) ;
-  for ( unsigned int i = 0 ; i < hsize ; ++ i ) {
-    hist[i] = double(i+1) ;
+  hist->length(hsize);
+  for (unsigned int i = 0 ; i < hsize ; ++ i) {
+    hist[i] = double(i+1);
   }
 
   ACE_DEBUG ((LM_DEBUG, "Returning method in server\n"));
-  return hist._retn() ;
+  return hist._retn();
 }
diff --git a/TAO/tests/Bug_2560_Regression/Stock_i.h b/TAO/tests/Bug_2560_Regression/Stock_i.h
index 15088b2053657..8cdefb39ed36d 100644
--- a/TAO/tests/Bug_2560_Regression/Stock_i.h
+++ b/TAO/tests/Bug_2560_Regression/Stock_i.h
@@ -16,7 +16,7 @@ class Quoter_Stock_i : public POA_Quoter::Stock {
   CORBA::Double price ();
   Quoter::Stock::StockHistory * history ();
 
-  static void set_default_POA ( PortableServer::POA_ptr poa )
+  static void set_default_POA (PortableServer::POA_ptr poa)
   {
     Quoter_Stock_i::_poa = PortableServer::POA::_duplicate (poa);
   }
diff --git a/TAO/tests/Bug_2560_Regression/client.cpp b/TAO/tests/Bug_2560_Regression/client.cpp
index 60590fba8fbca..c6d21dbae1d9a 100644
--- a/TAO/tests/Bug_2560_Regression/client.cpp
+++ b/TAO/tests/Bug_2560_Regression/client.cpp
@@ -38,10 +38,10 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         // Now get the price
         CORBA::Double price = stock->price ();
 
-        Quoter::Stock::StockHistory_var history = stock->history() ;
+        Quoter::Stock::StockHistory_var history = stock->history();
 
         cout << "The price of a stock in \"" << full_name.in () << "\" is $" << price << endl;
-        cout << "  history: " << history[0] << " " << history[1] << " ... " << history[history->length()-1] << endl ;
+        cout << "  history: " << history[0] << " " << history[1] << " ... " << history[history->length()-1] << endl;
       } catch (Quoter::Invalid_Stock_Symbol &) {
         cerr << "Invalid stock symbol <" << argv[i] << ">" << endl;
       }
diff --git a/TAO/tests/Bug_2560_Regression/server.cpp b/TAO/tests/Bug_2560_Regression/server.cpp
index c7011f548d0eb..bd68c25006e89 100644
--- a/TAO/tests/Bug_2560_Regression/server.cpp
+++ b/TAO/tests/Bug_2560_Regression/server.cpp
@@ -47,21 +47,21 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     poa_manager->activate ();
 
     // Make policies for child POA
-    CORBA::PolicyList policies(2) ;
-    policies.length(2) ;
-    policies[0] = root_poa->create_lifespan_policy ( PortableServer::PERSISTENT ) ;
-    policies[1] = root_poa->create_id_assignment_policy ( PortableServer::USER_ID ) ;
+    CORBA::PolicyList policies(2);
+    policies.length(2);
+    policies[0] = root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
+    policies[1] = root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
-    PortableServer::POA_var poa = root_poa->create_POA ( "MyPOA", poa_manager.in(), policies );
+    PortableServer::POA_var poa = root_poa->create_POA ("MyPOA", poa_manager.in(), policies);
 
     // Creation of the new POAs over, so destroy the Policy_ptr's.
-    for ( CORBA::ULong i = 0 ; i < policies.length (); ++i ) {
+    for (CORBA::ULong i = 0 ; i < policies.length (); ++i) {
       CORBA::Policy_ptr policy = policies[i];
       policy->destroy ();
     }
 
     // use this poa for making system objects
-    Quoter_Stock_i::set_default_POA ( poa.in() ) ;
+    Quoter_Stock_i::set_default_POA (poa.in());
 
     // Create the servant
     Quoter_Stock_Factory_i *stock_factory_i = 0;
diff --git a/TAO/tests/Bug_2702_Regression/fakeserver.pm b/TAO/tests/Bug_2702_Regression/fakeserver.pm
index ac6a954178cdf..ca99be36a8f98 100644
--- a/TAO/tests/Bug_2702_Regression/fakeserver.pm
+++ b/TAO/tests/Bug_2702_Regression/fakeserver.pm
@@ -17,7 +17,7 @@ sub run {
   my $self = shift;
   my $timeoutafter = shift; # in seconds
   my $rout;
-  while ( 1 ) {
+  while (1) {
     print STDERR "fakeserver: Loop\n";
 
     select( undef, undef, undef, 1 );
@@ -31,7 +31,7 @@ sub run {
     my $routs = unpack("b*", $rout);
     print STDERR "fakeserver: Select $routs\n";
     my $pos = index( $routs,'1');
-    while ( $pos >= 0 ) {
+    while ( $pos >= 0) {
       $self->HandleFile( $pos );
       $pos = index( $routs,'1', $pos+1);
     }
@@ -73,7 +73,7 @@ sub OpenServer {
 
 sub SendMessage {
   my $self = shift;
-  my( $message ) = @_;
+  my( $message) = @_;
 
   print STDERR "fakeserver: SendMessage $message\n";
   $message .= "\r\n";
@@ -88,7 +88,7 @@ sub SendMessage {
 
 sub HandleFile {
   my $self = shift;
-  my ( $fileno ) = @_;
+  my ($fileno) = @_;
 
   print STDERR "fakeserver: HandleFile $fileno\n";
   if ( $fileno == $self->{'server_fileno'} ) {
diff --git a/TAO/tests/Bug_2791_Regression/Message_i.cpp b/TAO/tests/Bug_2791_Regression/Message_i.cpp
index 3362d2b30e3e8..86356a1cc64f8 100644
--- a/TAO/tests/Bug_2791_Regression/Message_i.cpp
+++ b/TAO/tests/Bug_2791_Regression/Message_i.cpp
@@ -22,8 +22,7 @@ MessageImpl::_copy_value ()
       subject_ (),
       text_ ()
     ),
-    ::CORBA::NO_MEMORY ()
-  );
+    ::CORBA::NO_MEMORY ());
   return ret_val;
 }
 
diff --git a/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp b/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp
index 4d2a19ed7880f..c98d22f8e0c8c 100644
--- a/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp
+++ b/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp
@@ -83,7 +83,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       PortableServer::TRANSIENT);
 
     PortableServer::POA_var fooPoa = rootPOA->create_POA (
-      "FOO_POA", poaMgr.in (), policies );
+      "FOO_POA", poaMgr.in (), policies);
 
     for (CORBA::ULong i = 0; i < policies.length (); ++i)
     {
@@ -91,7 +91,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     }
 
     Foo_i servant;
-    PortableServer::ObjectId_var oid = fooPoa->activate_object( &servant );
+    PortableServer::ObjectId_var oid = fooPoa->activate_object( &servant);
 
     CORBA::Object_var obj = fooPoa->id_to_reference (oid.in ());
 
@@ -105,7 +105,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       return 1;
     }
 
-    fooPoa->deactivate_object (oid.in () );  //servant is gone
+    fooPoa->deactivate_object (oid.in ());  //servant is gone
 
     if (vc_check(client.in(), false))  //exception expected
     {
diff --git a/TAO/tests/Bug_2935_Regression/middle.cpp b/TAO/tests/Bug_2935_Regression/middle.cpp
index 0ca31fd3a57dd..f9dc1eb24bb2d 100644
--- a/TAO/tests/Bug_2935_Regression/middle.cpp
+++ b/TAO/tests/Bug_2935_Regression/middle.cpp
@@ -74,7 +74,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         CORBA::ORB_init (argc,
                          argv);
 
-      if ( ! parse_args (argc, argv))
+      if (!parse_args (argc, argv))
         {
           return -1;
         }
diff --git a/TAO/tests/Bug_2935_Regression/middle_i.h b/TAO/tests/Bug_2935_Regression/middle_i.h
index 60388ac8d2cf1..67ce47a4f5f7f 100644
--- a/TAO/tests/Bug_2935_Regression/middle_i.h
+++ b/TAO/tests/Bug_2935_Regression/middle_i.h
@@ -31,7 +31,7 @@ class Middle_i: public POA_ThreeTier
   Middle_i (CORBA::ORB_ptr orb, ThreeTier_ptr target);
   ~Middle_i ();
 
-  bool parse_args (int argc, ACE_TCHAR* argv[] );
+  bool parse_args (int argc, ACE_TCHAR* argv[]);
 
   //////////////////////////////////////
   /// Implement the ThreeTier interface
diff --git a/TAO/tests/Bug_2935_Regression/sink.cpp b/TAO/tests/Bug_2935_Regression/sink.cpp
index fa13971ef3f02..3677b28d347bb 100644
--- a/TAO/tests/Bug_2935_Regression/sink.cpp
+++ b/TAO/tests/Bug_2935_Regression/sink.cpp
@@ -59,7 +59,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         CORBA::ORB_init (argc,
                          argv);
 
-      if ( ! parse_args (argc, argv))
+      if (!parse_args (argc, argv))
         {
           return -1;
         }
diff --git a/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp b/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp
index 914a0b54ec081..97e8ee72f659c 100644
--- a/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp
+++ b/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp
@@ -9,15 +9,15 @@
 const ACE_TCHAR *POAname_ = 0;
 const ACE_TCHAR *ORBname_ = 0;
 
-PersistentPoa::PersistentPoa ( )
+PersistentPoa::PersistentPoa ()
 {
-} /* end of PersistentPoa::PersistentPoa ( ) */
+}
 
 
-PersistentPoa::~PersistentPoa ( )
+PersistentPoa::~PersistentPoa ()
   throw ()
 {
-} /* end of PersistentPoa::~PersistentPoa ( ) */
+}
 
 
 int PersistentPoa::init (int argc, ACE_TCHAR *argv[])
@@ -71,8 +71,7 @@ int PersistentPoa::init (int argc, ACE_TCHAR *argv[])
     mv_thisPOA = mv_rootPOA->create_POA(
       ACE_TEXT_ALWAYS_CHAR(POAname_),
       PortableServer::POAManager::_nil(),
-      policies
-    );
+      policies);
     if (CORBA::is_nil(mv_thisPOA.in()))
     {
       ACE_DEBUG((
@@ -113,7 +112,7 @@ int PersistentPoa::init (int argc, ACE_TCHAR *argv[])
   ));
 
   return result;
-} /* end of PersistentPoa::init ( ) */
+}
 
 
 int PersistentPoa::fini ()
@@ -141,7 +140,6 @@ int PersistentPoa::fini ()
   ));
 
   return result;
-} /* end of PersistentPoa::fini ( ) */
-
+}
 
 ACE_FACTORY_DEFINE (bug2936, PersistentPoa)
diff --git a/TAO/tests/Bug_2936_Regression/PersistentPOA.h b/TAO/tests/Bug_2936_Regression/PersistentPOA.h
index 1bd7c53e1094d..4bf9951ab4395 100644
--- a/TAO/tests/Bug_2936_Regression/PersistentPOA.h
+++ b/TAO/tests/Bug_2936_Regression/PersistentPOA.h
@@ -15,10 +15,10 @@ class bug2936_Export PersistentPoa
   // public types and methods
   public:
     /// Default constructor.
-    PersistentPoa ( );
+    PersistentPoa ();
 
     /// Destructor.
-    ~PersistentPoa ( )
+    ~PersistentPoa ()
       throw ();
 
   // protected types and methods
diff --git a/TAO/tests/Bug_2953_Regression/server.cpp b/TAO/tests/Bug_2953_Regression/server.cpp
index 5c55c057945b9..3b5c22692a516 100644
--- a/TAO/tests/Bug_2953_Regression/server.cpp
+++ b/TAO/tests/Bug_2953_Regression/server.cpp
@@ -129,7 +129,7 @@ RTCORBA::RTORB_ptr getRTORB(CORBA::ORB_ptr orb, const char *id)
 {
   CORBA::Object_var obj = orb->resolve_initial_references("RTORB");
   RTCORBA::RTORB_ptr rtorb = RTCORBA::RTORB::_narrow(obj.in());
-  if ( CORBA::is_nil(rtorb))
+  if (CORBA::is_nil(rtorb))
     {
       ACE_ERROR ((LM_ERROR,
                   "Failed getting RTORB for orb <%C>\n",
@@ -142,7 +142,7 @@ PortableServer::POA_ptr getRootPoa(CORBA::ORB_ptr orb, const char *id)
 {
   CORBA::Object_var obj = orb->resolve_initial_references("RootPOA");
   PortableServer::POA_ptr poa = PortableServer::POA::_narrow(obj.in());
-  if ( CORBA::is_nil(poa) )
+  if (CORBA::is_nil(poa))
     {
       ACE_ERROR ((LM_ERROR,
                   "Failed getting RootPOA for orb <%C>\n",
diff --git a/TAO/tests/Bug_3154_Regression/orbsvcs/CosNotification.idl b/TAO/tests/Bug_3154_Regression/orbsvcs/CosNotification.idl
index 17ace4b9f2b04..a067f40a6071e 100644
--- a/TAO/tests/Bug_3154_Regression/orbsvcs/CosNotification.idl
+++ b/TAO/tests/Bug_3154_Regression/orbsvcs/CosNotification.idl
@@ -311,8 +311,8 @@ module CosNotification
      *   implemented or is invalid.  The exception contents describe
      *   the problem(s) in detail.
      */
-    void set_qos ( in QoSProperties qos)
-      raises ( UnsupportedQoS );
+    void set_qos (in QoSProperties qos)
+      raises (UnsupportedQoS);
 
     /// Validate a set of QoS properties
     /**
@@ -327,7 +327,7 @@ module CosNotification
      */
     void validate_qos (in QoSProperties required_qos,
                        out NamedPropertyRangeSeq available_qos )
-      raises ( UnsupportedQoS );
+      raises (UnsupportedQoS);
   };
 
   //@{
@@ -380,7 +380,7 @@ module CosNotification
      *   cannot be implemented or are invalid
      */
     void set_admin (in AdminProperties admin)
-      raises ( UnsupportedAdmin);
+      raises (UnsupportedAdmin);
   };
 
 };
diff --git a/TAO/tests/Bug_3171_Regression/server.cpp b/TAO/tests/Bug_3171_Regression/server.cpp
index 4fd51bacac32d..5acca9c4bfe86 100644
--- a/TAO/tests/Bug_3171_Regression/server.cpp
+++ b/TAO/tests/Bug_3171_Regression/server.cpp
@@ -69,7 +69,7 @@ class MyORBinitializer
 {
 public:
   MyORBinitializer( ACE_CString orbID )
-    : orbID_( orbID ) {};
+    : orbID_(orbID) {};
 
   virtual
   void
@@ -104,7 +104,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     if (parse_args (argc, argv) != 0)
       return 1;
 
-    if ( g_initInMain )
+    if (g_initInMain)
     {
       initORB(0);
     }
@@ -157,18 +157,18 @@ initORB(int threadID)
 
     ACE_DEBUG ((LM_DEBUG, "Initializing ORB \"%C\"\n", ORBid));
 
-    if ( g_registerORBinitializer )
+    if (g_registerORBinitializer)
     {
       ACE_DEBUG ((LM_DEBUG, "Creating ORB initializer\n"));
       PortableInterceptor::ORBInitializer_var rCOI(
-        new MyORBinitializer( ORBid ) );
-      PortableInterceptor::register_orb_initializer( rCOI.in() );
+        new MyORBinitializer(ORBid));
+      PortableInterceptor::register_orb_initializer( rCOI.in());
     }
 
     ACE_DEBUG ((LM_DEBUG, "Creating TAO_ORB_Manager\n"));
     TAO_ORB_Manager* pORBmgr = new TAO_ORB_Manager;
 
-    if ( -1 == pORBmgr->init( g_argc, g_argv, ORBid ) )
+    if (-1 == pORBmgr->init(g_argc, g_argv, ORBid))
     {
       ACE_DEBUG ((LM_DEBUG, "Failed to initialize ORB \"%C\"\n", ORBid));
       throw CORBA::INTERNAL();
@@ -176,7 +176,7 @@ initORB(int threadID)
 
     ACE_DEBUG ((LM_DEBUG, "ORB \"%C\" initialized\n", ORBid));
 
-    if ( g_setTimeout )
+    if (g_setTimeout)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Setting connection timeout policy for ORB \"%C\"\n",
@@ -190,12 +190,10 @@ initORB(int threadID)
       CORBA::Any any;
       any <<= connectionTimeout;
 
-      CORBA::ULong l( policyList.length() );
-      policyList.length( l+1 );
+      CORBA::ULong l( policyList.length());
+      policyList.length(l+1);
 
-      policyList[l] = orb->create_policy(
-        TAO::CONNECTION_TIMEOUT_POLICY_TYPE,
-        any );
+      policyList[l] = orb->create_policy(TAO::CONNECTION_TIMEOUT_POLICY_TYPE, any);
 
       ACE_DEBUG ((LM_DEBUG, "Connection timeout policy set for ORB \"%C\"\n",
                   ORBid));
diff --git a/TAO/tests/Bug_3251_Regression/DllOrb.cpp b/TAO/tests/Bug_3251_Regression/DllOrb.cpp
index 89d43fcdab988..b10f270e0b715 100644
--- a/TAO/tests/Bug_3251_Regression/DllOrb.cpp
+++ b/TAO/tests/Bug_3251_Regression/DllOrb.cpp
@@ -78,8 +78,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[])
 
   this->activate(
     THR_NEW_LWP|THR_JOINABLE|THR_INHERIT_SCHED,
-    threadCnt
-  );
+    threadCnt);
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("init mp_barrier->wait() ...\n")));
   ma_barrier_->wait();
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("init mp_barrier->wait() done\n")));
@@ -165,7 +164,7 @@ int DllOrb::svc ()
   }
 
   return 0;
-} /* end of DllOrb::svc ( ) */
+} /* end of DllOrb::svc () */
 
 
 ACE_FACTORY_DEFINE (bug_3251, DllOrb)
diff --git a/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp b/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp
index 9d8899302289b..ab58e62659344 100644
--- a/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp
+++ b/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp
@@ -4,14 +4,14 @@
 
 #include "PersistentPoa.h"
 
-PersistentPoa::PersistentPoa ( )
+PersistentPoa::PersistentPoa ()
 {
-} /* end of PersistentPoa::PersistentPoa ( ) */
+}
 
-PersistentPoa::~PersistentPoa ( )
+PersistentPoa::~PersistentPoa ()
   throw ()
 {
-} /* end of PersistentPoa::~PersistentPoa ( ) */
+}
 
 int PersistentPoa::init (int argc, ACE_TCHAR *argv[])
 {
@@ -45,8 +45,7 @@ int PersistentPoa::init (int argc, ACE_TCHAR *argv[])
     mv_thisPOA = mv_rootPOA->create_POA (
       m_poaName.c_str (),
       PortableServer::POAManager::_nil (),
-      policies
-    );
+      policies);
 
     mv_poaManager = mv_thisPOA->the_POAManager ();
     mv_poaManager->activate ();
@@ -60,7 +59,7 @@ int PersistentPoa::init (int argc, ACE_TCHAR *argv[])
   ACE_DEBUG ((LM_ERROR, ACE_TEXT ("POA activated\n")));
 
   return 0;
-} /* end of PersistentPoa::init ( ) */
+}
 
 
 int PersistentPoa::fini ()
@@ -82,7 +81,7 @@ int PersistentPoa::fini ()
   ACE_DEBUG ((LM_ERROR, ACE_TEXT ("POA deactivated\n")));
 
   return 0;
-} /* end of PersistentPoa::fini ( ) */
+}
 
 
 ACE_FACTORY_DEFINE (bug_3251, PersistentPoa)
diff --git a/TAO/tests/Bug_3251_Regression/PersistentPoa.h b/TAO/tests/Bug_3251_Regression/PersistentPoa.h
index cb43a653b553e..33402ea49d14f 100644
--- a/TAO/tests/Bug_3251_Regression/PersistentPoa.h
+++ b/TAO/tests/Bug_3251_Regression/PersistentPoa.h
@@ -14,9 +14,9 @@ class bug_3251_Export PersistentPoa:  public ACE_Service_Object
 {
   // public types and methods
   public:
-    PersistentPoa ( );
+    PersistentPoa ();
 
-    ~PersistentPoa ( )
+    ~PersistentPoa ()
       throw ();
 
   // protected types and methods
diff --git a/TAO/tests/Bug_3470_Regression/test.cpp b/TAO/tests/Bug_3470_Regression/test.cpp
index e8a0b7b4cf408..ea15591c6280a 100644
--- a/TAO/tests/Bug_3470_Regression/test.cpp
+++ b/TAO/tests/Bug_3470_Regression/test.cpp
@@ -18,8 +18,8 @@ int ACE_TMAIN( int argc, ACE_TCHAR * argv[] )
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       CORBA::ORB_ObjectIdList_var listsrv = orb->list_initial_services();
-      for (CORBA::ULong index = 0 ; index < listsrv->length() ; index++ )
-        if ( ACE_OS::strcmp(listsrv[index],"MyObjectId") == 0)
+      for (CORBA::ULong index = 0 ; index < listsrv->length(); index++ )
+        if (ACE_OS::strcmp(listsrv[index],"MyObjectId") == 0)
           retcode = 0;
 
       orb->destroy();
diff --git a/TAO/tests/Bug_3542_Regression/DllOrb.cpp b/TAO/tests/Bug_3542_Regression/DllOrb.cpp
index d06d663db4149..0747038f24c78 100644
--- a/TAO/tests/Bug_3542_Regression/DllOrb.cpp
+++ b/TAO/tests/Bug_3542_Regression/DllOrb.cpp
@@ -75,8 +75,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[])
 
   this->activate(
     THR_NEW_LWP|THR_JOINABLE|THR_INHERIT_SCHED,
-    threadCnt
-  );
+    threadCnt);
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("init mp_barrier->wait() ...\n")));
   ma_barrier_->wait();
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("init mp_barrier->wait() done\n")));
@@ -162,7 +161,7 @@ int DllOrb::svc ()
   }
 
   return 0;
-} /* end of DllOrb::svc ( ) */
+}
 
 
 ACE_FACTORY_DEFINE (bug_3542, DllOrb)
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp b/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp
index 985cbd3e7cae3..358363115d024 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp
@@ -62,10 +62,10 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     Stock_Quoter_var quoter = Stock_Quoter::_narrow (stock_quoter_obj.in());
 
-    memset( Msg, 1, 1000 ) ;
-    //UDP->send( 10 ) ;
+    memset(Msg, 1, 1000);
+    //UDP->send( 10 );
 
-    server->send( Msg ) ;
+    server->send(Msg);
 
     try
       {
diff --git a/TAO/tests/Bug_3547_Regression/UDPTest.idl b/TAO/tests/Bug_3547_Regression/UDPTest.idl
index 5ca1b3e2688cd..507eb6724fec4 100644
--- a/TAO/tests/Bug_3547_Regression/UDPTest.idl
+++ b/TAO/tests/Bug_3547_Regression/UDPTest.idl
@@ -3,9 +3,9 @@
 
 interface UDPTestI
 {
-    typedef octet BufferT[1000] ;
+  typedef octet BufferT[1000] ;
 
-    oneway void send( in BufferT Msg );
+  oneway void send( in BufferT Msg);
 };
 
 
diff --git a/TAO/tests/Bug_3547_Regression/UDPTest_i.cpp b/TAO/tests/Bug_3547_Regression/UDPTest_i.cpp
index e318f1ecfae6c..b6952f0b116e1 100644
--- a/TAO/tests/Bug_3547_Regression/UDPTest_i.cpp
+++ b/TAO/tests/Bug_3547_Regression/UDPTest_i.cpp
@@ -13,7 +13,7 @@ UDPTest_i::~UDPTest_i ()
 
 void UDPTest_i::send( const ::UDPTestI::BufferT Msg )
 {
-    memcpy( buf, Msg, 1000 ) ;
-    memset( buf, 0, 1000 ) ;
+    memcpy( buf, Msg, 1000 );
+    memset( buf, 0, 1000 );
     received_send_ = true;
 }
diff --git a/TAO/tests/Bug_3547_Regression/UDPTest_i.h b/TAO/tests/Bug_3547_Regression/UDPTest_i.h
index 3ecdc41eed66f..9cc4fc131d46d 100644
--- a/TAO/tests/Bug_3547_Regression/UDPTest_i.h
+++ b/TAO/tests/Bug_3547_Regression/UDPTest_i.h
@@ -10,7 +10,7 @@ class UDPTest_i : public virtual POA_UDPTestI
    UDPTest_i ();
    virtual ~UDPTest_i ();
 
-   virtual void send( const ::UDPTestI::BufferT Msg );
+   virtual void send(const ::UDPTestI::BufferT Msg);
 
    bool received_send_;
 };
diff --git a/TAO/tests/Bug_3548_Regression/client.cpp b/TAO/tests/Bug_3548_Regression/client.cpp
index 94b05e0b76625..c72b9a0927e21 100644
--- a/TAO/tests/Bug_3548_Regression/client.cpp
+++ b/TAO/tests/Bug_3548_Regression/client.cpp
@@ -20,7 +20,7 @@ void eat_my_memory()
   else
     {
       _message_buffer->length(1);
-      (*_message_buffer)[0] = CORBA::string_dup( output_string );
+      (*_message_buffer)[0] = CORBA::string_dup( output_string);
     }
 }
 
diff --git a/TAO/tests/Bug_3567_Regression/client.cpp b/TAO/tests/Bug_3567_Regression/client.cpp
index c6b77137254a3..42fa8210ad865 100644
--- a/TAO/tests/Bug_3567_Regression/client.cpp
+++ b/TAO/tests/Bug_3567_Regression/client.cpp
@@ -93,7 +93,7 @@ class Client : public ACE_Task_Base
   /// ctor
   Client (A::AMI_Test_ptr server, int niterations, A::AMI_AMI_TestHandler_ptr hnd);
   /// dtor
-  ~Client () ;
+  ~Client ();
 
   /// The thread entry point.
   virtual int svc ();
diff --git a/TAO/tests/Bug_3598a_Regression/Hello.cpp b/TAO/tests/Bug_3598a_Regression/Hello.cpp
index 2e31783440f6d..16f276e957cfb 100644
--- a/TAO/tests/Bug_3598a_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3598a_Regression/Hello.cpp
@@ -14,5 +14,5 @@ Hello::get_string ()
 void
 Hello::shutdown ()
 {
-  this->orb_->shutdown (0 );
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Bug_3598a_Regression/client.cpp b/TAO/tests/Bug_3598a_Regression/client.cpp
index cd707ae672f07..bdd21dc4fca44 100644
--- a/TAO/tests/Bug_3598a_Regression/client.cpp
+++ b/TAO/tests/Bug_3598a_Regression/client.cpp
@@ -62,7 +62,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         orb->string_to_object (ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () );
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
diff --git a/TAO/tests/Bug_3598a_Regression/server.cpp b/TAO/tests/Bug_3598a_Regression/server.cpp
index f9ddf6315dcd1..7aa4336608b46 100644
--- a/TAO/tests/Bug_3598a_Regression/server.cpp
+++ b/TAO/tests/Bug_3598a_Regression/server.cpp
@@ -41,10 +41,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" );
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () );
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -67,7 +67,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () );
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
diff --git a/TAO/tests/Bug_3746_Regression/Test_i.h b/TAO/tests/Bug_3746_Regression/Test_i.h
index 296c9febd5d08..c6e2a70828587 100644
--- a/TAO/tests/Bug_3746_Regression/Test_i.h
+++ b/TAO/tests/Bug_3746_Regression/Test_i.h
@@ -16,8 +16,7 @@ class BoundSequences
   // = The skeleton methods
   virtual ::CORBA::ULong SendSequenceOf10Long (
     ::CORBA::ULong LengthSent,
-    const ::Test::BoundSequences::SequenceOf10Long &inSeq
-  );
+    const ::Test::BoundSequences::SequenceOf10Long &inSeq);
 
   virtual void shutdown ();
 
diff --git a/TAO/tests/Bug_3853_Regression/client.cpp b/TAO/tests/Bug_3853_Regression/client.cpp
index 9b9b368686244..d95b6ccde0c97 100644
--- a/TAO/tests/Bug_3853_Regression/client.cpp
+++ b/TAO/tests/Bug_3853_Regression/client.cpp
@@ -53,7 +53,7 @@ class ClientTask : public ACE_Task_Base
           ++ i;
           ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)======client calling server1 sayHello %d\n"), i));
           const char* pMsg = " server1 say Hello";
-          hello->sayHello(pMsg) ;
+          hello->sayHello(pMsg);
           ACE_OS::sleep(2);
 
           if (caught_exception) {
diff --git a/TAO/tests/Bug_3853_Regression/client_interceptor.cpp b/TAO/tests/Bug_3853_Regression/client_interceptor.cpp
index 3a452de746531..72004e255b688 100644
--- a/TAO/tests/Bug_3853_Regression/client_interceptor.cpp
+++ b/TAO/tests/Bug_3853_Regression/client_interceptor.cpp
@@ -69,7 +69,7 @@ Echo_Client_Request_Interceptor::send_request (
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)Echo_Client_Request_Interceptor::send_request(%d) ")
                             ACE_TEXT ("call server2 HelloWorld::sayHello() \n"), isRecursive));
       const char* pMsg = " server2 say Hello";
-      hello->sayHello(pMsg) ;
+      hello->sayHello(pMsg);
     }
   }
 }
diff --git a/TAO/tests/Bug_3853_Regression/server.cpp b/TAO/tests/Bug_3853_Regression/server.cpp
index 4d8dbec41a12a..63ee4c947e581 100644
--- a/TAO/tests/Bug_3853_Regression/server.cpp
+++ b/TAO/tests/Bug_3853_Regression/server.cpp
@@ -59,15 +59,15 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     policies.length (5);
     // Lifespan policy
     policies[0] =
-      rootPOA->create_lifespan_policy (PortableServer::PERSISTENT );
+      rootPOA->create_lifespan_policy (PortableServer::PERSISTENT);
 
     // Servant Retention Policy
     policies[1] =
-      rootPOA->create_servant_retention_policy (PortableServer::RETAIN );
+      rootPOA->create_servant_retention_policy (PortableServer::RETAIN);
 
     // ID Assignment Policy
     policies[2] =
-      rootPOA->create_id_assignment_policy (PortableServer::USER_ID );
+      rootPOA->create_id_assignment_policy (PortableServer::USER_ID);
 
     // Request Processing Policy
     policies[3] =
diff --git a/TAO/tests/Bug_933_Regression/MessengerClient.cpp b/TAO/tests/Bug_933_Regression/MessengerClient.cpp
index 3905d3e4f059a..ef5cd9894f604 100644
--- a/TAO/tests/Bug_933_Regression/MessengerClient.cpp
+++ b/TAO/tests/Bug_933_Regression/MessengerClient.cpp
@@ -35,7 +35,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -44,8 +44,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     CORBA::Object_var obj = orb->string_to_object(ior);
 
     // Narrow
-    Messenger_var messenger = Messenger::_narrow( obj.in() );
-    if(CORBA::is_nil( messenger.in() ) ) {
+    Messenger_var messenger = Messenger::_narrow( obj.in());
+    if(CORBA::is_nil( messenger.in())) {
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Panic: nil reference\n"),
                           1);
@@ -82,11 +82,11 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
     orb->destroy ();
   }
-  catch( const CORBA::SystemException &ex ) {
+  catch( const CORBA::SystemException &ex) {
     ex._tao_print_exception ("Caught CORBA exception: ");
     return 1;
   }
-  catch( ... ) {
+  catch( ...) {
     return 1;
   }
 
diff --git a/TAO/tests/Bug_933_Regression/MessengerServer.cpp b/TAO/tests/Bug_933_Regression/MessengerServer.cpp
index af48c1b83ce8b..a60712b71154a 100644
--- a/TAO/tests/Bug_933_Regression/MessengerServer.cpp
+++ b/TAO/tests/Bug_933_Regression/MessengerServer.cpp
@@ -34,14 +34,14 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
 
     //Get reference to Root POA
-    CORBA::Object_var obj = orb->resolve_initial_references( "RootPOA" );
-    PortableServer::POA_var poa = PortableServer::POA::_narrow( obj.in() );
+    CORBA::Object_var obj = orb->resolve_initial_references( "RootPOA");
+    PortableServer::POA_var poa = PortableServer::POA::_narrow( obj.in());
 
     // Activate POA Manager
     PortableServer::POAManager_var mgr = poa->the_POAManager();
@@ -53,9 +53,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     // Register the servant with the RootPOA, obtain its object
     // reference, stringify it, and write it to a file.
     PortableServer::ObjectId_var oid =
-      poa->activate_object( &messenger_servant );
-    CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in() );
-    CORBA::String_var str = orb->object_to_string( messenger_obj.in() );
+      poa->activate_object( &messenger_servant);
+    CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in());
+    CORBA::String_var str = orb->object_to_string( messenger_obj.in());
     FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
     if (output_file == 0)
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp
index 46fabc593e8c0..e4b52dcaaae1e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp
@@ -1,7 +1,7 @@
 #include "StatisticsHelper.h"
 
 // swap function for integers
-void swap ( CORBA::Long& x, CORBA::Long& y )
+void swap (CORBA::Long& x, CORBA::Long& y)
 {
   CORBA::Long temp;
   temp = x;
@@ -10,7 +10,7 @@ void swap ( CORBA::Long& x, CORBA::Long& y )
 }
 
 
-void sort ( LongVector & vector )
+void sort (LongVector & vector)
 {
   unsigned size = vector.size ();
 
@@ -20,15 +20,15 @@ void sort ( LongVector & vector )
       unsigned pass;
       unsigned j;
 
-      for ( pass = 0; pass < size - 1; pass++ )
+      for (pass = 0; pass < size - 1; pass++ )
       {
         indexOfMin = pass;
 
-        for ( j = pass + 1; j < size; j++ )
-          if ( vector[j] < vector[indexOfMin] )
+        for (j = pass + 1; j < size; j++ )
+          if (vector[j] < vector[indexOfMin] )
             indexOfMin = j;
 
-        swap ( vector[pass], vector[indexOfMin] );
+        swap (vector[pass], vector[indexOfMin]);
       }
     }
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h
index b82edcb91e39b..a029fd174ca8f 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h
@@ -11,10 +11,8 @@ typedef ACE_Vector< CORBA::Long, 1000 > LongVector;
 typedef ACE_Vector< ACE_CString, 1000 > StringVector;
 typedef ACE_Array< CORBA::Long > LongArray;
 
-extern CSD_TP_Test_Export
-void swap ( CORBA::Long& x, CORBA::Long& y );
+extern CSD_TP_Test_Export void swap (CORBA::Long& x, CORBA::Long& y);
 
-extern CSD_TP_Test_Export
-void sort ( LongVector & vector );
+extern CSD_TP_Test_Export void sort (LongVector & vector);
 
 #endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
index 3ca06469c0bf5..b99434ff4ee72 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
@@ -24,7 +24,7 @@ class CSD_TP_Foo_A_Export Foo_A_i : public virtual POA_Foo_A
 
     virtual void done();
 
-    void gather_stats (Foo_A_Statistics& stats) ;
+    void gather_stats (Foo_A_Statistics& stats);
 
   private:
     LongVector in_values_ [5];
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
index ae3316696632a..ffccade7cf20e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
@@ -101,10 +101,10 @@ Foo_B_ClientEngine::execute()
   this->obj_->op7 (this->callback_.in ());
 
   // One-Way calls with various arguments.
-  CORBA::String_var ub_string = CORBA::string_dup( test_str );
+  CORBA::String_var ub_string = CORBA::string_dup( test_str);
   this->obj_->test_unbounded_string_arg (ub_string.in ());
 
-  CORBA::String_var bd_string = CORBA::string_dup( test_str );
+  CORBA::String_var bd_string = CORBA::string_dup( test_str);
   this->obj_->test_bounded_string_arg (bd_string.in ());
 
   Fixed_Array fixed_array;
diff --git a/TAO/tests/Client_Leaks/Server_Task.cpp b/TAO/tests/Client_Leaks/Server_Task.cpp
index caad7b80721dc..99ac45c83b3ad 100644
--- a/TAO/tests/Client_Leaks/Server_Task.cpp
+++ b/TAO/tests/Client_Leaks/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::svc ()
     {
       // run the test for at most 120 seconds...
       // ACE_Time_Value tv (120, 0);
-      this->orb_->run ( /* tv, */);
+      this->orb_->run (/* tv, */);
     }
   catch (const CORBA::Exception&)
     {
diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp
index 7699c4fda3df0..66881d0e2fcd4 100644
--- a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp
+++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp
@@ -96,8 +96,7 @@ convert_surrogate_pair (ACE_UTF16_T high, ACE_UTF16_T low)
 {
   return static_cast<ACE_CDR::WChar> (((high - ACE_UTF16_SURROGATE_HIGH_BEGIN) << ACE_UTF16_SURROGATE_HIGH_SHIFT)
     + (low - ACE_UTF16_SURROGATE_LOW_BEGIN)
-    + ACE_UTF16_SURROGATE_OFFSET
-    );
+    + ACE_UTF16_SURROGATE_OFFSET);
 }
 
 /// load wchar from utf16 buffer
diff --git a/TAO/tests/CodeSets/simple/client.cpp b/TAO/tests/CodeSets/simple/client.cpp
index 6fdc8a8c1b007..04f53a4ab608e 100644
--- a/TAO/tests/CodeSets/simple/client.cpp
+++ b/TAO/tests/CodeSets/simple/client.cpp
@@ -110,7 +110,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       outarg >>= any_reply;
 
       ACE_DEBUG ((LM_DEBUG,
-                 "Client sent %C, got %C\n", bare_string, reply.in ()) );
+                 "Client sent %C, got %C\n", bare_string, reply.in ()));
 
       if (ACE_OS::strcmp (bare_string, reply.in ()) != 0)
         {
@@ -118,7 +118,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         }
 
       ACE_DEBUG ((LM_DEBUG,
-                 "Client sent %C, got %C\n", any_string, any_reply) );
+                 "Client sent %C, got %C\n", any_string, any_reply));
 
       if (ACE_OS::strcmp (any_string, any_reply) != 0)
         {
diff --git a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
index 04f92407a4836..14472d16d26c4 100644
--- a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
@@ -69,8 +69,6 @@ Server_Request_Interceptor::receive_request (
       // Throw forward exception
       throw PortableInterceptor::ForwardRequest (this->to_);
     }
-
-  return;
 }
 
 void
diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp
index da1097b230a95..c40645c4deecd 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp
@@ -15,7 +15,6 @@ Hello::onewayTest ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) onewayTest() Upcall in process ..\n"));
-  return;
 }
 
 
diff --git a/TAO/tests/Compression/run_test.pl b/TAO/tests/Compression/run_test.pl
index 9106be41dbf16..a55ed826a0747 100755
--- a/TAO/tests/Compression/run_test.pl
+++ b/TAO/tests/Compression/run_test.pl
@@ -13,8 +13,7 @@
                zlibserver
                bzip2server
                lzoserver
-               rleserver
-              );
+               rleserver);
 
 foreach my $process (@tests) {
 
diff --git a/TAO/tests/DII_AMI_Forward/test_i.cpp b/TAO/tests/DII_AMI_Forward/test_i.cpp
index 9707a29653a2b..a02abdb44d676 100644
--- a/TAO/tests/DII_AMI_Forward/test_i.cpp
+++ b/TAO/tests/DII_AMI_Forward/test_i.cpp
@@ -18,6 +18,6 @@ char * Forward_Test_i::do_forward (const char *text)
 void
 Forward_Test_i::shutdown ()
 {
-  ACE_OS::sleep( 2 );
+  ACE_OS::sleep(2);
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
index 29c8f26763ae3..6114cf258d2ec 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
@@ -16,9 +16,7 @@ class  Test_Simple_Test_i
   virtual ~Test_Simple_Test_i ();
 
   virtual
-  void test_method (
-      ::CORBA::ULong & error_count
-    );
+  void test_method (::CORBA::ULong & error_count);
 };
 
 /// Implement the Test::Hello interface
@@ -32,81 +30,56 @@ class Hello
 
   // = The skeleton methods
   virtual
-  void test_basic_arg (
-      ::CORBA::Long basic
-    );
+  void test_basic_arg (::CORBA::Long basic);
 
   virtual
-  void test_unbounded_string_arg (
-      const char * message
-    );
+  void test_unbounded_string_arg (const char * message);
 
   virtual
-  void test_bounded_string_arg (
-      const char * message
-    );
+  void test_bounded_string_arg (const char * message);
 
   virtual
-  void test_fixed_array_arg (
-      const ::Test::Fixed_Array message
-    );
+  void test_fixed_array_arg (const ::Test::Fixed_Array message);
 
   virtual
-  void test_var_array_arg (
-      const ::Test::Var_Array messages
-    );
+  void test_var_array_arg (const ::Test::Var_Array messages);
 
   virtual
-  void test_bounded_var_size_arg (
-      const ::Test::Bounded_Var_Size_Arg & message
-    );
+  void test_bounded_var_size_arg (const ::Test::Bounded_Var_Size_Arg & message);
 
   virtual
-  void test_unbounded_var_size_arg (
-      const ::Test::Unbounded_Var_Size_Arg & message
-    );
+  void test_unbounded_var_size_arg (const ::Test::Unbounded_Var_Size_Arg & message);
 
   virtual
-  void test_fixed_size_arg (
-      const ::Test::TimeOfDay & t
-    );
+  void test_fixed_size_arg (const ::Test::TimeOfDay & t);
 
   virtual
-  void test_special_basic_arg (
-      ::CORBA::Char value
-    );
+  void test_special_basic_arg (::CORBA::Char value);
 
   virtual
-  void test_objref_arg (
-      ::Test::Simple_Test_ptr test
-    );
+  void test_objref_arg (::Test::Simple_Test_ptr test);
 
   virtual
-  void test_object_arg (
-      ::CORBA::Object_ptr o
-    );
+  void test_object_arg (::CORBA::Object_ptr o);
 
   virtual
   void test_args_1 (
       ::CORBA::Object_ptr arg1,
       ::CORBA::Char arg2,
-      ::Test::Simple_Test_ptr arg3
-    );
+      ::Test::Simple_Test_ptr arg3);
 
   virtual
   void test_args_2 (
       const char * arg1,
       const ::Test::Fixed_Array arg2,
-      const ::Test::TimeOfDay & arg3
-    );
+      const ::Test::TimeOfDay & arg3);
 
   virtual
   void test_args_3 (
       const char * arg1,
       const ::Test::Bounded_Var_Size_Arg & arg2,
       const ::Test::Unbounded_Var_Size_Arg & arg3,
-      const ::Test::Var_Array arg4
-    );
+      const ::Test::Var_Array arg4);
 
   virtual char * get_string ();
 
@@ -114,8 +87,7 @@ class Hello
   char * test_unbounded_string (
       const char * s1,
       char *& s2,
-      CORBA::String_out s3
-    );
+      CORBA::String_out s3);
 
   virtual void shutdown ();
 
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
index aba859d9fd3ac..ab574712e4135 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
@@ -61,7 +61,7 @@ Client_Task::svc ()
       req->invoke ();
       if (req->response_received ())
       {
-        for (CORBA::ULong count=0; count<req->arguments ()->count () ;++count)
+        for (CORBA::ULong count=0; count<req->arguments ()->count (); ++count)
         {
             CORBA::NamedValue_ptr arg = req->arguments ()->item (count);
             if (ACE_OS::strcmp (arg->name (), "x") == 0)
@@ -109,7 +109,7 @@ Client_Task::svc ()
       req->invoke ();
       if (req->response_received ())
       {
-        for (CORBA::ULong count=0; count<req->arguments ()->count () ;++count)
+        for (CORBA::ULong count=0; count<req->arguments ()->count (); ++count)
         {
             CORBA::NamedValue_ptr arg = req->arguments ()->item (count);
             if (ACE_OS::strcmp (arg->name (), "x") == 0)
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
index df2a9be278c09..4d110ce65f490 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
@@ -16,9 +16,7 @@ class  Test_Simple_Test_i
   virtual ~Test_Simple_Test_i ();
 
   virtual
-  void test_method (
-      ::CORBA::ULong & error_count
-    );
+  void test_method (::CORBA::ULong & error_count);
 };
 
 /// Implement the Test::Hello interface
@@ -34,86 +32,66 @@ class Hello
   virtual
   void test_basic_arg (
       ::CORBA::Long basic,
-      ::CORBA::Long_out x
-    );
+      ::CORBA::Long_out x);
 
   virtual
-  void test_unbounded_string_arg (
-      const char * message
-    );
+  void test_unbounded_string_arg (const char * message);
 
   virtual
   void test_unbounded_string_arg_out (
       const char * message,
-      ::CORBA::String_out out_message
-    );
+      ::CORBA::String_out out_message);
 
   virtual
   void test_bounded_string_arg (
-      const char * message
-    );
+      const char * message);
 
   virtual
   void test_fixed_array_arg (
-      const ::Test::Fixed_Array message
-    );
+      const ::Test::Fixed_Array message);
 
   virtual
   void test_var_array_arg (
-      const ::Test::Var_Array messages
-    );
+      const ::Test::Var_Array messages);
 
   virtual
   void test_bounded_var_size_arg (
-      const ::Test::Bounded_Var_Size_Arg & message
-    );
+      const ::Test::Bounded_Var_Size_Arg & message);
 
   virtual
   void test_unbounded_var_size_arg (
-      const ::Test::Unbounded_Var_Size_Arg & message
-    );
+      const ::Test::Unbounded_Var_Size_Arg & message);
 
   virtual
-  void test_fixed_size_arg (
-      const ::Test::TimeOfDay & t
-    );
+  void test_fixed_size_arg (const ::Test::TimeOfDay & t);
 
   virtual
-  void test_special_basic_arg (
-      ::CORBA::Char value
-    );
+  void test_special_basic_arg (::CORBA::Char value);
 
   virtual
-  void test_objref_arg (
-      ::Test::Simple_Test_ptr test
-    );
+  void test_objref_arg (::Test::Simple_Test_ptr test);
 
   virtual
-  void test_object_arg (
-      ::CORBA::Object_ptr o
-    );
+  void test_object_arg (::CORBA::Object_ptr o);
 
   virtual
   void test_args_1 (
       ::CORBA::Object_ptr arg1,
       ::CORBA::Char arg2,
-      ::Test::Simple_Test_ptr arg3
-    );
+      ::Test::Simple_Test_ptr arg3);
 
   virtual
   void test_args_2 (
       const char * arg1,
       const ::Test::Fixed_Array arg2,
-      const ::Test::TimeOfDay & arg3
-    );
+      const ::Test::TimeOfDay & arg3);
 
   virtual
   void test_args_3 (
       const char * arg1,
       const ::Test::Bounded_Var_Size_Arg & arg2,
       const ::Test::Unbounded_Var_Size_Arg & arg3,
-      const ::Test::Var_Array arg4
-    );
+      const ::Test::Var_Array arg4);
 
   virtual char * get_string ();
 
@@ -121,8 +99,7 @@ class Hello
   char * test_unbounded_string (
       const char * s1,
       char *& s2,
-      CORBA::String_out s3
-    );
+      CORBA::String_out s3);
 
   virtual void shutdown ();
 
diff --git a/TAO/tests/DLL_ORB/Test_i.cpp b/TAO/tests/DLL_ORB/Test_i.cpp
index ebbf786288f01..61653edb87de2 100644
--- a/TAO/tests/DLL_ORB/Test_i.cpp
+++ b/TAO/tests/DLL_ORB/Test_i.cpp
@@ -7,7 +7,7 @@ Test_i::Test_i ()
 }
 
 void
-Test_i::invoke_me ( /* */)
+Test_i::invoke_me ()
 {
   ACE_DEBUG ((LM_INFO,
               "(%P|%t) Test method invoked.\n"));
diff --git a/TAO/tests/DSI_Gateway/test_dsi.h b/TAO/tests/DSI_Gateway/test_dsi.h
index 62e13ed5b1050..75f89b17ed7e0 100644
--- a/TAO/tests/DSI_Gateway/test_dsi.h
+++ b/TAO/tests/DSI_Gateway/test_dsi.h
@@ -36,11 +36,9 @@ class DSI_Simple_Server : public TAO_DynamicImplementation
 
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa
-    );
+      PortableServer::POA_ptr poa);
 
-  virtual PortableServer::POA_ptr _default_POA (
-    );
+  virtual PortableServer::POA_ptr _default_POA ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/DynAny_Test/analyzer.cpp b/TAO/tests/DynAny_Test/analyzer.cpp
index 3526621a66b43..6fdec95c44fc3 100644
--- a/TAO/tests/DynAny_Test/analyzer.cpp
+++ b/TAO/tests/DynAny_Test/analyzer.cpp
@@ -17,7 +17,7 @@
 #include "tao/DynamicAny/DynAnyFactory.h"
 
 #define CASEE(type,CT,str) case CORBA::tk_##type: {\
-  CORBA::CT b = da->get_##type() ; \
+  CORBA::CT b = da->get_##type(); \
   tab (level_); \
   if (debug_) \
     ACE_DEBUG ((LM_DEBUG, str , b)); \
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index 1ad95f62dd0cd..3322bb5d0c5c2 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -206,8 +206,7 @@ Test_DynStruct::run_test ()
         {
           DynamicAny::DynAny_var ftc2_base =
             dynany_factory->create_dyn_any_from_type_code (
-                                DynAnyTests::_tc_test_struct_alias
-                              );
+                                DynAnyTests::_tc_test_struct_alias);
 
           ftc2 = DynamicAny::DynStruct::_narrow (ftc2_base.in ());
 
@@ -315,8 +314,7 @@ Test_DynStruct::run_test ()
 
       DynamicAny::DynAny_var sm_base =
         dynany_factory->create_dyn_any_from_type_code (
-            DynAnyTests::_tc_test_struct
-          );
+            DynAnyTests::_tc_test_struct);
 
       DynamicAny::DynStruct_var sm =
         DynamicAny::DynStruct::_narrow (sm_base.in ());
diff --git a/TAO/tests/DynValue_Test/Analyzer.cpp b/TAO/tests/DynValue_Test/Analyzer.cpp
index 02ec090d2942d..9dd484ea6d280 100644
--- a/TAO/tests/DynValue_Test/Analyzer.cpp
+++ b/TAO/tests/DynValue_Test/Analyzer.cpp
@@ -48,14 +48,14 @@ DynAnyAnalyzer::register_factory (
   CORBA::ValueFactoryBase_var factory)
 {
   factory_id * new_fact (
-    dynamic_cast<factory_id *> (factory.in()) );
+    dynamic_cast<factory_id *> (factory.in()));
   if (new_fact)
     {
       tab("Registering factory for ValueType ");
       ACE_DEBUG ((LM_DEBUG, "%C\n", new_fact->id ()));
       CORBA::ValueFactoryBase_var old_fact (
         orb_->register_value_factory (
-          new_fact->id (), factory.in () )  );
+          new_fact->id (), factory.in () ));
     }
 }
 
@@ -173,7 +173,7 @@ DynAnyAnalyzer::analyze (
             ACE_DEBUG ((LM_DEBUG, "{NULL} "));
           }
         ACE_DEBUG ((LM_DEBUG, "ValueBox Type: %C \"%C\": ",
-                    tc->name (), tc->id ())             );
+                    tc->name (), tc->id ()));
         if (box->is_null ())
           {
             ACE_DEBUG ((LM_DEBUG, "\n"));
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp
index 57f789cdc5f03..fee39204ebfc7 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp
@@ -67,7 +67,7 @@ next_parm (const ACE_TCHAR **pstart)
 }
 
 void
-set_parms ( TAO_DTP_Definition * this_config)
+set_parms (TAO_DTP_Definition * this_config)
 {
   // Get past the brace
   const ACE_TCHAR *pstart = parms + 1;
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
index 1d32bc432de3b..d1a732f7621c6 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
@@ -110,7 +110,7 @@ Policy_Verifier::init (int argc, ACE_TCHAR *argv[])
 }
 
 void
-Policy_Verifier::run ( )
+Policy_Verifier::run ()
 {
   this->verify_reference (this->base_object_.in (),
                           this->rt_poa_properties_);
diff --git a/TAO/tests/HandleExhaustion/server.cpp b/TAO/tests/HandleExhaustion/server.cpp
index 252bde823cc9b..2334bbcdfc2a1 100644
--- a/TAO/tests/HandleExhaustion/server.cpp
+++ b/TAO/tests/HandleExhaustion/server.cpp
@@ -60,7 +60,7 @@ class Descriptors
     for (size_t i = 0; i < 0xffff; i++)
       {
         this->openfds_[i] = ACE_OS::open (file, O_RDONLY);
-        if ( i == 0)
+        if (i == 0)
           {
 #if defined (ACE_WIN32)
             // the test is not valid on windows so just wing this value
diff --git a/TAO/tests/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp
index f766683a587ec..6d7770e8f1a0c 100644
--- a/TAO/tests/IDL_Test/main.cpp
+++ b/TAO/tests/IDL_Test/main.cpp
@@ -412,8 +412,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       Field field;
       field.value.strValue (
-          CORBA::string_dup ("duplicate case label test string")
-        );
+          CORBA::string_dup ("duplicate case label test string"));
       field.value._d (FTYPE_VARCHAR);
       CORBA::Any any1;
       any1 <<= field;
diff --git a/TAO/tests/Multiple/Multiple_Impl.cpp b/TAO/tests/Multiple/Multiple_Impl.cpp
index 1380efeb323c9..b63bee32eec1f 100644
--- a/TAO/tests/Multiple/Multiple_Impl.cpp
+++ b/TAO/tests/Multiple/Multiple_Impl.cpp
@@ -12,29 +12,28 @@ Bottom_Impl::Bottom_Impl (CORBA::ORB_ptr orb)
 
 Bottom_Impl::~Bottom_Impl ()
 {
-  // No-Op.
 }
 
 char *
-Bottom_Impl::top_quote ( )
+Bottom_Impl::top_quote ()
 {
   return CORBA::string_dup(Quote::top);
 }
 
 char *
-Bottom_Impl::left_quote ( )
+Bottom_Impl::left_quote ()
 {
   return CORBA::string_dup(Quote::left);
 }
 
 char *
-Bottom_Impl::right_quote ( )
+Bottom_Impl::right_quote ()
 {
   return CORBA::string_dup(Quote::right);
 }
 
 char *
-Bottom_Impl::bottom_quote ( )
+Bottom_Impl::bottom_quote ()
 {
   return CORBA::string_dup(Quote::bottom);
 }
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/client.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/client.cpp
index 9fb90a86da267..d571ff4a1bd02 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/client.cpp
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/client.cpp
@@ -59,7 +59,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       if (oneway_call)
         {
-          CORBA::String_var the_string = CORBA::string_dup( "Test" );
+          CORBA::String_var the_string = CORBA::string_dup( "Test");
           ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Client sending string <%C> oneway\n",
                       the_string.in ()));
           hello->set_string (the_string);
diff --git a/TAO/tests/NestedUpcall/Simple/server_i.cpp b/TAO/tests/NestedUpcall/Simple/server_i.cpp
index 93acf38c13f7d..80810fe23bbee 100644
--- a/TAO/tests/NestedUpcall/Simple/server_i.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server_i.cpp
@@ -13,8 +13,6 @@ server_i::start (client_ptr c,
 {
   this->client_ = client::_duplicate (c);
   this->ping (time_to_live);
-
-  return;
 }
 
 void
diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.h b/TAO/tests/OBV/Factory/FactoryC_impl.h
index 08b40df990cb9..28fa755bc2738 100644
--- a/TAO/tests/OBV/Factory/FactoryC_impl.h
+++ b/TAO/tests/OBV/Factory/FactoryC_impl.h
@@ -38,13 +38,11 @@ class Value2_init_impl : public OBV_FactoryTest::Value2_init
 {
 public:
   virtual OBV_FactoryTest::Value2* create_default (
-      CORBA::ULong id
-      );
+      CORBA::ULong id);
 
   virtual OBV_FactoryTest::Value2* create (
       CORBA::ULong id,
-      const OBV_FactoryTest::BaseValue::BV_Data & data
-      );
+      const OBV_FactoryTest::BaseValue::BV_Data & data);
 
 public:
   virtual CORBA::ValueBase * create_for_unmarshal ();
diff --git a/TAO/tests/OBV/Indirection/Factory.cpp b/TAO/tests/OBV/Indirection/Factory.cpp
index 8a827f7e66b9c..5dd645d342d1a 100644
--- a/TAO/tests/OBV/Indirection/Factory.cpp
+++ b/TAO/tests/OBV/Indirection/Factory.cpp
@@ -15,8 +15,7 @@ NodeFactory::create_for_unmarshal ()
   ACE_NEW_THROW_EX (
       ret_val,
       OBV_demo::value::idl::Node,
-      ::CORBA::NO_MEMORY ()
-    );
+      ::CORBA::NO_MEMORY ());
   return ret_val;
 }
 
@@ -35,8 +34,7 @@ BoxedValueFactory::create_for_unmarshal ()
   ACE_NEW_THROW_EX (
       ret_val,
       OBV_demo::value::idl::boxedValue,
-      ::CORBA::NO_MEMORY ()
-    );
+      ::CORBA::NO_MEMORY ());
   return ret_val;
 }
 
@@ -55,8 +53,7 @@ BaseValueFactory::create_for_unmarshal ()
   ACE_NEW_THROW_EX (
       ret_val,
       OBV_demo::value::idl::BaseValue,
-      ::CORBA::NO_MEMORY ()
-    );
+      ::CORBA::NO_MEMORY ());
   return ret_val;
 }
 
@@ -75,8 +72,7 @@ TValueFactory::create_for_unmarshal ()
   ACE_NEW_THROW_EX (
       ret_val,
       OBV_demo::value::idl::TValue,
-      ::CORBA::NO_MEMORY ()
-    );
+      ::CORBA::NO_MEMORY ());
   return ret_val;
 }
 
@@ -95,8 +91,7 @@ ConfigValueFactory::create_for_unmarshal ()
   ACE_NEW_THROW_EX (
       ret_val,
       OBV_demo::value::idl::ConfigValue,
-      ::CORBA::NO_MEMORY ()
-    );
+      ::CORBA::NO_MEMORY ());
   return ret_val;
 }
 
diff --git a/TAO/tests/OBV/Indirection/Messenger_i.cpp b/TAO/tests/OBV/Indirection/Messenger_i.cpp
index 09f9d062d8395..953d20632d407 100644
--- a/TAO/tests/OBV/Indirection/Messenger_i.cpp
+++ b/TAO/tests/OBV/Indirection/Messenger_i.cpp
@@ -64,7 +64,7 @@ char * Messenger_i::receive_list (::demo::value::idl::Node * node)
   {
     size_t const len = l.size ();
     size_t i = 0;
-    for ( i = 0; i < len; ++i)
+    for (i = 0; i < len; ++i)
     {
       if (l[i] == x)
         break;
diff --git a/TAO/tests/OBV/Simple/Client_i.cpp b/TAO/tests/OBV/Simple/Client_i.cpp
index 9a9b42920c0f7..d453791f56144 100644
--- a/TAO/tests/OBV/Simple/Client_i.cpp
+++ b/TAO/tests/OBV/Simple/Client_i.cpp
@@ -15,8 +15,7 @@ Checkpoint_Client_i::run (const char *name,
 
   // Set random seed
   ACE_Time_Value now (ACE_OS::gettimeofday ());
-  ACE_OS::srand ((unsigned int) now.sec () );
-
+  ACE_OS::srand ((unsigned int) now.sec ());
 
   try
     {
diff --git a/TAO/tests/OBV/Simple/Client_i.h b/TAO/tests/OBV/Simple/Client_i.h
index a3738171e0173..6c900b39414b7 100644
--- a/TAO/tests/OBV/Simple/Client_i.h
+++ b/TAO/tests/OBV/Simple/Client_i.h
@@ -37,7 +37,7 @@ class Checkpoint_Client_i
   virtual ~Checkpoint_Client_i ();
 
   /// Execute the methods
-  virtual int run (const char *,int, ACE_TCHAR** );
+  virtual int run (const char *,int, ACE_TCHAR**);
 
 private:
   /// Instantiate the checkpoint object.
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
index 7e31178824394..11b9d4d4795c7 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
@@ -180,7 +180,6 @@ node_impl::add_edge (Supports_Test::Node * neighbor)
   neighbors_ ().length (neighbors_ ().length () + 1);
   neighbors_ ()[neighbors_ ().length () - 1] = neighbor;
   neighbor->_add_ref ();
-  return;
 }
 
 // Remove the edge from this node to neighbor.
diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.h b/TAO/tests/OBV/Truncatable/TruncatableS_impl.h
index 5563879712254..1d3210c2ea738 100644
--- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.h
+++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.h
@@ -31,22 +31,19 @@ class Test_impl : public POA_OBV_TruncatableTest::Test
         const char * id,
         ::OBV_TruncatableTest::BaseValue * iv,
         ::OBV_TruncatableTest::BaseValue_out ov,
-        char *& desc
-      );
+        char *& desc);
 
   virtual void op2 (
         ::OBV_TruncatableTest::TValue1 * iv,
         const char * id,
         ::OBV_TruncatableTest::TValue1_out ov,
-        char *& desc
-      );
+        char *& desc);
 
   virtual void op3 (
         const char * id,
         ::OBV_TruncatableTest::TValue4 * iv,
         ::OBV_TruncatableTest::TValue4_out ov,
-        char *& desc
-      );
+        char *& desc);
 
   virtual ::OBV_TruncatableTest::BaseValue * op4 (
       const char * id,
@@ -55,14 +52,12 @@ class Test_impl : public POA_OBV_TruncatableTest::Test
       ::OBV_TruncatableTest::TValue4 * iv2,
       ::OBV_TruncatableTest::TValue4 * iv3,
       ::OBV_TruncatableTest::TValue1 * iv4,
-      char *& desc
-    );
+      char *& desc);
 
   virtual void op5 (const CORBA::Any& val,
                     const char * id,
                     ::OBV_TruncatableTest::TValue1_out ov,
-                    char *& desc
- );
+                    char *& desc);
 
   virtual void shutdown ();
 
diff --git a/TAO/tests/OBV/Truncatable/client.cpp b/TAO/tests/OBV/Truncatable/client.cpp
index 1ddcc5470e21d..38e1eba22c5dc 100644
--- a/TAO/tests/OBV/Truncatable/client.cpp
+++ b/TAO/tests/OBV/Truncatable/client.cpp
@@ -258,7 +258,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
             caught_expected_exception = true;
           }
 
-        if ( ! caught_expected_exception)
+        if (!caught_expected_exception)
           {
             fail++;
             if (verbose)
diff --git a/TAO/tests/OBV/ValueBox/Test_impl.cpp b/TAO/tests/OBV/ValueBox/Test_impl.cpp
index 619158ea6a896..2f7521861a3ac 100644
--- a/TAO/tests/OBV/ValueBox/Test_impl.cpp
+++ b/TAO/tests/OBV/ValueBox/Test_impl.cpp
@@ -282,7 +282,7 @@ Test_impl::array_op3 (::VBstringarray * p1,
                       ::VBstringarray *& p2,
                       ::VBstringarray_out p3)
 {
-  long array_len = sizeof( ::StringArray  ) / sizeof( StringArray_slice );
+  long array_len = sizeof( ::StringArray  ) / sizeof( StringArray_slice);
 
   char * p;
   for (long i=0; i<array_len; i++)
@@ -308,7 +308,7 @@ Test_impl::array_op4 (const ::StringArray p1,
                       ::StringArray p2,
                       ::StringArray_out p3)
 {
-  long array_len = sizeof( ::StringArray  ) / sizeof( StringArray_slice );
+  long array_len = sizeof(::StringArray) / sizeof( StringArray_slice);
 
   char * p;
   long i;
diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp
index b699e4f480031..3536051e46401 100644
--- a/TAO/tests/OBV/ValueBox/client.cpp
+++ b/TAO/tests/OBV/ValueBox/client.cpp
@@ -55,13 +55,13 @@ int box_test1 (BoxT *valuebox, UT val1, UT val2)
                     1);
 
     // should be a deep copy of val1...
-    OBV_VERITY ( &valuebox_clone->_boxed_inout () != &valuebox->_boxed_inout () );
+    OBV_VERITY (&valuebox_clone->_boxed_inout () != &valuebox->_boxed_inout ());
 
     // but values should be equal
     OBV_VERITY (ACE::is_equal (valuebox_clone->_value (), valuebox->_value ()));
 
     // Check that modifier is working.
-    valuebox_clone->_value ( val2 );
+    valuebox_clone->_value (val2);
     OBV_VERITY (!ACE::is_equal (valuebox_clone->_value (), valuebox->_value ()));
 
     // use operator=
@@ -84,7 +84,7 @@ int box_test1 (BoxT *valuebox, UT val1, UT val2)
 
     // Test _copy_value
     CORBA::ValueBase *copy = valuebox->_copy_value ();
-    OBV_VERITY ( copy != 0 );
+    OBV_VERITY (copy != 0);
     // check add_ref, remove_ref
     copy->_add_ref ();
     copy->_remove_ref ();
@@ -99,7 +99,7 @@ int box_test1 (BoxT *valuebox, UT val1, UT val2)
     else
       {
         OBV_VERITY (ACE::is_equal (down->_value (), val1));
-        down->_value ( val2 );
+        down->_value (val2);
         OBV_VERITY (!ACE::is_equal (down->_value (), valuebox->_value ()));
         OBV_VERITY (ACE::is_equal (down->_value (), val2));
       }
@@ -140,13 +140,13 @@ int box_test_ref (BoxT *valuebox, UT &val1, UT &val2)
                     1);
 
     // should be a deep copy of val1...
-    OBV_VERITY ( &p->_boxed_inout () != &valuebox->_boxed_inout () );
+    OBV_VERITY (&p->_boxed_inout () != &valuebox->_boxed_inout ());
 
-    p->_value ( val2 ); // deep copy
-    OBV_VERITY ( &p->_boxed_inout () != &valuebox->_boxed_inout () );
+    p->_value (val2); // deep copy
+    OBV_VERITY (&p->_boxed_inout () != &valuebox->_boxed_inout () );
 
     *valuebox = val2;      // deep copy, too.
-    OBV_VERITY ( &p->_boxed_inout () != &valuebox->_boxed_inout () );
+    OBV_VERITY (&p->_boxed_inout () != &valuebox->_boxed_inout () );
 
     CORBA::remove_ref (p);
 
@@ -408,7 +408,7 @@ int test_boxed_string()
   vbstring2->_value(svar);
   OBV_VERITY ((*vbstring2)[0] == 'S');
   // test value accessor
-  OBV_VERITY ( (vbstring2->_value())[0] == 'S' );
+  OBV_VERITY ((vbstring2->_value())[0] == 'S');
 
   //
   // Test ctors.
@@ -580,7 +580,7 @@ int test_boxed_sequence ()
       OBV_VERITY (vbseqlong4->length() == 0);
 
       // Test copy_value
-      VBseqlong *vbseqlong6 = VBseqlong::_downcast( vbseqlong4->_copy_value() );
+      VBseqlong *vbseqlong6 = VBseqlong::_downcast( vbseqlong4->_copy_value());
       if (vbseqlong6 == 0)
         {
           fail++;
@@ -724,8 +724,8 @@ int test_boxed_struct ()
   VBfixed_struct1_var valuebox2 = valuebox2_ptr;
 
   OBV_VERITY (valuebox1->l () == valuebox2->l ());
-  OBV_VERITY ((valuebox1->abstruct ()).s1 == (valuebox2->abstruct ()).s1 );
-  OBV_VERITY ((valuebox1->abstruct ()).s2 == (valuebox2->abstruct ()).s2 );
+  OBV_VERITY ((valuebox1->abstruct ()).s1 == (valuebox2->abstruct ()).s1);
+  OBV_VERITY ((valuebox1->abstruct ()).s2 == (valuebox2->abstruct ()).s2);
 
   // Change an element
   valuebox1->l (505);
@@ -733,9 +733,9 @@ int test_boxed_struct ()
 
   // Change some more, to test other types.
   (valuebox2->abstruct ()).s1 = 667;
-  OBV_VERITY ((valuebox1->abstruct ()).s1 != (valuebox2->abstruct ()).s1 );
+  OBV_VERITY ((valuebox1->abstruct ()).s1 != (valuebox2->abstruct ()).s1);
   (valuebox2->abstruct ()).s2 = 1667;
-  OBV_VERITY ((valuebox1->abstruct ()).s2 != (valuebox2->abstruct ()).s2 );
+  OBV_VERITY ((valuebox1->abstruct ()).s2 != (valuebox2->abstruct ()).s2);
 
   Fixed_Struct1 *fixed_struct_b = 0;
   ACE_NEW_RETURN (fixed_struct_b,
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
index 5d4d0f0241c5c..d3911bd226253 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
@@ -24,7 +24,7 @@ DllOrb::DllOrb (int nthreads)
 {
 }
 
-DllOrb::~DllOrb ( )
+DllOrb::~DllOrb ()
   throw ()
 {
 #if defined (ACE_HAS_THREADS)
@@ -111,8 +111,7 @@ int DllOrb::init (int argc, ACE_TCHAR *argv[])
 
   this->activate(
                  THR_NEW_LWP|THR_JOINABLE|THR_INHERIT_SCHED,
-                 threadCnt
-                 );
+                 threadCnt);
   mp_barrier->wait ();
 #endif
 
diff --git a/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h b/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h
index 9d73704966e6a..16e74fd89f31c 100644
--- a/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h
+++ b/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h
@@ -55,7 +55,7 @@ class ACE_Service_Gestalt_Test : public ACE_Service_Gestalt
     return this->repo_->current_size ();
   };
 
-  bool has_same_service_repository ( ACE_Service_Gestalt_Test const * psg)
+  bool has_same_service_repository (ACE_Service_Gestalt_Test const * psg)
   {
     return (this->repo_ == psg->repo_);
   }
diff --git a/TAO/tests/ORT/ObjectReferenceFactory.cpp b/TAO/tests/ORT/ObjectReferenceFactory.cpp
index c7cb240663c25..27e9875a85a21 100644
--- a/TAO/tests/ORT/ObjectReferenceFactory.cpp
+++ b/TAO/tests/ORT/ObjectReferenceFactory.cpp
@@ -16,8 +16,7 @@ ObjectReferenceFactory::_copy_value ()
   ACE_NEW_THROW_EX (
     ret_val,
     ObjectReferenceFactory (old_orf_.inout ()),
-    ::CORBA::NO_MEMORY ()
-  );
+    ::CORBA::NO_MEMORY ());
   return ret_val;
 }
 
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
index b91d0dce11faf..1c33b35c0c3a7 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
@@ -17,7 +17,7 @@ CORBA::ULong
 Oneway_Buffering_Admin::request_count (CORBA::ULong expected_request_count)
 {
   ACE_Time_Value timeout (timeout_in_sec);
-  while ( (this->request_count_ < expected_request_count)
+  while ((this->request_count_ < expected_request_count)
         && (ACE_Time_Value::zero < timeout) )
     {
       orb_->perform_work (timeout); // Do some work, decreases timeout for amount done.
@@ -29,7 +29,7 @@ CORBA::ULong
 Oneway_Buffering_Admin::bytes_received_count (CORBA::ULong expected_bytes_received_count)
 {
   ACE_Time_Value timeout (timeout_in_sec);
-  while ( (this->bytes_received_count_ < expected_bytes_received_count)
+  while ((this->bytes_received_count_ < expected_bytes_received_count)
         && (ACE_Time_Value::zero < timeout) )
     {
       orb_->perform_work (timeout); // Do some work, decreases timeout for amount done.
diff --git a/TAO/tests/Oneway_Timeouts/client.cpp b/TAO/tests/Oneway_Timeouts/client.cpp
index 355fce05a34cd..69ef4e5945984 100644
--- a/TAO/tests/Oneway_Timeouts/client.cpp
+++ b/TAO/tests/Oneway_Timeouts/client.cpp
@@ -512,7 +512,7 @@ int ACE_TMAIN (int ac, ACE_TCHAR *av[])
         {
           ACE_Time_Value after = ACE_High_Res_Timer::gettimeofday_hr ();
           long ms = (after - before).msec ();
-          if ( (use_twoway || !use_sync_scope)
+          if ((use_twoway || !use_sync_scope)
               && request_timeout > 0
               && request_timeout < connect_timeout)
             {
@@ -551,7 +551,7 @@ int ACE_TMAIN (int ac, ACE_TCHAR *av[])
         {
           ACE_Time_Value after = ACE_High_Res_Timer::gettimeofday_hr ();
           long ms = (after - before).msec ();
-          if ( (use_twoway || !use_sync_scope)
+          if ((use_twoway || !use_sync_scope)
               && request_timeout > 0
               && request_timeout < connect_timeout)
             {
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
index c995acf908403..5d9da902030ee 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
@@ -26,7 +26,7 @@ Receiver_i::receive_call ()
 }
 
 CORBA::Long
-Receiver_i::get_call_count ( /**/)
+Receiver_i::get_call_count ()
 {
   return this->iteration_;
 }
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
index ffba37e322f2c..5049b6e842648 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
@@ -39,9 +39,8 @@ Sender_i::send_ready_message (Test::Receiver_ptr receiver)
 }
 
 void
-Sender_i::ping ( /**/)
+Sender_i::ping ()
 {
-  return;
 }
 
 void
diff --git a/TAO/tests/POA/Etherealization/Etherealization.cpp b/TAO/tests/POA/Etherealization/Etherealization.cpp
index 66b3a05fd9ad2..f1a9f39901edb 100644
--- a/TAO/tests/POA/Etherealization/Etherealization.cpp
+++ b/TAO/tests/POA/Etherealization/Etherealization.cpp
@@ -18,7 +18,7 @@
 class test_i : public POA_test
 {
 public:
-  void method ( /**/)
+  void method ()
   {
   }
 
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
index 49e25f17d4b91..b40a5a546cc67 100644
--- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
@@ -28,7 +28,7 @@ class test_i : public POA_test
 };
 
 PortableServer::POA_ptr
-test_i::_default_POA ( /**/)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp
index c53230df70bd0..6071e74859e1f 100644
--- a/TAO/tests/Param_Test/param_test_i.cpp
+++ b/TAO/tests/Param_Test/param_test_i.cpp
@@ -31,7 +31,7 @@ Coffee_i::~Coffee_i ()
 
 // get attribute
 Coffee::Desc *
-Coffee_i::description ( /*env*/)
+Coffee_i::description ()
 {
   Coffee::Desc *desc = new Coffee::Desc;
   desc->name = CORBA::string_dup (this->name_.in ());
diff --git a/TAO/tests/Permanent_Forward/StubTest.cpp b/TAO/tests/Permanent_Forward/StubTest.cpp
index d966325e7cce5..e005ed056edd8 100644
--- a/TAO/tests/Permanent_Forward/StubTest.cpp
+++ b/TAO/tests/Permanent_Forward/StubTest.cpp
@@ -75,7 +75,7 @@ marshaled_equal_to_other (CORBA::ORB_ptr orb, CORBA::Object_ptr obj, TAO_MProfil
   TAO_Stub *stub_copy = obj_copy->_stubobj ();
   TAO_MProfile *copy_mprofile  = &(stub_copy->base_profiles ());
 
-  if ( copy_mprofile->size() != other_mprofile->size())
+  if (copy_mprofile->size() != other_mprofile->size())
     return false;
 
   for (size_t i=0; i<copy_mprofile->size(); ++i)
@@ -83,7 +83,7 @@ marshaled_equal_to_other (CORBA::ORB_ptr orb, CORBA::Object_ptr obj, TAO_MProfil
       TAO_Profile *copy_profile  = copy_mprofile->get_profile (i);
       TAO_Profile *other_profile = other_mprofile->get_profile (i);
 
-      if ( ! equal_endpoint (copy_profile, other_profile) )
+      if (! equal_endpoint (copy_profile, other_profile) )
         return false;
     }
 
@@ -108,7 +108,7 @@ test_forward_permanent (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 1111));
 
   // ----- forward to obj2 permanently
-  stub1->add_forward_profiles (stub4->base_profiles(), true /* permanent */ );
+  stub1->add_forward_profiles (stub4->base_profiles(), true /* permanent */);
 
   FRANKS_ASSERT (stub1->forward_profiles () != 0);
 
@@ -117,7 +117,7 @@ test_forward_permanent (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 4444));
 
   // ----- stringified object reference must be equal to obj4->base_prpfiles().
-  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub4->base_profiles())) );
+  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub4->base_profiles())));
 
   // ----- consume second profile of obj2
 
@@ -161,7 +161,7 @@ test_forward_permanent_mix (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 1111));
 
   // ----- forward to obj2
-  stub1->add_forward_profiles (stub2->base_profiles(), false /* permanent */ );
+  stub1->add_forward_profiles (stub2->base_profiles(), false /* permanent */);
 
   FRANKS_ASSERT (stub1->forward_profiles () != 0);
 
@@ -170,7 +170,7 @@ test_forward_permanent_mix (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 2222));
 
   // ----- forward to obj3
-  stub1->add_forward_profiles (stub3->base_profiles(), false /* permanent */ );
+  stub1->add_forward_profiles (stub3->base_profiles(), false /* permanent */);
 
   FRANKS_ASSERT (stub1->forward_profiles () != 0);
 
@@ -179,10 +179,10 @@ test_forward_permanent_mix (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 3333));
 
   // ----- stringified object reference must be equal to obj1->base_prpfiles().
-  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub1->base_profiles())) );
+  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub1->base_profiles())));
 
   // ----- forward to obj4 permanently
-  stub1->add_forward_profiles (stub4->base_profiles(), true /* permanent */ );
+  stub1->add_forward_profiles (stub4->base_profiles(), true /* permanent */);
 
   FRANKS_ASSERT (stub1->forward_profiles () != 0);
 
@@ -191,7 +191,7 @@ test_forward_permanent_mix (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 4444));
 
   // ----- stringified object reference must be equal to obj4->base_prpfiles().
-  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub4->base_profiles())) );
+  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub4->base_profiles())));
 
   // ----- consume second profile from obj4
   profile = stub1->next_profile ();
@@ -199,7 +199,7 @@ test_forward_permanent_mix (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.3", 4444));
 
   // ----- forward to obj2
-  stub1->add_forward_profiles (stub2->base_profiles(), false /* permanent */ );
+  stub1->add_forward_profiles (stub2->base_profiles(), false /* permanent */);
 
   FRANKS_ASSERT (stub1->forward_profiles () != 0);
 
@@ -208,7 +208,7 @@ test_forward_permanent_mix (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 2222));
 
   // ----- forward to obj3
-  stub1->add_forward_profiles (stub3->base_profiles(), false /* permanent */ );
+  stub1->add_forward_profiles (stub3->base_profiles(), false /* permanent */);
 
   FRANKS_ASSERT (stub1->forward_profiles () != 0);
 
@@ -217,10 +217,10 @@ test_forward_permanent_mix (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 3333));
 
   // ----- stringified object reference must be equal to obj4->base_prpfiles().
-  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub4->base_profiles())) );
+  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub4->base_profiles())));
 
   // ----- forward to obj5 permanently
-  stub1->add_forward_profiles (stub5->base_profiles(), true /* permanent */ );
+  stub1->add_forward_profiles (stub5->base_profiles(), true /* permanent */);
 
   FRANKS_ASSERT (stub1->forward_profiles () != 0);
 
@@ -229,7 +229,7 @@ test_forward_permanent_mix (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 5555));
 
   // ----- stringified object reference must be equal to obj5->base_prpfiles().
-  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub5->base_profiles())) );
+  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub5->base_profiles())));
 
   // ----- consume second profile from obj5
   profile = stub1->next_profile ();
@@ -237,7 +237,7 @@ test_forward_permanent_mix (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.3", 5555));
 
   // ----- stringified object reference must be equal to obj1->base_prpfiles().
-  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub5->base_profiles())) );
+  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub5->base_profiles())));
 
   // reached end of profiles, next_profile must return NULL
 
@@ -266,7 +266,7 @@ test_forward (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 1111));
 
   // ----- forward to obj2
-  stub1->add_forward_profiles (stub2->base_profiles(), false /* permanent */ );
+  stub1->add_forward_profiles (stub2->base_profiles(), false /* permanent */);
 
   FRANKS_ASSERT (stub1->forward_profiles () != 0);
 
@@ -276,7 +276,7 @@ test_forward (CORBA::ORB_ptr orb)
 
   // ----- forward to obj3
 
-  stub1->add_forward_profiles (stub3->base_profiles(), false /* permanent */ );
+  stub1->add_forward_profiles (stub3->base_profiles(), false /* permanent */);
 
   FRANKS_ASSERT (stub1->forward_profiles () != 0);
 
@@ -285,7 +285,7 @@ test_forward (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 3333));
 
   // ----- stringified object reference must be equal to obj1->base_prpfiles().
-  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub1->base_profiles())) );
+  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub1->base_profiles())));
 
   // ----- consume second profile of obj3
 
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
index 5bbf5592e50a0..e42d0b6dadb1a 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
@@ -150,7 +150,7 @@ namespace
         pi_current,
         location,
         correctTSCvalue,
-        correctRSCvalue );
+        correctRSCvalue);
 
     if (number && (0 != ACE_OS::strcmp( location, "receive_request" )))
     {
@@ -159,7 +159,7 @@ namespace
       data <<= number;
 
       ACE_DEBUG ((LM_DEBUG, "SERVER %C -> set_slot(RSC)", location));
-      ri->set_slot( slot_id, data );
+      ri->set_slot( slot_id, data);
 
       ACE_DEBUG ((LM_DEBUG, " -> long (%d)\n", number));
 
@@ -168,7 +168,7 @@ namespace
           pi_current,
           location,
           correctTSCvalue,
-          number );
+          number);
     }
   }
 }
@@ -207,7 +207,7 @@ class ReplicaController: public virtual ServerRequestInterceptor,
 {
   PortableInterceptor::Current_ptr pi_current_;
 public:
-  ReplicaController ( PortableInterceptor::Current_ptr pi_current )
+  ReplicaController (PortableInterceptor::Current_ptr pi_current )
     : pi_current_( pi_current )
   {
   }
@@ -227,7 +227,7 @@ class ReplicaController: public virtual ServerRequestInterceptor,
   virtual void
   tao_ft_interception_point (ServerRequestInfo_ptr ri, OctetSeq_out)
   {
-    getAndSetMySlot( ri, this->pi_current_, "tao_ft_interception_point", 0, 0 );
+    getAndSetMySlot( ri, this->pi_current_, "tao_ft_interception_point", 0, 0);
   }
 #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
 
@@ -235,39 +235,37 @@ class ReplicaController: public virtual ServerRequestInterceptor,
   receive_request_service_contexts (ServerRequestInfo_ptr ri)
   {
 #if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
-    getAndSetMySlot( ri, this->pi_current_, "receive_request_service_contexts", 0, 61 );
+    getAndSetMySlot( ri, this->pi_current_, "receive_request_service_contexts", 0, 61);
 #else
-    getAndSetMySlot( ri, this->pi_current_, "receive_request_service_contexts", 0, 0 );
+    getAndSetMySlot( ri, this->pi_current_, "receive_request_service_contexts", 0, 0);
 #endif /* TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1 */
   }
 
   virtual void
   receive_request (ServerRequestInfo_ptr ri)
   {
-    getAndSetMySlot( ri, this->pi_current_, "receive_request", 62, 62 );
+    getAndSetMySlot( ri, this->pi_current_, "receive_request", 62, 62);
   }
 
   virtual void
   send_reply (ServerRequestInfo_ptr ri)
   {
-    getAndSetMySlot( ri, this->pi_current_, "send_reply", 62, 62 );
+    getAndSetMySlot( ri, this->pi_current_, "send_reply", 62, 62);
   }
 
   virtual void
   send_exception (ServerRequestInfo_ptr ri)
   {
-    getAndSetMySlot( ri, this->pi_current_, "send_exception", 62, 62 );
+    getAndSetMySlot( ri, this->pi_current_, "send_exception", 62, 62);
   }
 
   virtual void
   send_other (ServerRequestInfo_ptr ri)
   {
-    getAndSetMySlot( ri, this->pi_current_, "send_other", 62, 62 );
+    getAndSetMySlot( ri, this->pi_current_, "send_other", 62, 62);
   }
 };
 
-
-//
 class ORB_Initializer : public virtual ORBInitializer,
                         public virtual ::CORBA::LocalObject
 {
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/Hello.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/Hello.cpp
index 2e31783440f6d..16f276e957cfb 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/Hello.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/Hello.cpp
@@ -14,5 +14,5 @@ Hello::get_string ()
 void
 Hello::shutdown ()
 {
-  this->orb_->shutdown (0 );
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp
index 517fc42e10b80..5aba8dd860f56 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp
@@ -61,7 +61,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         orb->string_to_object (ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () );
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp
index 951ccc19cb72d..f62002d9634ae 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp
@@ -39,10 +39,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" );
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () );
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -65,7 +65,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () );
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
index 684b13eb11b41..e0ab454d3b68b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
@@ -84,7 +84,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
         ACE_hthread_t threadHandle;
-        if ( ACE_Thread::spawn(run_test,
+        if (ACE_Thread::spawn(run_test,
                                static_cast<void*>(server.in()),
                                THR_NEW_LWP | THR_JOINABLE ,
                                0,
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
index e49d7dc61401c..fb2a94f49a78e 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
@@ -16,7 +16,7 @@ Visual_i::normal (CORBA::Long arg)
   // retrieve Slot
   CORBA::Object_var piobj = orb_->resolve_initial_references ("PICurrent");
   PortableInterceptor::Current_var pi_current =
-      PortableInterceptor::Current::_narrow (piobj.in () );
+      PortableInterceptor::Current::_narrow (piobj.in ());
 
   if (CORBA::is_nil (pi_current.in ()))
   {
diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
index 81f873b5ded41..a880f583214d1 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
@@ -31,7 +31,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method ( /**/)
+Test_i::test_method ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Test method invoked on the sever\n"));
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
index 821180b0877eb..f46cebfc87c28 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
@@ -33,7 +33,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method ( /* */)
+Test_i::test_method ()
 {
   ACE_DEBUG ((LM_DEBUG, "test_method invoked\n"));
 }
diff --git a/TAO/tests/RTScheduling/VoidData/test.idl b/TAO/tests/RTScheduling/VoidData/test.idl
index 72f3daefdf31e..498fc227d9929 100644
--- a/TAO/tests/RTScheduling/VoidData/test.idl
+++ b/TAO/tests/RTScheduling/VoidData/test.idl
@@ -1,5 +1,5 @@
 #include "tao/RTScheduling/RTScheduler_include.pidl"
 local interface test
 {
-   void bar (in CORBA::VoidData data );
+   void bar (in CORBA::VoidData data);
 };
diff --git a/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element_ut.cpp b/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element_ut.cpp
index e5467e6a70f59..8f7cefb47d25b 100644
--- a/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element_ut.cpp
@@ -49,8 +49,8 @@ using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO::details;
       FAIL_RETURN_IF_NOT(mr.expect(1), mr);
     }
 
-    FAIL_RETURN_IF_NOT(d.expect(0),d );
-    FAIL_RETURN_IF_NOT(r.expect(0),r );
+    FAIL_RETURN_IF_NOT(d.expect(0),d);
+    FAIL_RETURN_IF_NOT(r.expect(0),r);
     FAIL_RETURN_IF_NOT(md.expect(0), md);
     FAIL_RETURN_IF_NOT(mr.expect(1), mr);
 
@@ -74,7 +74,7 @@ using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO::details;
 
       x = y;
 
-      FAIL_RETURN_IF_NOT(d.expect(0), d );
+      FAIL_RETURN_IF_NOT(d.expect(0), d);
       FAIL_RETURN_IF_NOT(r.expect(0), r);
       FAIL_RETURN_IF_NOT(md.expect(1), md);
       FAIL_RETURN_IF_NOT(mr.expect(1), mr);
@@ -87,7 +87,7 @@ using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO::details;
       FAIL_RETURN_IF_NOT(mr.expect(2), mr);
     }
 
-    FAIL_RETURN_IF_NOT(d.expect(0),d );
+    FAIL_RETURN_IF_NOT(d.expect(0),d);
     FAIL_RETURN_IF_NOT(r.expect(0), r);
     FAIL_RETURN_IF_NOT(md.expect(0), md);
     FAIL_RETURN_IF_NOT(mr.expect(1), mr);
@@ -159,7 +159,7 @@ using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO::details;
 
       tested_element_traits::release(xe);
       tested_element_traits::release(ye);
-      FAIL_RETURN_IF_NOT(r.expect(2),r );
+      FAIL_RETURN_IF_NOT(r.expect(2),r);
       FAIL_RETURN_IF_NOT(mr.expect(2), mr);
     }
 
diff --git a/TAO/tests/Sequence_Unit_Tests/run_test.pl b/TAO/tests/Sequence_Unit_Tests/run_test.pl
index bfe170454bc49..264c52b73ccec 100755
--- a/TAO/tests/Sequence_Unit_Tests/run_test.pl
+++ b/TAO/tests/Sequence_Unit_Tests/run_test.pl
@@ -27,8 +27,7 @@
                Unbounded_Simple_Types
                Bounded_Simple_Types
                Unbounded_String
-               Bounded_String
-              );
+               Bounded_String);
 
 if ($^O ne "MSWin32") {
     push @testsToRun, qw(unbounded_octet_sequence_nocopy_ut);
diff --git a/TAO/tests/Stack_Recursion/Sender.cpp b/TAO/tests/Stack_Recursion/Sender.cpp
index 7616b16a34e97..57c5307451871 100644
--- a/TAO/tests/Stack_Recursion/Sender.cpp
+++ b/TAO/tests/Stack_Recursion/Sender.cpp
@@ -57,7 +57,6 @@ Sender::get_event_count ()
 void
 Sender::ping ()
 {
-  return;
 }
 
 void
diff --git a/TAO/tests/Storable/run_test.pl b/TAO/tests/Storable/run_test.pl
index f7a823a850e37..1561816555666 100755
--- a/TAO/tests/Storable/run_test.pl
+++ b/TAO/tests/Storable/run_test.pl
@@ -20,7 +20,7 @@
 sub cat_file($)
 {
     my $file_name = shift;
-    if (-s $file_name ) # size of file is greater than zero
+    if (-s $file_name) # size of file is greater than zero
     {
         open TESTFILE, $file_name or die "Couldn't open file: $!";
         my @teststring = <TESTFILE>; # read in all of the file
diff --git a/TAO/tests/TransportCurrent/Framework/run_test.pl b/TAO/tests/TransportCurrent/Framework/run_test.pl
index 8024151a0f41d..3c87cca959706 100755
--- a/TAO/tests/TransportCurrent/Framework/run_test.pl
+++ b/TAO/tests/TransportCurrent/Framework/run_test.pl
@@ -12,9 +12,9 @@
 my $confmod = "";
 
 my $mode = shift (@ARGV);
-if ( $mode =~ /-dynamic/) {
+if ($mode =~ /-dynamic/) {
 }
-elsif  ( $mode =~ /-static/) {
+elsif ($mode =~ /-static/) {
     $confmod = "-static";
 }
 else {
diff --git a/TAO/tests/TransportCurrent/IIOP/run_test.pl b/TAO/tests/TransportCurrent/IIOP/run_test.pl
index 3d75daf65a7c5..293f4c2bf34e8 100755
--- a/TAO/tests/TransportCurrent/IIOP/run_test.pl
+++ b/TAO/tests/TransportCurrent/IIOP/run_test.pl
@@ -23,13 +23,13 @@
 $status = 0;
 
 $mode = shift (@ARGV);
-if ( $mode =~ /-dynamic/) {
+if ($mode =~ /-dynamic/) {
     $base_client_conf = "client_dynamic" . $PerlACE::svcconf_ext;
     $base_server_conf = "server_dynamic" . $PerlACE::svcconf_ext;
     $client_conf_file = $client->LocalFile ("$base_client_conf");
     $server_conf_file = $server->LocalFile ("$base_server_conf");
 }
-elsif  ( $mode =~ /-static/) {
+elsif ($mode =~ /-static/) {
     $base_client_conf = "client_static" . $PerlACE::svcconf_ext;
     $base_server_conf = "server_static" . $PerlACE::svcconf_ext;
     $client_conf_file = $client->LocalFile ("$base_client_conf");
diff --git a/TAO/tests/Transport_Cache_Manager/run_test.pl b/TAO/tests/Transport_Cache_Manager/run_test.pl
index 9053a8fb40697..fbf9356445618 100755
--- a/TAO/tests/Transport_Cache_Manager/run_test.pl
+++ b/TAO/tests/Transport_Cache_Manager/run_test.pl
@@ -11,8 +11,7 @@
 my $final_result = 0;
 
 my @testsToRun = qw(Bug_3549_Regression
-               Bug_3558_Regression
-              );
+                    Bug_3558_Regression);
 
 foreach my $process (@testsToRun) {
 
diff --git a/TAO/tests/Two_Objects/Object_Factory_i.cpp b/TAO/tests/Two_Objects/Object_Factory_i.cpp
index a01d2199aad8a..e14f9d6e7adfc 100644
--- a/TAO/tests/Two_Objects/Object_Factory_i.cpp
+++ b/TAO/tests/Two_Objects/Object_Factory_i.cpp
@@ -18,7 +18,7 @@ Object_Factory_i::create_first ()
 
   ACE_NEW_THROW_EX (first_impl,
                     First_i (orb_.in(), two_way_done_ ),
-                    CORBA::NO_MEMORY() );
+                    CORBA::NO_MEMORY());
   // Ownership is transfered to the POA.
   PortableServer::ServantBase_var safe (first_impl);
 
diff --git a/TAO/tests/Two_Objects/README b/TAO/tests/Two_Objects/README
index bb59441a183bd..1269794533e2e 100644
--- a/TAO/tests/Two_Objects/README
+++ b/TAO/tests/Two_Objects/README
@@ -16,7 +16,7 @@ for subsequent requests on the same connection handle.
 
 Description:
 
-The server creates two servants ( each implementing different
+The server creates two servants (each implementing different
 interfaces ). Two threads are created on the server and each
 one of them listens for requests (has a orb->run() call). The
 client first makes a one way call to Servant 1. It then makes
diff --git a/TAO/tests/Two_Objects/Second_i.cpp b/TAO/tests/Two_Objects/Second_i.cpp
index a2eefb082acf5..c4f0211bc579e 100644
--- a/TAO/tests/Two_Objects/Second_i.cpp
+++ b/TAO/tests/Two_Objects/Second_i.cpp
@@ -24,7 +24,7 @@ Second_i::twoway_method ()
 
   Two_Objects_Test::Octet_Seq_var reply_var =
     preply_mesg;
-  reply_var->length ( this->length_);
+  reply_var->length (this->length_);
 
   ACE_DEBUG ((LM_DEBUG,
               "Twoway servant : (%P|%t) two way method called.\n"));
diff --git a/TAO/tests/Two_Objects/Second_i.h b/TAO/tests/Two_Objects/Second_i.h
index 6048b627f2570..22b67aad6c52d 100644
--- a/TAO/tests/Two_Objects/Second_i.h
+++ b/TAO/tests/Two_Objects/Second_i.h
@@ -13,11 +13,10 @@ class Second_i
   : public virtual POA_Two_Objects_Test::Second
 {
 public:
-  Second_i ( CORBA::ORB_ptr orb,
-             CORBA::ULong len, ACE_Auto_Event &two_way_done);
+  Second_i (CORBA::ORB_ptr orb,
+            CORBA::ULong len, ACE_Auto_Event &two_way_done);
 
-  Two_Objects_Test::Octet_Seq *
-    twoway_method ();
+  Two_Objects_Test::Octet_Seq *twoway_method ();
 
   void shutdown ();
 
diff --git a/TAO/tests/Xt_Stopwatch/Control.cpp b/TAO/tests/Xt_Stopwatch/Control.cpp
index f276b040571d5..770a7f1303dbd 100644
--- a/TAO/tests/Xt_Stopwatch/Control.cpp
+++ b/TAO/tests/Xt_Stopwatch/Control.cpp
@@ -7,12 +7,12 @@ Control::Control (Widget &parent)
   this->frame_ = XmCreateFrame (parent,
                                 (char *) "frame",
                                 0,
-                                0 );
+                                0);
 
   this->rowcolumn_ = XmCreateRowColumn (this->frame_,
                                          (char *)"rwc",
                                         0,
-                                        0 );
+                                        0);
 
   this->startwidget_ = XmCreatePushButton (this->rowcolumn_,
                                            (char *) "Start",
diff --git a/TAO/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp
index b0fd70e1e5928..8990d63b475ca 100644
--- a/TAO/tests/Xt_Stopwatch/client.cpp
+++ b/TAO/tests/Xt_Stopwatch/client.cpp
@@ -155,7 +155,6 @@ Client::stop_hook ()
     {
       ex._tao_print_exception (
         "Caught an exception in the stop button callback");
-      return;
     }
 }
 
diff --git a/TAO/tests/Xt_Stopwatch/timer.cpp b/TAO/tests/Xt_Stopwatch/timer.cpp
index af6f071c6b597..35b54df65f460 100644
--- a/TAO/tests/Xt_Stopwatch/timer.cpp
+++ b/TAO/tests/Xt_Stopwatch/timer.cpp
@@ -1,6 +1,5 @@
 #include "timer.h"
 
-
 Timer_imp::Timer_imp (XtAppContext &app,
                       CORBA::Long interval,
                       Stopwatch_display *stopwatch)
@@ -33,7 +32,7 @@ Timer_imp::start ()
   this->id_ = XtAppAddTimeOut (this->app_,
                                this->interval_,
                                &Timer_imp::tick_callback,
-                               (XtPointer) this );
+                               (XtPointer) this);
 }
 
 void
@@ -49,7 +48,7 @@ Timer_imp::stop ()
 CORBA::Float
 Timer_imp::elapsed_time()
 {
-    return ((CORBA::Float) counter_ * interval_ / 1000.0 );
+    return ((CORBA::Float) counter_ * interval_ / 1000.0);
 }
 
 void
@@ -61,7 +60,6 @@ Timer_imp::tick_callback (XtPointer client_data,
   obj->tick ();
 }
 
-
 void
 Timer_imp::tick ()
 {
@@ -83,5 +81,3 @@ Timer_imp::report_time (CORBA::Float time)
 {
   stopwatch_->set_time (time);
 }
-
-