Layout/return changes

author: Johnny Willemsen <jwillemsen@remedy.nl> 2022-10-12 09:08:18 +0200
committer: Johnny Willemsen <jwillemsen@remedy.nl> 2022-10-12 09:08:18 +0200
commit: d7b7a7ce9d2f46fb6e351b844ed87e643e051f27 (patch)
tree: 5edbb84af381a90d3cb83ce67cddc884866b4de4
parent: 4f8d9685b45a3f7a0140eb6053fcb096c0f67719 (diff)
download: ATCD-d7b7a7ce9d2f46fb6e351b844ed87e643e051f27.tar.gz
175 files changed, 379 insertions, 640 deletions
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 857b9061edb..8627d18ee88 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 8ca32e2dd21..92013d8ce7f 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 90667f6c708..74372401d7c 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 77bcbdfd30f..1d1d5ffd14c 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 4ea62edf998..42d6dddf6b4 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 662c18e9217..b81370f01df 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 9acfb82641a..7dfca4aa58d 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 8eb96ccb635..8f6b6f604db 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 f51aa60d6c3..c84ab8e88c8 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 f983ad306dd..968cfa836ca 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 c63bd4a210c..17735f62984 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 ad930572875..7646627fd8c 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 @@ public:
   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 74a4a85be49..cd96b6ae330 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 51d7cae2ccc..982b2378a0b 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 ea65e8cdb2d..a1bab4f341a 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 457285eeac9..45c28d07769 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 63010aacfcf..66e0c5144a9 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 783d061e8fe..9c67a08bdf2 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 ec960286654..20c682d5dc3 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 bb71b45abee..16c7694ca22 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 ad930572875..7646627fd8c 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 @@ public:
   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 e98c6b869be..a54dca9e813 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 dcb138f4d1d..d25bf498762 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 d3c150a24b6..1a59d8c484a 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 63623414149..4d0d1796c93 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 d7be192bce8..afa5abe2f14 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 fe9ba1b094a..9afa555a78e 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 78ed68f0631..00bd3d8fea5 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 5affa4bc4c1..6d70dc6b4e4 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 4fdbd6572c2..0db83fcb9b7 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 7cf1bdd9bc1..5fef6eaaef2 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 1b5912e316b..54f32b3c9ea 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 @@ public:
     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 152a368249e..d235de89f49 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 @@ public:
 
     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 7f74ae1d075..4dc06d51e34 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 6ad127f255f..58d437c5f68 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 951ccc19cb7..f62002d9634 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 5ca3fcfad91..d2a9f33c2a1 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 8c51234d305..66b26fc2ac2 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 2c8792999f2..cfba8db9ba9 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 5ab4ea8cdc8..c0f9d476954 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 cdd00671df5..a10cc5b53ad 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 b4db10c3107..4168b9c133c 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 29e4c432adc..d2eaa541490 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 a46f3074570..2ada2260e4a 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 275830979d2..e467d335503 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 1cd92c02a78..c297a9147e3 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 a1b93d3b052..dff92a13582 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
@@ -34,9 +34,7 @@ private:
     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 c08d2e9e12c..c584181925a 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 @@ public:
   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 380de17d08c..ef6bfbb12f6 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 @@ private:
   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 3745856fce7..7af8b3bacd9 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
@@ -72,16 +72,13 @@ public:
     // 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 4ca9fcc8b1a..89500455fd8 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
@@ -75,13 +75,11 @@ public:
     ////////////////
     // 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 04ed9cdc8d8..20ee652624c 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
@@ -81,30 +81,24 @@ public:
 
 
   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 105cfa6298c..0579e777364 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 de1c62ad434..9fd2d637036 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 2fc343e1dd9..5cdc55e33a6 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 @@ sub backup_restart_test()
     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 8ae1cd596a1..4b62db16f68 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 @@ sub failover_test()
     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 134f9d7b8d9..94a44d04d43 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 @@ sub persistence_test ()
     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 @@ sub backup_restore_test ()
     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 622752897bd..4a31ff70524 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 @@ my $ns2_backup_args = "--backup -ORBListenEndPoints $ns_backup_endpoint2 ".
                       "-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 0d0b4d96e00..a63a673ef35 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 548e0defdf7..8e21a491314 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 0fb9f72b9fb..1f7ce7f23af 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 239abafce89..278bcd1dd84 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
@@ -19,11 +19,9 @@ public:
   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 0179d7bcf06..c87fe55be0a 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
@@ -27,8 +27,7 @@ public:
 
   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 96b34e5cb61..15ac48ac812 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 834bce82088..68204a73c16 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 96b34e5cb61..15ac48ac812 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 96b34e5cb61..15ac48ac812 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 2eba63f0baf..80e2edc83c4 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 ec46d5d9079..9d1d8cf1ba9 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 7852d4129d1..2e82d4c0b9b 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 f745ab49a69..36e248801f4 100644
--- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp
@@ -36,7 +36,7 @@ public:
   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 @@ public:
         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 1d72c177827..10f295ec2ab 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 bdf5bccb05c..cb8b212a926 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 @@ class Client
         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 14661239937..c5c6d684768 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 9f338efb08c..9d9afb07ecd 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 0c7648f65e9..3d9167045c0 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 2b765fc66e3..27a7cc1090c 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 64238368882..001226a837a 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 65910197c25..42d2f93c381 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 c5b8c84b3dc..f3c8678ab97 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 @@ sub make_server_requests()
 
     ##### 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 @@ sub shutdown_servers(@)
 	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 7feb962aa13..6067c46338b 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 ede38443f69..1fc599fafd4 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 ae911872025..6e9548a8777 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 8b49865299c..0a8da2b599e 100755
--- a/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl
@@ -91,7 +91,7 @@ if ($TI_status != 0) {
 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 35ca8593ce2..aa6888fef99 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 c8bc7e309a6..b6ad50e5207 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 ad7d8f3511f..e85d56a9b7e 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 0833f106602..d6d0b8054f2 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 9e1e79e5197..f7c3f4602dd 100755
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/run_test.pl
@@ -156,7 +156,7 @@ sub make_server_requests($$)
     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 5ed5aae5ca3..d402292899d 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 9161b4765f4..d33667ecc5b 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 b07c749f85d..613e48b714d 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 $hide_server = 0;
 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 @@ if ($#ARGV >= 0) {
 	    $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 33bd08b6fa7..f1978c9a4c1 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 6577003664a..4804350e1b9 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 8b460c190de..b4b13498341 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 @@ private:
                       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 @@ private:
 
   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 d5ed2f7df0d..a74c19130e2 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 bbe381aecc4..1535d3bc8e6 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 7c97cfe3fe3..6cb797b60e0 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 275395b5360..dcbbda028a5 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 371e7cdc3e9..b06fc0584e2 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 b3988e5bb1a..3a3075b2b7b 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 43f27debf0e..38901d4fdc1 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
@@ -28,8 +28,7 @@ public:
   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 746340a1671..84eb7728060 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 7885ea0f7f2..faffb62ee90 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 7c00500116c..49ae0f05c33 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.h
@@ -33,8 +33,7 @@ public:
 
   // = 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 82617521dc8..172062a51ee 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 1aa20040659..f4185a34d3a 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 4f55c09ecce..19b8e23ac7a 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
@@ -32,11 +32,9 @@ private:
   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 35efeb81fee..fff98c3ee41 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 c44e33bd117..d7973434414 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 42bf14f16ec..1deb3c1001c 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 @@ public:
   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 @@ public:
 
   // = 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 95c018b7b91..3a12f9a84ff 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 eae8c77fbb8..81c53e7c4fd 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 0a63e19b23b..0c54c254799 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
@@ -33,9 +33,7 @@ public:
   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 cbe9439b9b7..5910612b6fb 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 821a4b5453c..635f581017e 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
@@ -53,8 +53,7 @@ public:
   /// 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 80642923154..c75a790f8c5 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 78d30d45a73..7da4193f694 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 6c6fe50abf2..d18e1b903c7 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 5be7ee1c143..b6b31728320 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 83261e62705..2e9f2f5cf5c 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 23a8719f783..a766af31cb0 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 596cb624502..482ffe8721c 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 3438aff5c43..8685542fc1c 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 bd387c2fd5b..0b12de46451 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 ee832c1a759..3315f08aad0 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 b60ec30150f..788178afc46 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 16973aee910..7c6a81077d0 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 20465eccd26..690f94e507d 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 3b4e95cdb03..c7516eca02e 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 2b91c8ab7e8..2fb1055dc37 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 9765a241f0f..7b3ec37371c 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 da526b3a038..bac88e1151d 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 02e67aa9e60..06435cd4c45 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 635d393a0ce..c586dd0e012 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 305da5fe9b7..7af661f903f 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 bec30a6d1f0..0df3dded203 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 f1e9fae8521..7e7b31b43ef 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 ea18634280e..84674908576 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
@@ -248,11 +248,10 @@ protected:
   // = 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 3cce413cf5b..b1cd05702fd 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 4ac6284aa81..664ee1f2646 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 39589a2c2fc..a4dd8f1e0f3 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
@@ -26,15 +26,12 @@ public:
   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 @@ public:
   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 1e58c719da2..346246d79cc 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 b2fd42bbe1e..4741cdba81c 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 e4a5a526401..cc37a479d4d 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 1cb8deed507..f12c1650539 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 1c243044ec6..ac1715fd5a3 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 51ddc643cc3..3379933474d 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 c7dd4fc303b..eef03ef2f3b 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 afaedc73a36..d58e3859128 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 551a8146bd2..d8678048838 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 012f0d7d19b..ffd3c21b456 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
@@ -34,8 +34,7 @@ public:
   /// 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 b6ddc735664..fd735f871b4 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 034893d48e2..c27ddbc0c90 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 476f7066653..04d4b41ce83 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 2fb227c9be3..92efbea6c63 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 13944655096..8e647d69ae6 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 433ee9953a7..224aa3988d9 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 107472cd390..9411ec61050 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 @@ PerlACE::check_privilege_group();
 
 $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 7b7ea8fbf23..8705f8d4586 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 041cee324e2..c59c08aca11 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 @@ public:
 
   // = 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 d29a5967756..17af9a4bd31 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 f3fc41ea831..c6d9e993aa8 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 791102d90eb..e6201b088d5 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 53e4756bb70..939ac5713d9 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 9e692470a23..e347070986f 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 723a82b5006..fcbdaf63893 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 b08537aa825..61182c9d451 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 06520b66af1..d1d6d3cec23 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 3db89d561de..5bdb0cc1657 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 2c3d7a968a5..633430af539 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 72b4e40c9e7..d4fc8e01786 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 d34cb1fa329..67cab2ac5f0 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 32f6b0c7f83..ba669aea224 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 @@ public:
 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 47622cda295..cd921327d7a 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
@@ -29,8 +29,7 @@ public:
 
   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_;
author	Johnny Willemsen <jwillemsen@remedy.nl>	2022-10-12 09:08:18 +0200
committer	Johnny Willemsen <jwillemsen@remedy.nl>	2022-10-12 09:08:18 +0200
commit	d7b7a7ce9d2f46fb6e351b844ed87e643e051f27 (patch)
tree	5edbb84af381a90d3cb83ce67cddc884866b4de4
parent	4f8d9685b45a3f7a0140eb6053fcb096c0f67719 (diff)
download	ATCD-d7b7a7ce9d2f46fb6e351b844ed87e643e051f27.tar.gz