Skip to content

Commit 0099c59

Browse files
jwillemsenjwillemsen
authored
Merge pull request #1962 from jwillemsen/jwi-layoutreturn
Layout/return changes
2 parents a07b960 + 99f6623 commit 0099c59

File tree

303 files changed

+903
-1332
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

303 files changed

+903
-1332
lines changed

‎TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -570,9 +570,8 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname,
570570
if( streamctrl_any.in() >>= streamctrl )
571571
{
572572
// Any still owns the pointer, so we duplicate it
573-
AVStreams::StreamCtrl::_duplicate( streamctrl );
574-
this->streamctrls_.bind (flowname,
575-
streamctrl);
573+
AVStreams::StreamCtrl::_duplicate( streamctrl);
574+
this->streamctrls_.bind (flowname, streamctrl);
576575
}
577576
}
578577

@@ -582,7 +581,7 @@ Connection_Manager::destroy (const ACE_CString &flowname)
582581
this->protocol_objects_.unbind (flowname);
583582
this->receivers_.unbind (flowname);
584583

585-
this->streamctrls_.unbind (flowname );
584+
this->streamctrls_.unbind (flowname);
586585
}
587586

588587
Connection_Manager::Receivers &

‎TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -394,10 +394,9 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname,
394394
{
395395
// the CORBA::Any_var owns the pointer, so we should
396396
// _duplicate it before passing it around
397-
AVStreams::StreamCtrl::_duplicate( streamctrl );
397+
AVStreams::StreamCtrl::_duplicate( streamctrl);
398398
this->streamctrls_.unbind(flowname);
399-
this->streamctrls_.bind (flowname,
400-
streamctrl);
399+
this->streamctrls_.bind (flowname, streamctrl);
401400
}
402401
}
403402

‎TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,9 @@ Client::init (int argc, ACE_TCHAR *argv[])
224224
this->parse_args (this->argc_, this->argv_);
225225

226226
ACE_NEW_RETURN (this->streamendpoint_a_,
227-
TAO_StreamEndPoint_A, -1 );
227+
TAO_StreamEndPoint_A, -1);
228228

229-
ACE_NEW_RETURN (this->fep_a_, FTP_Client_Producer, -1 );
229+
ACE_NEW_RETURN (this->fep_a_, FTP_Client_Producer, -1);
230230
this->flowname_ = "Data";
231231

232232
sep_a_ = this->streamendpoint_a_->_this();
@@ -291,7 +291,7 @@ Client::run ()
291291

292292

293293
CORBA::Object_var obj_b = this->orb_->string_to_object("corbaname:rir:#Server_StreamEndPoint_b");
294-
AVStreams::StreamEndPoint_B_var sep_b = AVStreams::StreamEndPoint_B::_narrow ( obj_b.in() );
294+
AVStreams::StreamEndPoint_B_var sep_b = AVStreams::StreamEndPoint_B::_narrow (obj_b.in());
295295

296296
CORBA::Boolean result =
297297
this->streamctrl_.bind (sep_a_.in(),

‎TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ Server::init (int argc,
123123

124124
fep_b_obj_ = this->fep_b_->_this ();
125125

126-
CORBA::String_var s1 = sep_b_->add_fep( fep_b_obj_.in() );
126+
CORBA::String_var s1 = sep_b_->add_fep( fep_b_obj_.in());
127127

128128
ACE_DEBUG ((LM_DEBUG, "(%N,%l) Added flowendpoint named: %C\n", s1.in() ));
129129

‎TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
178178
mmdevice->add_fdev (pong_fdev.in ());
179179
}
180180

181-
orb->run ( );
181+
orb->run ();
182182

183183
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
184184

‎TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,11 @@ Server::run ()
125125
CORBA::Boolean wp = orb->work_pending ();
126126
if (wp)
127127
{
128-
orb->perform_work( );
128+
orb->perform_work();
129129
}
130130
}
131131

132-
orb->shutdown( 1 );
132+
orb->shutdown(true);
133133
}
134134
catch (const CORBA::Exception& ex)
135135
{

‎TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,13 +187,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
187187

188188
while ( !done )
189189
{
190-
if ( orb->work_pending( ) )
190+
if ( orb->work_pending())
191191
{
192192
orb->perform_work ();
193193
}
194194
}
195195

196-
orb->shutdown( 1 );
196+
orb->shutdown(1);
197197
}
198198
catch (const CORBA::Exception& ex)
199199
{

‎TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ORB_Task::svc ()
2020
{
2121
CORBA::Object_var ncRef =
2222
orb_->string_to_object(
23-
"corbaloc:iiop:10.175.12.99:15025/NameService" );
23+
"corbaloc:iiop:10.175.12.99:15025/NameService");
2424

2525
CORBA::PolicyList policies;
2626

@@ -31,16 +31,15 @@ ORB_Task::svc ()
3131

3232
policies.length(1);
3333
policies[0] = orb_->create_policy(
34-
Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
35-
timeoutAny );
34+
Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, timeoutAny);
3635

3736
CORBA::Object_var object = ncRef->_set_policy_overrides(
3837
policies, CORBA::SET_OVERRIDE );
3938

4039
policies[0]->destroy();
4140

4241
CosNaming::NamingContext_var namingContext =
43-
CosNaming::NamingContext::_narrow( object.in() );
42+
CosNaming::NamingContext::_narrow( object.in());
4443
namingContext->_non_existent();
4544
}
4645
catch ( const CORBA::TRANSIENT&)

‎TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@ Server_Request_Interceptor::receive_request (
9090
"object_group_ref_version is %d\n", group_component.object_group_ref_version));
9191
}
9292
}
93-
94-
return;
9593
}
9694

9795
void

‎TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
161161

162162
// Get a ref to the IORManipulation object
163163
CORBA::Object_var IORM =
164-
orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
165-
0);
164+
orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0);
166165

167166
// Narrow
168167
iorm =

‎TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@ Hello::shutdown ()
1515
void
1616
Hello::ping ()
1717
{
18-
return;
1918
}
2019

2120
void
2221
Hello::throw_location_forward ()
2322
{
24-
return;
2523
}

‎TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,19 @@ class TAO249_ServerRequest_Interceptor2
4444
virtual void destroy ();
4545

4646
virtual void receive_request_service_contexts (
47-
PortableInterceptor::ServerRequestInfo_ptr ri
48-
);
47+
PortableInterceptor::ServerRequestInfo_ptr ri);
4948

5049
virtual void receive_request (
51-
PortableInterceptor::ServerRequestInfo_ptr ri
52-
);
50+
PortableInterceptor::ServerRequestInfo_ptr ri);
5351

5452
virtual void send_reply (
55-
PortableInterceptor::ServerRequestInfo_ptr ri
56-
);
53+
PortableInterceptor::ServerRequestInfo_ptr ri);
5754

5855
virtual void send_exception (
59-
PortableInterceptor::ServerRequestInfo_ptr ri
60-
);
56+
PortableInterceptor::ServerRequestInfo_ptr ri);
6157

6258
virtual void send_other (
63-
PortableInterceptor::ServerRequestInfo_ptr ri
64-
);
59+
PortableInterceptor::ServerRequestInfo_ptr ri);
6560
//@}
6661

6762
CORBA::Object_var server_iogr_;

‎TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
163163

164164
// Get a ref to the IORManipulation object
165165
CORBA::Object_var IORM =
166-
orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
167-
0);
166+
orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0);
168167

169168
// Narrow
170169
iorm =

‎TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ Hello::shutdown ()
1717
void
1818
Hello::ping ()
1919
{
20-
return;
2120
}
2221

2322
CORBA::Boolean

‎TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ int Client_Task::svc ()
128128

129129
if (!collocated_server->_is_collocated())
130130
{ // Collocation is disabled, just skip the test - it has no sense.
131-
ACE_DEBUG ((LM_ERROR, "Test has no sense, because collocation is disabled.\n") );
131+
ACE_DEBUG ((LM_ERROR, "Test has no sense, because collocation is disabled.\n"));
132132
}
133133
else
134134
{

‎TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Server_Task::svc ()
5555
ACE_OS::fprintf (output_file, "%s", ior.in ());
5656
ACE_OS::fclose (output_file);
5757

58-
ACE_DEBUG ((LM_ERROR, "(%P): Server's IOR was written to file: %s.\n", output_) );
58+
ACE_DEBUG ((LM_ERROR, "(%P): Server's IOR was written to file: %s.\n", output_));
5959
}
6060

6161
// Signal the main thread before we call orb->run ();

‎TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ TestImpl::TestImpl (CORBA::ORB_ptr orb)
99
// virtual
1010
void TestImpl::myMethod ()
1111
{
12-
ACE_DEBUG ((LM_ERROR, "(%P): TestImpl::myMethod called!.\n") );
12+
ACE_DEBUG ((LM_ERROR, "(%P): TestImpl::myMethod called!.\n"));
1313
}
1414

15-
1615
// virtual
1716
void TestImpl::shutdown ()
1817
{

‎TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
115115

116116
if (failed)
117117
{
118-
ACE_DEBUG ((LM_ERROR, "Test failed.\n") );
118+
ACE_DEBUG ((LM_ERROR, "Test failed.\n"));
119119
}
120120

121121
return 0;

‎TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,15 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
99
void
1010
Hello::shutdown ()
1111
{
12-
this->orb_->shutdown (0 );
12+
this->orb_->shutdown (0);
1313
}
1414

1515
void
1616
Hello::ping ()
1717
{
18-
return;
1918
}
2019

2120
void
2221
Hello::throw_location_forward ()
2322
{
24-
return;
2523
}

‎TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ TAO249_ServerRequest_Interceptor2::receive_request (
6060

6161

6262
IOP::ServiceContext_var sc =
63-
ri->get_request_service_context (IOP::FT_REQUEST
64-
);
63+
ri->get_request_service_context (IOP::FT_REQUEST);
6564

6665

6766
TAO_InputCDR cdr (reinterpret_cast <const char*>

‎TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,19 @@ class TAO249_ServerRequest_Interceptor2
4444
virtual void destroy ();
4545

4646
virtual void receive_request_service_contexts (
47-
PortableInterceptor::ServerRequestInfo_ptr ri
48-
);
47+
PortableInterceptor::ServerRequestInfo_ptr ri);
4948

5049
virtual void receive_request (
51-
PortableInterceptor::ServerRequestInfo_ptr ri
52-
);
50+
PortableInterceptor::ServerRequestInfo_ptr ri);
5351

5452
virtual void send_reply (
55-
PortableInterceptor::ServerRequestInfo_ptr ri
56-
);
53+
PortableInterceptor::ServerRequestInfo_ptr ri);
5754

5855
virtual void send_exception (
59-
PortableInterceptor::ServerRequestInfo_ptr ri
60-
);
56+
PortableInterceptor::ServerRequestInfo_ptr ri);
6157

6258
virtual void send_other (
63-
PortableInterceptor::ServerRequestInfo_ptr ri
64-
);
59+
PortableInterceptor::ServerRequestInfo_ptr ri);
6560
//@}
6661

6762
CORBA::Object_var server_iogr_;

‎TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
4848
return 1;
4949

5050
CORBA::Object_var tmp =
51-
orb->string_to_object(ior );
51+
orb->string_to_object(ior);
5252

5353

5454
Test::Hello_var hello =
55-
Test::Hello::_narrow(tmp.in () );
55+
Test::Hello::_narrow(tmp.in ());
5656

5757

5858
if (CORBA::is_nil (hello.in ()))

0 commit comments

Comments
 (0)