Merge pull request #1962 from jwillemsen/jwi-layoutreturn

Layout/return changes

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 =

TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp

@@ -15,11 +15,9 @@ Hello::shutdown ()
 void
 Hello::ping ()
 {
-  return;
 }
 
 void
 Hello::throw_location_forward ()
 {
-  return;
 }

TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h

@@ -44,24 +44,19 @@ class TAO249_ServerRequest_Interceptor2
   virtual void destroy ();
 
   virtual void receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    );
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
   //@}
 
   CORBA::Object_var server_iogr_;

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 =

TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp

@@ -17,7 +17,6 @@ Hello::shutdown ()
 void
 Hello::ping ()
 {
-  return;
 }
 
 CORBA::Boolean

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
         {

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

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

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;

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

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*>

TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h

@@ -44,24 +44,19 @@ class TAO249_ServerRequest_Interceptor2
   virtual void destroy ();
 
   virtual void receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    );
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
   //@}
 
   CORBA::Object_var server_iogr_;

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