Layout changes

33 files changed, 82 insertions, 176 deletions

diff --git a/TAO/tests/Big_AMI/client.cpp b/TAO/tests/Big_AMI/client.cpp
index 1c9c80b7f6d..906b70f4f4b 100644
--- a/TAO/tests/Big_AMI/client.cpp
+++ b/TAO/tests/Big_AMI/client.cpp
@@ -212,8 +212,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       poa_var->destroy (1,  // ethernalize objects
-                        0  // wait for completion
-                       );
+                        0);  // wait for completion
 
       orb->destroy ();
     }
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
index f2f0bb05caf..5c85837527c 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
@@ -21,8 +21,6 @@ Echo_Caller::start_task(Test::Echo_ptr client)
     }
 
   ACE_Thread_Manager::instance ()->wait ();
-
-  return;
 }
 
 void
diff --git a/TAO/tests/Bug_1254_Regression/BlobServer.h b/TAO/tests/Bug_1254_Regression/BlobServer.h
index e6c77019a20..dfde196a963 100644
--- a/TAO/tests/Bug_1254_Regression/BlobServer.h
+++ b/TAO/tests/Bug_1254_Regression/BlobServer.h
@@ -15,8 +15,7 @@ public:
   // = The skeleton methods
     virtual void test(
         BlobType1& blob1,
-        BlobType2& blob2
-      );
+        BlobType2& blob2);
   virtual void shutdown ();
 
 private:
diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
index 6318b3f533c..4cf7b821414 100644
--- a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
+++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
@@ -8,7 +8,6 @@ Reply_Handler::Reply_Handler (CORBA::ORB_ptr o)
 void
 Reply_Handler::next_prime (CORBA::ULong)
 {
-  return;
 }
 
 void
diff --git a/TAO/tests/Bug_1676_Regression/client.cpp b/TAO/tests/Bug_1676_Regression/client.cpp
index f4f86e89b64..ec66b9af10e 100644
--- a/TAO/tests/Bug_1676_Regression/client.cpp
+++ b/TAO/tests/Bug_1676_Regression/client.cpp
@@ -132,7 +132,5 @@ void get_stringList2(Test::Hello_var hello)
     {
       ex._tao_print_exception ("get_stringList2");
     }
-
-
-    return;
+  return;
 }
diff --git a/TAO/tests/Bug_2084_Regression/Client_Task.cpp b/TAO/tests/Bug_2084_Regression/Client_Task.cpp
index 498f02b387a..328a193e2df 100644
--- a/TAO/tests/Bug_2084_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_2084_Regression/Client_Task.cpp
@@ -70,7 +70,7 @@ Client_Task::svc ()
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Client starting\n"));
 
-      evNode->registerHello( hello_servant.in() );
+      evNode->registerHello( hello_servant.in());
 
       evNode->shutdown ();
     }
diff --git a/TAO/tests/Bug_2122_Regression/Test.idl b/TAO/tests/Bug_2122_Regression/Test.idl
index ed40e939aaf..e459fe09c9f 100644
--- a/TAO/tests/Bug_2122_Regression/Test.idl
+++ b/TAO/tests/Bug_2122_Regression/Test.idl
@@ -9,8 +9,8 @@ module Test
 
    interface Foo
    {
-      void op1( in MyStringType s );
-      void op2( in MyOtherStringType s );
+      void op1( in MyStringType s);
+      void op2( in MyOtherStringType s);
    };
 };
 
@@ -22,7 +22,7 @@ module Foo
 
       interface Whatever
       {
-         void someOp( in MyString s );
+         void someOp( in MyString s);
       };
    };
 
@@ -32,7 +32,7 @@ module Foo
 
       interface WhoCares
       {
-         void someOp( in MyString s );
+         void someOp( in MyString s);
       };
    };
 
@@ -42,7 +42,7 @@ module Foo
 
       interface WhoCares
       {
-         void someOp( in MyString s );
+         void someOp( in MyString s);
       };
    };
 };
diff --git a/TAO/tests/Bug_2124_Regression/Test.idl b/TAO/tests/Bug_2124_Regression/Test.idl
index edee92ac64d..0d006d331a2 100644
--- a/TAO/tests/Bug_2124_Regression/Test.idl
+++ b/TAO/tests/Bug_2124_Regression/Test.idl
@@ -9,8 +9,8 @@ module Test
 
    interface Foo
    {
-      void op1( in MyString s );
-      void op2( in OtherString s );
+      void op1( in MyString s);
+      void op2( in OtherString s);
    };
 };
 
diff --git a/TAO/tests/Bug_2188_Regression/broken_i.h b/TAO/tests/Bug_2188_Regression/broken_i.h
index aec85dd444e..37cb737907e 100644
--- a/TAO/tests/Bug_2188_Regression/broken_i.h
+++ b/TAO/tests/Bug_2188_Regression/broken_i.h
@@ -76,201 +76,146 @@ public:
   ::LongArray_slice * longArrayOp (
       const ::LongArray p1,
       ::LongArray p2,
-      ::LongArray_out p3
-    );
+      ::LongArray_out p3);
 
   virtual
   ::StringArray_slice * stringArrayOp (
       const ::StringArray p1,
       ::StringArray p2,
-      ::StringArray_out p3
-    );
+      ::StringArray_out p3);
 
   virtual
   ::ShortArray_slice * shortArrayOp (
       const ::ShortArray p1,
       ::ShortArray p2,
-      ::ShortArray_out p3
-    );
+      ::ShortArray_out p3);
 
   virtual
   ::UShortArray_slice * ushortArrayOp (
       const ::UShortArray p1,
       ::UShortArray p2,
-      ::UShortArray_out p3
-    );
+      ::UShortArray_out p3);
 
   virtual
   ::CharArray_slice * charArrayOp (
       const ::CharArray p1,
       ::CharArray p2,
-      ::CharArray_out p3
-    );
+      ::CharArray_out p3);
 
   virtual
   ::OctetArray_slice * octetArrayOp (
       const ::OctetArray p1,
       ::OctetArray p2,
-      ::OctetArray_out p3
-    );
+      ::OctetArray_out p3);
 
   virtual
   ::DoubleArray_slice * doubleArrayOp (
       const ::DoubleArray p1,
       ::DoubleArray p2,
-      ::DoubleArray_out p3
-    );
+      ::DoubleArray_out p3);
 
   virtual
-  ::LongArray_slice * a_longArray (
-
-    );
+  ::LongArray_slice * a_longArray ();
 
   virtual
   void a_longArray (
-      const ::LongArray a_longArray
-    );
+      const ::LongArray a_longArray);
 
   virtual
-  ::ULongArray_slice * a_ulongArray (
-
-    );
+  ::ULongArray_slice * a_ulongArray ();
 
   virtual
   void a_ulongArray (
-      const ::ULongArray a_ulongArray
-    );
+      const ::ULongArray a_ulongArray);
 
   virtual
-  ::StringArray_slice * a_stringArray (
-
-    );
+  ::StringArray_slice * a_stringArray ();
 
   virtual
   void a_stringArray (
-      const ::StringArray a_stringArray
-    );
+      const ::StringArray a_stringArray);
 
   virtual
-  ::ShortArray_slice * a_shortArray (
-
-    );
+  ::ShortArray_slice * a_shortArray ();
 
   virtual
   void a_shortArray (
-      const ::ShortArray a_shortArray
-    );
+      const ::ShortArray a_shortArray);
 
   virtual
-  ::UShortArray_slice * a_ushortArray (
-
-    );
+  ::UShortArray_slice * a_ushortArray ();
 
   virtual
   void a_ushortArray (
-      const ::UShortArray a_ushortArray
-    );
+      const ::UShortArray a_ushortArray);
 
   virtual
-  CORBA::Char a_char (
-
-    );
+  CORBA::Char a_char ();
 
   virtual
-  void a_char (
-      ::CORBA::Char a_char
-    );
+  void a_char (::CORBA::Char a_char);
 
   virtual
-  ::CharArray_slice * a_charArray (
-
-    );
+  ::CharArray_slice * a_charArray ();
 
   virtual
-  void a_charArray (
-      const ::CharArray a_charArray
-    );
+  void a_charArray (const ::CharArray a_charArray);
 
   virtual
-  ::OctetArray_slice * a_octetArray (
-
-    );
+  ::OctetArray_slice * a_octetArray ();
 
   virtual
   void a_octetArray (
-      const ::OctetArray a_octetArray
-    );
+      const ::OctetArray a_octetArray);
 
   virtual
-  ::DoubleArray_slice * a_doubleArray (
-
-    );
+  ::DoubleArray_slice * a_doubleArray ();
 
   virtual
   void a_doubleArray (
-      const ::DoubleArray a_doubleArray
-    );
+      const ::DoubleArray a_doubleArray);
 
   virtual
-  ::FloatArray_slice * a_floatArray (
-
-    );
+  ::FloatArray_slice * a_floatArray ();
 
   virtual
   void a_floatArray (
-      const ::FloatArray a_floatArray
-    );
+      const ::FloatArray a_floatArray);
 
   virtual
-  ::BucketArray_slice * a_bucketArray (
-
-    );
+  ::BucketArray_slice * a_bucketArray ();
 
   virtual
   void a_bucketArray (
-      const ::BucketArray a_bucketArray
-    );
+      const ::BucketArray a_bucketArray);
 
   virtual
-  ::AccountArray_slice * a_accountArray (
-
-    );
+  ::AccountArray_slice * a_accountArray ();
 
   virtual
   void a_accountArray (
-      const ::AccountArray a_accountArray
-    );
+      const ::AccountArray a_accountArray);
 
   virtual
-  ::BooleanArray_slice * a_booleanArray (
-
-    );
+  ::BooleanArray_slice * a_booleanArray ();
 
   virtual
   void a_booleanArray (
-      const ::BooleanArray a_booleanArray
-    );
+      const ::BooleanArray a_booleanArray);
 
   virtual
-  ::LongArrayArray_slice * a_longArrayArray (
-
-    );
+  ::LongArrayArray_slice * a_longArrayArray ();
 
   virtual
   void a_longArrayArray (
-      const ::LongArrayArray a_longArrayArray
-    );
+      const ::LongArrayArray a_longArrayArray);
 
   virtual
-  ::MyEnumArray_slice * a_myEnumArray (
-
-    );
+  ::MyEnumArray_slice * a_myEnumArray ();
 
   virtual
   void a_myEnumArray (
-      const ::MyEnumArray a_myEnumArray
-    );
+      const ::MyEnumArray a_myEnumArray);
 };
 
-
 #endif /* BROKEN_I_H_  */
diff --git a/TAO/tests/Bug_3171_Regression/server.cpp b/TAO/tests/Bug_3171_Regression/server.cpp
index 4fd51bacac3..5680b7a12da 100644
--- a/TAO/tests/Bug_3171_Regression/server.cpp
+++ b/TAO/tests/Bug_3171_Regression/server.cpp
@@ -161,8 +161,8 @@ initORB(int threadID)
     {
       ACE_DEBUG ((LM_DEBUG, "Creating ORB initializer\n"));
       PortableInterceptor::ORBInitializer_var rCOI(
-        new MyORBinitializer( ORBid ) );
-      PortableInterceptor::register_orb_initializer( rCOI.in() );
+        new MyORBinitializer(ORBid));
+      PortableInterceptor::register_orb_initializer( rCOI.in());
     }
 
     ACE_DEBUG ((LM_DEBUG, "Creating TAO_ORB_Manager\n"));
@@ -190,12 +190,10 @@ initORB(int threadID)
       CORBA::Any any;
       any <<= connectionTimeout;
 
-      CORBA::ULong l( policyList.length() );
-      policyList.length( l+1 );
+      CORBA::ULong l( policyList.length());
+      policyList.length(l+1);
 
-      policyList[l] = orb->create_policy(
-        TAO::CONNECTION_TIMEOUT_POLICY_TYPE,
-        any );
+      policyList[l] = orb->create_policy(TAO::CONNECTION_TIMEOUT_POLICY_TYPE, any);
 
       ACE_DEBUG ((LM_DEBUG, "Connection timeout policy set for ORB \"%C\"\n",
                   ORBid));
diff --git a/TAO/tests/Bug_3251_Regression/DllOrb.cpp b/TAO/tests/Bug_3251_Regression/DllOrb.cpp
index 89d43fcdab9..106842f5b35 100644
--- a/TAO/tests/Bug_3251_Regression/DllOrb.cpp
+++ b/TAO/tests/Bug_3251_Regression/DllOrb.cpp
@@ -78,8 +78,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[])
 
   this->activate(
     THR_NEW_LWP|THR_JOINABLE|THR_INHERIT_SCHED,
-    threadCnt
-  );
+    threadCnt);
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("init mp_barrier->wait() ...\n")));
   ma_barrier_->wait();
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("init mp_barrier->wait() done\n")));
diff --git a/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp b/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp
index 9d889930228..43134a2f29a 100644
--- a/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp
+++ b/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp
@@ -45,8 +45,7 @@ int PersistentPoa::init (int argc, ACE_TCHAR *argv[])
     mv_thisPOA = mv_rootPOA->create_POA (
       m_poaName.c_str (),
       PortableServer::POAManager::_nil (),
-      policies
-    );
+      policies);
 
     mv_poaManager = mv_thisPOA->the_POAManager ();
     mv_poaManager->activate ();
diff --git a/TAO/tests/Bug_3542_Regression/DllOrb.cpp b/TAO/tests/Bug_3542_Regression/DllOrb.cpp
index d06d663db41..cdcf5f748db 100644
--- a/TAO/tests/Bug_3542_Regression/DllOrb.cpp
+++ b/TAO/tests/Bug_3542_Regression/DllOrb.cpp
@@ -75,8 +75,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[])
 
   this->activate(
     THR_NEW_LWP|THR_JOINABLE|THR_INHERIT_SCHED,
-    threadCnt
-  );
+    threadCnt);
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("init mp_barrier->wait() ...\n")));
   ma_barrier_->wait();
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("init mp_barrier->wait() done\n")));
diff --git a/TAO/tests/Bug_933_Regression/MessengerClient.cpp b/TAO/tests/Bug_933_Regression/MessengerClient.cpp
index 3905d3e4f05..b7519613e1e 100644
--- a/TAO/tests/Bug_933_Regression/MessengerClient.cpp
+++ b/TAO/tests/Bug_933_Regression/MessengerClient.cpp
@@ -35,7 +35,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Bug_933_Regression/MessengerServer.cpp b/TAO/tests/Bug_933_Regression/MessengerServer.cpp
index af48c1b83ce..d0e8baa8500 100644
--- a/TAO/tests/Bug_933_Regression/MessengerServer.cpp
+++ b/TAO/tests/Bug_933_Regression/MessengerServer.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;
diff --git a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
index 04f92407a48..14472d16d26 100644
--- a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
@@ -69,8 +69,6 @@ Server_Request_Interceptor::receive_request (
       // Throw forward exception
       throw PortableInterceptor::ForwardRequest (this->to_);
     }
-
-  return;
 }
 
 void
diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp
index da1097b230a..c40645c4dee 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp
@@ -15,7 +15,6 @@ Hello::onewayTest ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) onewayTest() Upcall in process ..\n"));
-  return;
 }
 
 
diff --git a/TAO/tests/Compression/run_test.pl b/TAO/tests/Compression/run_test.pl
index 9106be41dbf..a55ed826a07 100755
--- a/TAO/tests/Compression/run_test.pl
+++ b/TAO/tests/Compression/run_test.pl
@@ -13,8 +13,7 @@ my @tests = qw(
                zlibserver
                bzip2server
                lzoserver
-               rleserver
-              );
+               rleserver);
 
 foreach my $process (@tests) {
 
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
index 29c8f26763a..8dadfdab1eb 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
@@ -16,9 +16,7 @@ public:
   virtual ~Test_Simple_Test_i ();
 
   virtual
-  void test_method (
-      ::CORBA::ULong & error_count
-    );
+  void test_method (::CORBA::ULong & error_count);
 };
 
 /// Implement the Test::Hello interface
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index 1ad95f62dd0..b1c1ca7af92 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -206,8 +206,7 @@ Test_DynStruct::run_test ()
         {
           DynamicAny::DynAny_var ftc2_base =
             dynany_factory->create_dyn_any_from_type_code (
-                                DynAnyTests::_tc_test_struct_alias
-                              );
+                                DynAnyTests::_tc_test_struct_alias);
 
           ftc2 = DynamicAny::DynStruct::_narrow (ftc2_base.in ());
 
diff --git a/TAO/tests/DynValue_Test/Analyzer.cpp b/TAO/tests/DynValue_Test/Analyzer.cpp
index 02ec090d294..5443b176406 100644
--- a/TAO/tests/DynValue_Test/Analyzer.cpp
+++ b/TAO/tests/DynValue_Test/Analyzer.cpp
@@ -173,7 +173,7 @@ DynAnyAnalyzer::analyze (
             ACE_DEBUG ((LM_DEBUG, "{NULL} "));
           }
         ACE_DEBUG ((LM_DEBUG, "ValueBox Type: %C \"%C\": ",
-                    tc->name (), tc->id ())             );
+                    tc->name (), tc->id ()));
         if (box->is_null ())
           {
             ACE_DEBUG ((LM_DEBUG, "\n"));
diff --git a/TAO/tests/NestedUpcall/Simple/server_i.cpp b/TAO/tests/NestedUpcall/Simple/server_i.cpp
index 93acf38c13f..80810fe23bb 100644
--- a/TAO/tests/NestedUpcall/Simple/server_i.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server_i.cpp
@@ -13,8 +13,6 @@ server_i::start (client_ptr c,
 {
   this->client_ = client::_duplicate (c);
   this->ping (time_to_live);
-
-  return;
 }
 
 void
diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.h b/TAO/tests/OBV/Factory/FactoryC_impl.h
index 08b40df990c..28fa755bc27 100644
--- a/TAO/tests/OBV/Factory/FactoryC_impl.h
+++ b/TAO/tests/OBV/Factory/FactoryC_impl.h
@@ -38,13 +38,11 @@ class Value2_init_impl : public OBV_FactoryTest::Value2_init
 {
 public:
   virtual OBV_FactoryTest::Value2* create_default (
-      CORBA::ULong id
-      );
+      CORBA::ULong id);
 
   virtual OBV_FactoryTest::Value2* create (
       CORBA::ULong id,
-      const OBV_FactoryTest::BaseValue::BV_Data & data
-      );
+      const OBV_FactoryTest::BaseValue::BV_Data & data);
 
 public:
   virtual CORBA::ValueBase * create_for_unmarshal ();
diff --git a/TAO/tests/OBV/Indirection/Factory.cpp b/TAO/tests/OBV/Indirection/Factory.cpp
index 8a827f7e66b..97ec1dfc7c5 100644
--- a/TAO/tests/OBV/Indirection/Factory.cpp
+++ b/TAO/tests/OBV/Indirection/Factory.cpp
@@ -15,8 +15,7 @@ NodeFactory::create_for_unmarshal ()
   ACE_NEW_THROW_EX (
       ret_val,
       OBV_demo::value::idl::Node,
-      ::CORBA::NO_MEMORY ()
-    );
+      ::CORBA::NO_MEMORY ());
   return ret_val;
 }
 
@@ -35,8 +34,7 @@ BoxedValueFactory::create_for_unmarshal ()
   ACE_NEW_THROW_EX (
       ret_val,
       OBV_demo::value::idl::boxedValue,
-      ::CORBA::NO_MEMORY ()
-    );
+      ::CORBA::NO_MEMORY ());
   return ret_val;
 }
 
@@ -55,8 +53,7 @@ BaseValueFactory::create_for_unmarshal ()
   ACE_NEW_THROW_EX (
       ret_val,
       OBV_demo::value::idl::BaseValue,
-      ::CORBA::NO_MEMORY ()
-    );
+      ::CORBA::NO_MEMORY ());
   return ret_val;
 }
 
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
index 7e311788243..11b9d4d4795 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
@@ -180,7 +180,6 @@ node_impl::add_edge (Supports_Test::Node * neighbor)
   neighbors_ ().length (neighbors_ ().length () + 1);
   neighbors_ ()[neighbors_ ().length () - 1] = neighbor;
   neighbor->_add_ref ();
-  return;
 }
 
 // Remove the edge from this node to neighbor.
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
index 5d4d0f0241c..3520b9b9e8a 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
@@ -111,8 +111,7 @@ int DllOrb::init (int argc, ACE_TCHAR *argv[])
 
   this->activate(
                  THR_NEW_LWP|THR_JOINABLE|THR_INHERIT_SCHED,
-                 threadCnt
-                 );
+                 threadCnt);
   mp_barrier->wait ();
 #endif
 
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
index ffba37e322f..53739b26c6d 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
@@ -41,7 +41,6 @@ Sender_i::send_ready_message (Test::Receiver_ptr receiver)
 void
 Sender_i::ping ( /**/)
 {
-  return;
 }
 
 void
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
index 5bbf5592e50..06efab01562 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
@@ -150,7 +150,7 @@ namespace
         pi_current,
         location,
         correctTSCvalue,
-        correctRSCvalue );
+        correctRSCvalue);
 
     if (number && (0 != ACE_OS::strcmp( location, "receive_request" )))
     {
@@ -159,7 +159,7 @@ namespace
       data <<= number;
 
       ACE_DEBUG ((LM_DEBUG, "SERVER %C -> set_slot(RSC)", location));
-      ri->set_slot( slot_id, data );
+      ri->set_slot( slot_id, data);
 
       ACE_DEBUG ((LM_DEBUG, " -> long (%d)\n", number));
 
@@ -168,7 +168,7 @@ namespace
           pi_current,
           location,
           correctTSCvalue,
-          number );
+          number);
     }
   }
 }
@@ -227,7 +227,7 @@ public:
   virtual void
   tao_ft_interception_point (ServerRequestInfo_ptr ri, OctetSeq_out)
   {
-    getAndSetMySlot( ri, this->pi_current_, "tao_ft_interception_point", 0, 0 );
+    getAndSetMySlot( ri, this->pi_current_, "tao_ft_interception_point", 0, 0);
   }
 #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
 
@@ -235,39 +235,37 @@ public:
   receive_request_service_contexts (ServerRequestInfo_ptr ri)
   {
 #if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
-    getAndSetMySlot( ri, this->pi_current_, "receive_request_service_contexts", 0, 61 );
+    getAndSetMySlot( ri, this->pi_current_, "receive_request_service_contexts", 0, 61);
 #else
-    getAndSetMySlot( ri, this->pi_current_, "receive_request_service_contexts", 0, 0 );
+    getAndSetMySlot( ri, this->pi_current_, "receive_request_service_contexts", 0, 0);
 #endif /* TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1 */
   }
 
   virtual void
   receive_request (ServerRequestInfo_ptr ri)
   {
-    getAndSetMySlot( ri, this->pi_current_, "receive_request", 62, 62 );
+    getAndSetMySlot( ri, this->pi_current_, "receive_request", 62, 62);
   }
 
   virtual void
   send_reply (ServerRequestInfo_ptr ri)
   {
-    getAndSetMySlot( ri, this->pi_current_, "send_reply", 62, 62 );
+    getAndSetMySlot( ri, this->pi_current_, "send_reply", 62, 62);
   }
 
   virtual void
   send_exception (ServerRequestInfo_ptr ri)
   {
-    getAndSetMySlot( ri, this->pi_current_, "send_exception", 62, 62 );
+    getAndSetMySlot( ri, this->pi_current_, "send_exception", 62, 62);
   }
 
   virtual void
   send_other (ServerRequestInfo_ptr ri)
   {
-    getAndSetMySlot( ri, this->pi_current_, "send_other", 62, 62 );
+    getAndSetMySlot( ri, this->pi_current_, "send_other", 62, 62);
   }
 };
 
-
-//
 class ORB_Initializer : public virtual ORBInitializer,
                         public virtual ::CORBA::LocalObject
 {
diff --git a/TAO/tests/Sequence_Unit_Tests/run_test.pl b/TAO/tests/Sequence_Unit_Tests/run_test.pl
index bfe170454bc..264c52b73cc 100755
--- a/TAO/tests/Sequence_Unit_Tests/run_test.pl
+++ b/TAO/tests/Sequence_Unit_Tests/run_test.pl
@@ -27,8 +27,7 @@ my @testsToRun = qw(unbounded_value_sequence_ut
                Unbounded_Simple_Types
                Bounded_Simple_Types
                Unbounded_String
-               Bounded_String
-              );
+               Bounded_String);
 
 if ($^O ne "MSWin32") {
     push @testsToRun, qw(unbounded_octet_sequence_nocopy_ut);
diff --git a/TAO/tests/Stack_Recursion/Sender.cpp b/TAO/tests/Stack_Recursion/Sender.cpp
index 7616b16a34e..57c53074518 100644
--- a/TAO/tests/Stack_Recursion/Sender.cpp
+++ b/TAO/tests/Stack_Recursion/Sender.cpp
@@ -57,7 +57,6 @@ Sender::get_event_count ()
 void
 Sender::ping ()
 {
-  return;
 }
 
 void
diff --git a/TAO/tests/Transport_Cache_Manager/run_test.pl b/TAO/tests/Transport_Cache_Manager/run_test.pl
index 9053a8fb406..fbf93564456 100755
--- a/TAO/tests/Transport_Cache_Manager/run_test.pl
+++ b/TAO/tests/Transport_Cache_Manager/run_test.pl
@@ -11,8 +11,7 @@ use strict;
 my $final_result = 0;
 
 my @testsToRun = qw(Bug_3549_Regression
-               Bug_3558_Regression
-              );
+                    Bug_3558_Regression);
 
 foreach my $process (@testsToRun) {
 
diff --git a/TAO/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp
index b0fd70e1e59..8990d63b475 100644
--- a/TAO/tests/Xt_Stopwatch/client.cpp
+++ b/TAO/tests/Xt_Stopwatch/client.cpp
@@ -155,7 +155,6 @@ Client::stop_hook ()
     {
       ex._tao_print_exception (
         "Caught an exception in the stop button callback");
-      return;
     }
 }
 
diff --git a/TAO/tests/Xt_Stopwatch/timer.cpp b/TAO/tests/Xt_Stopwatch/timer.cpp
index af6f071c6b5..35b54df65f4 100644
--- a/TAO/tests/Xt_Stopwatch/timer.cpp
+++ b/TAO/tests/Xt_Stopwatch/timer.cpp
@@ -1,6 +1,5 @@
 #include "timer.h"
 
-
 Timer_imp::Timer_imp (XtAppContext &app,
                       CORBA::Long interval,
                       Stopwatch_display *stopwatch)
@@ -33,7 +32,7 @@ Timer_imp::start ()
   this->id_ = XtAppAddTimeOut (this->app_,
                                this->interval_,
                                &Timer_imp::tick_callback,
-                               (XtPointer) this );
+                               (XtPointer) this);
 }
 
 void
@@ -49,7 +48,7 @@ Timer_imp::stop ()
 CORBA::Float
 Timer_imp::elapsed_time()
 {
-    return ((CORBA::Float) counter_ * interval_ / 1000.0 );
+    return ((CORBA::Float) counter_ * interval_ / 1000.0);
 }
 
 void
@@ -61,7 +60,6 @@ Timer_imp::tick_callback (XtPointer client_data,
   obj->tick ();
 }
 
-
 void
 Timer_imp::tick ()
 {
@@ -83,5 +81,3 @@ Timer_imp::report_time (CORBA::Float time)
 {
   stopwatch_->set_time (time);
 }
-
-