Merge pull request #1962 from jwillemsen/jwi-layoutreturn

Layout/return changes

Author: jwillemsen

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 &

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);
   }
 }
 

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(),

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() ));
 

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"));
 

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)
     {

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)
     {

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,16 +31,15 @@ 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 );
 
     policies[0]->destroy();
 
     CosNaming::NamingContext_var namingContext =
-      CosNaming::NamingContext::_narrow( object.in() );
+      CosNaming::NamingContext::_narrow( object.in());
     namingContext->_non_existent();
   }
   catch ( const CORBA::TRANSIENT&)

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

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 =