Skip to content

Commit 727fb1f

Browse files
jwillemsenjwillemsen
committed
Layout changes
1 parent d7b7a7c commit 727fb1f

33 files changed

Lines changed: 82 additions & 176 deletions

File tree

‎TAO/tests/Big_AMI/client.cpp‎

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

214214
poa_var->destroy (1, // ethernalize objects
215-
0 // wait for completion
216-
);
215+
0); // wait for completion
217216

218217
orb->destroy ();
219218
}

‎TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ Echo_Caller::start_task(Test::Echo_ptr client)
2121
}
2222

2323
ACE_Thread_Manager::instance ()->wait ();
24-
25-
return;
2624
}
2725

2826
void

‎TAO/tests/Bug_1254_Regression/BlobServer.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ class BlobServerImpl
1515
// = The skeleton methods
1616
virtual void test(
1717
BlobType1& blob1,
18-
BlobType2& blob2
19-
);
18+
BlobType2& blob2);
2019
virtual void shutdown ();
2120

2221
private:

‎TAO/tests/Bug_1482_Regression/Reply_Handler.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Reply_Handler::Reply_Handler (CORBA::ORB_ptr o)
88
void
99
Reply_Handler::next_prime (CORBA::ULong)
1010
{
11-
return;
1211
}
1312

1413
void

‎TAO/tests/Bug_1676_Regression/client.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,5 @@ void get_stringList2(Test::Hello_var hello)
132132
{
133133
ex._tao_print_exception ("get_stringList2");
134134
}
135-
136-
137-
return;
135+
return;
138136
}

‎TAO/tests/Bug_2084_Regression/Client_Task.cpp‎

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

7171
ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Client starting\n"));
7272

73-
evNode->registerHello( hello_servant.in() );
73+
evNode->registerHello( hello_servant.in());
7474

7575
evNode->shutdown ();
7676
}

‎TAO/tests/Bug_2122_Regression/Test.idl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ module Test
99

1010
interface Foo
1111
{
12-
void op1( in MyStringType s );
13-
void op2( in MyOtherStringType s );
12+
void op1( in MyStringType s);
13+
void op2( in MyOtherStringType s);
1414
};
1515
};
1616

@@ -22,7 +22,7 @@ module Foo
2222

2323
interface Whatever
2424
{
25-
void someOp( in MyString s );
25+
void someOp( in MyString s);
2626
};
2727
};
2828

@@ -32,7 +32,7 @@ module Foo
3232

3333
interface WhoCares
3434
{
35-
void someOp( in MyString s );
35+
void someOp( in MyString s);
3636
};
3737
};
3838

@@ -42,7 +42,7 @@ module Foo
4242

4343
interface WhoCares
4444
{
45-
void someOp( in MyString s );
45+
void someOp( in MyString s);
4646
};
4747
};
4848
};

‎TAO/tests/Bug_2124_Regression/Test.idl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ module Test
99

1010
interface Foo
1111
{
12-
void op1( in MyString s );
13-
void op2( in OtherString s );
12+
void op1( in MyString s);
13+
void op2( in OtherString s);
1414
};
1515
};
1616

‎TAO/tests/Bug_2188_Regression/broken_i.h‎

Lines changed: 37 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -76,201 +76,146 @@ class ArrayTest_i : public virtual POA_ArrayTest
7676
::LongArray_slice * longArrayOp (
7777
const ::LongArray p1,
7878
::LongArray p2,
79-
::LongArray_out p3
80-
);
79+
::LongArray_out p3);
8180

8281
virtual
8382
::StringArray_slice * stringArrayOp (
8483
const ::StringArray p1,
8584
::StringArray p2,
86-
::StringArray_out p3
87-
);
85+
::StringArray_out p3);
8886

8987
virtual
9088
::ShortArray_slice * shortArrayOp (
9189
const ::ShortArray p1,
9290
::ShortArray p2,
93-
::ShortArray_out p3
94-
);
91+
::ShortArray_out p3);
9592

9693
virtual
9794
::UShortArray_slice * ushortArrayOp (
9895
const ::UShortArray p1,
9996
::UShortArray p2,
100-
::UShortArray_out p3
101-
);
97+
::UShortArray_out p3);
10298

10399
virtual
104100
::CharArray_slice * charArrayOp (
105101
const ::CharArray p1,
106102
::CharArray p2,
107-
::CharArray_out p3
108-
);
103+
::CharArray_out p3);
109104

110105
virtual
111106
::OctetArray_slice * octetArrayOp (
112107
const ::OctetArray p1,
113108
::OctetArray p2,
114-
::OctetArray_out p3
115-
);
109+
::OctetArray_out p3);
116110

117111
virtual
118112
::DoubleArray_slice * doubleArrayOp (
119113
const ::DoubleArray p1,
120114
::DoubleArray p2,
121-
::DoubleArray_out p3
122-
);
115+
::DoubleArray_out p3);
123116

124117
virtual
125-
::LongArray_slice * a_longArray (
126-
127-
);
118+
::LongArray_slice * a_longArray ();
128119

129120
virtual
130121
void a_longArray (
131-
const ::LongArray a_longArray
132-
);
122+
const ::LongArray a_longArray);
133123

134124
virtual
135-
::ULongArray_slice * a_ulongArray (
136-
137-
);
125+
::ULongArray_slice * a_ulongArray ();
138126

139127
virtual
140128
void a_ulongArray (
141-
const ::ULongArray a_ulongArray
142-
);
129+
const ::ULongArray a_ulongArray);
143130

144131
virtual
145-
::StringArray_slice * a_stringArray (
146-
147-
);
132+
::StringArray_slice * a_stringArray ();
148133

149134
virtual
150135
void a_stringArray (
151-
const ::StringArray a_stringArray
152-
);
136+
const ::StringArray a_stringArray);
153137

154138
virtual
155-
::ShortArray_slice * a_shortArray (
156-
157-
);
139+
::ShortArray_slice * a_shortArray ();
158140

159141
virtual
160142
void a_shortArray (
161-
const ::ShortArray a_shortArray
162-
);
143+
const ::ShortArray a_shortArray);
163144

164145
virtual
165-
::UShortArray_slice * a_ushortArray (
166-
167-
);
146+
::UShortArray_slice * a_ushortArray ();
168147

169148
virtual
170149
void a_ushortArray (
171-
const ::UShortArray a_ushortArray
172-
);
150+
const ::UShortArray a_ushortArray);
173151

174152
virtual
175-
CORBA::Char a_char (
176-
177-
);
153+
CORBA::Char a_char ();
178154

179155
virtual
180-
void a_char (
181-
::CORBA::Char a_char
182-
);
156+
void a_char (::CORBA::Char a_char);
183157

184158
virtual
185-
::CharArray_slice * a_charArray (
186-
187-
);
159+
::CharArray_slice * a_charArray ();
188160

189161
virtual
190-
void a_charArray (
191-
const ::CharArray a_charArray
192-
);
162+
void a_charArray (const ::CharArray a_charArray);
193163

194164
virtual
195-
::OctetArray_slice * a_octetArray (
196-
197-
);
165+
::OctetArray_slice * a_octetArray ();
198166

199167
virtual
200168
void a_octetArray (
201-
const ::OctetArray a_octetArray
202-
);
169+
const ::OctetArray a_octetArray);
203170

204171
virtual
205-
::DoubleArray_slice * a_doubleArray (
206-
207-
);
172+
::DoubleArray_slice * a_doubleArray ();
208173

209174
virtual
210175
void a_doubleArray (
211-
const ::DoubleArray a_doubleArray
212-
);
176+
const ::DoubleArray a_doubleArray);
213177

214178
virtual
215-
::FloatArray_slice * a_floatArray (
216-
217-
);
179+
::FloatArray_slice * a_floatArray ();
218180

219181
virtual
220182
void a_floatArray (
221-
const ::FloatArray a_floatArray
222-
);
183+
const ::FloatArray a_floatArray);
223184

224185
virtual
225-
::BucketArray_slice * a_bucketArray (
226-
227-
);
186+
::BucketArray_slice * a_bucketArray ();
228187

229188
virtual
230189
void a_bucketArray (
231-
const ::BucketArray a_bucketArray
232-
);
190+
const ::BucketArray a_bucketArray);
233191

234192
virtual
235-
::AccountArray_slice * a_accountArray (
236-
237-
);
193+
::AccountArray_slice * a_accountArray ();
238194

239195
virtual
240196
void a_accountArray (
241-
const ::AccountArray a_accountArray
242-
);
197+
const ::AccountArray a_accountArray);
243198

244199
virtual
245-
::BooleanArray_slice * a_booleanArray (
246-
247-
);
200+
::BooleanArray_slice * a_booleanArray ();
248201

249202
virtual
250203
void a_booleanArray (
251-
const ::BooleanArray a_booleanArray
252-
);
204+
const ::BooleanArray a_booleanArray);
253205

254206
virtual
255-
::LongArrayArray_slice * a_longArrayArray (
256-
257-
);
207+
::LongArrayArray_slice * a_longArrayArray ();
258208

259209
virtual
260210
void a_longArrayArray (
261-
const ::LongArrayArray a_longArrayArray
262-
);
211+
const ::LongArrayArray a_longArrayArray);
263212

264213
virtual
265-
::MyEnumArray_slice * a_myEnumArray (
266-
267-
);
214+
::MyEnumArray_slice * a_myEnumArray ();
268215

269216
virtual
270217
void a_myEnumArray (
271-
const ::MyEnumArray a_myEnumArray
272-
);
218+
const ::MyEnumArray a_myEnumArray);
273219
};
274220

275-
276221
#endif /* BROKEN_I_H_ */

‎TAO/tests/Bug_3171_Regression/server.cpp‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ initORB(int threadID)
161161
{
162162
ACE_DEBUG ((LM_DEBUG, "Creating ORB initializer\n"));
163163
PortableInterceptor::ORBInitializer_var rCOI(
164-
new MyORBinitializer( ORBid ) );
165-
PortableInterceptor::register_orb_initializer( rCOI.in() );
164+
new MyORBinitializer(ORBid));
165+
PortableInterceptor::register_orb_initializer( rCOI.in());
166166
}
167167

168168
ACE_DEBUG ((LM_DEBUG, "Creating TAO_ORB_Manager\n"));
@@ -190,12 +190,10 @@ initORB(int threadID)
190190
CORBA::Any any;
191191
any <<= connectionTimeout;
192192

193-
CORBA::ULong l( policyList.length() );
194-
policyList.length( l+1 );
193+
CORBA::ULong l( policyList.length());
194+
policyList.length(l+1);
195195

196-
policyList[l] = orb->create_policy(
197-
TAO::CONNECTION_TIMEOUT_POLICY_TYPE,
198-
any );
196+
policyList[l] = orb->create_policy(TAO::CONNECTION_TIMEOUT_POLICY_TYPE, any);
199197

200198
ACE_DEBUG ((LM_DEBUG, "Connection timeout policy set for ORB \"%C\"\n",
201199
ORBid));

0 commit comments

Comments
 (0)