Skip to content

Commit b86aaf6

Browse files
jwillemsenjwillemsen
authored
Merge pull request #2535 from jwillemsen/jwi-nullptr3
clang-tidy C++11 modernization changes
2 parents 23aa678 + 768c56d commit b86aaf6

421 files changed

Lines changed: 3093 additions & 3353 deletions

File tree

Some content is hidden

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

‎ACE/ace/ACE.h‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ namespace ACE
148148
void *buf,
149149
size_t len,
150150
int flags,
151-
const ACE_Time_Value *timeout = 0);
151+
const ACE_Time_Value *timeout = nullptr);
152152

153153
#if defined (ACE_HAS_TLI)
154154

@@ -163,28 +163,28 @@ namespace ACE
163163
extern ACE_Export ssize_t recv (ACE_HANDLE handle,
164164
void *buf,
165165
size_t len,
166-
const ACE_Time_Value *timeout = 0);
166+
const ACE_Time_Value *timeout = nullptr);
167167

168168
extern ACE_Export ssize_t recvmsg (ACE_HANDLE handle,
169169
struct msghdr *msg,
170170
int flags,
171-
const ACE_Time_Value *timeout = 0);
171+
const ACE_Time_Value *timeout = nullptr);
172172

173173
extern ACE_Export ssize_t recvfrom (ACE_HANDLE handle,
174174
char *buf,
175175
int len,
176176
int flags,
177177
struct sockaddr *addr,
178178
int *addrlen,
179-
const ACE_Time_Value *timeout = 0);
179+
const ACE_Time_Value *timeout = nullptr);
180180

181181
ACE_NAMESPACE_INLINE_FUNCTION
182182
ssize_t recv_n (ACE_HANDLE handle,
183183
void *buf,
184184
size_t len,
185185
int flags,
186-
const ACE_Time_Value *timeout = 0,
187-
size_t *bytes_transferred = 0);
186+
const ACE_Time_Value *timeout = nullptr,
187+
size_t *bytes_transferred = nullptr);
188188

189189
#if defined (ACE_HAS_TLI)
190190

@@ -202,8 +202,8 @@ namespace ACE
202202
ssize_t recv_n (ACE_HANDLE handle,
203203
void *buf,
204204
size_t len,
205-
const ACE_Time_Value *timeout = 0,
206-
size_t *bytes_transferred = 0);
205+
const ACE_Time_Value *timeout = nullptr,
206+
size_t *bytes_transferred = nullptr);
207207

208208
/// Receive into a variable number of pieces.
209209
/**
@@ -222,25 +222,25 @@ namespace ACE
222222
extern ACE_Export ssize_t recvv (ACE_HANDLE handle,
223223
iovec *iov,
224224
int iovcnt,
225-
const ACE_Time_Value *timeout = 0);
225+
const ACE_Time_Value *timeout = nullptr);
226226

227227
ACE_NAMESPACE_INLINE_FUNCTION
228228
ssize_t recvv_n (ACE_HANDLE handle,
229229
iovec *iov,
230230
int iovcnt,
231-
const ACE_Time_Value *timeout = 0,
232-
size_t *bytes_transferred = 0);
231+
const ACE_Time_Value *timeout = nullptr,
232+
size_t *bytes_transferred = nullptr);
233233

234234
extern ACE_Export ssize_t recv_n (ACE_HANDLE handle,
235235
ACE_Message_Block *message_block,
236-
const ACE_Time_Value *timeout = 0,
237-
size_t *bytes_transferred = 0);
236+
const ACE_Time_Value *timeout = nullptr,
237+
size_t *bytes_transferred = nullptr);
238238

239239
extern ACE_Export ssize_t send (ACE_HANDLE handle,
240240
const void *buf,
241241
size_t len,
242242
int flags,
243-
const ACE_Time_Value *timeout = 0);
243+
const ACE_Time_Value *timeout = nullptr);
244244

245245
#if defined (ACE_HAS_TLI)
246246

@@ -255,28 +255,28 @@ namespace ACE
255255
extern ACE_Export ssize_t send (ACE_HANDLE handle,
256256
const void *buf,
257257
size_t len,
258-
const ACE_Time_Value *timeout = 0);
258+
const ACE_Time_Value *timeout = nullptr);
259259

260260
extern ACE_Export ssize_t sendmsg (ACE_HANDLE handle,
261261
const struct msghdr *msg,
262262
int flags,
263-
const ACE_Time_Value *timeout = 0);
263+
const ACE_Time_Value *timeout = nullptr);
264264

265265
extern ACE_Export ssize_t sendto (ACE_HANDLE handle,
266266
const char *buf,
267267
int len,
268268
int flags,
269269
const struct sockaddr *addr,
270270
int addrlen,
271-
const ACE_Time_Value *timeout = 0);
271+
const ACE_Time_Value *timeout = nullptr);
272272

273273
ACE_NAMESPACE_INLINE_FUNCTION
274274
ssize_t send_n (ACE_HANDLE handle,
275275
const void *buf,
276276
size_t len,
277277
int flags,
278-
const ACE_Time_Value *timeout = 0,
279-
size_t *bytes_transferred = 0);
278+
const ACE_Time_Value *timeout = nullptr,
279+
size_t *bytes_transferred = nullptr);
280280

281281
#if defined (ACE_HAS_TLI)
282282

@@ -294,8 +294,8 @@ namespace ACE
294294
ssize_t send_n (ACE_HANDLE handle,
295295
const void *buf,
296296
size_t len,
297-
const ACE_Time_Value *timeout = 0,
298-
size_t *bytes_transferred = 0);
297+
const ACE_Time_Value *timeout = nullptr,
298+
size_t *bytes_transferred = nullptr);
299299

300300
/// Varargs variant.
301301
#if !defined (ACE_LACKS_VA_FUNCTIONS)
@@ -305,53 +305,53 @@ namespace ACE
305305
extern ACE_Export ssize_t sendv (ACE_HANDLE handle,
306306
const iovec *iov,
307307
int iovcnt,
308-
const ACE_Time_Value *timeout = 0);
308+
const ACE_Time_Value *timeout = nullptr);
309309

310310
ACE_NAMESPACE_INLINE_FUNCTION
311311
ssize_t sendv_n (ACE_HANDLE handle,
312312
const iovec *iov,
313313
int iovcnt,
314-
const ACE_Time_Value *timeout = 0,
315-
size_t *bytes_transferred = 0);
314+
const ACE_Time_Value *timeout = nullptr,
315+
size_t *bytes_transferred = nullptr);
316316

317317
/// Send all the @a message_blocks chained through their @c next and
318318
/// @c cont pointers. This call uses the underlying OS gather-write
319319
/// operation to reduce the domain-crossing penalty.
320320
extern ACE_Export ssize_t send_n (ACE_HANDLE handle,
321321
const ACE_Message_Block *message_block,
322-
const ACE_Time_Value *timeout = 0,
323-
size_t *bytes_transferred = 0);
322+
const ACE_Time_Value *timeout = nullptr,
323+
size_t *bytes_transferred = nullptr);
324324

325325
// = File system I/O functions (these don't support timeouts).
326326

327327
ACE_NAMESPACE_INLINE_FUNCTION
328328
ssize_t read_n (ACE_HANDLE handle,
329329
void *buf,
330330
size_t len,
331-
size_t *bytes_transferred = 0);
331+
size_t *bytes_transferred = nullptr);
332332

333333
ACE_NAMESPACE_INLINE_FUNCTION
334334
ssize_t write_n (ACE_HANDLE handle,
335335
const void *buf,
336336
size_t len,
337-
size_t *bytes_transferred = 0);
337+
size_t *bytes_transferred = nullptr);
338338

339339
/// Write all the @a message_blocks chained through their @c next
340340
/// and @c cont pointers. This call uses the underlying OS
341341
/// gather-write operation to reduce the domain-crossing penalty.
342342
extern ACE_Export ssize_t write_n (ACE_HANDLE handle,
343343
const ACE_Message_Block *message_block,
344-
size_t *bytes_transferred = 0);
344+
size_t *bytes_transferred = nullptr);
345345

346346
extern ACE_Export ssize_t readv_n (ACE_HANDLE handle,
347347
iovec *iov,
348348
int iovcnt,
349-
size_t *bytes_transferred = 0);
349+
size_t *bytes_transferred = nullptr);
350350

351351
extern ACE_Export ssize_t writev_n (ACE_HANDLE handle,
352352
const iovec *iov,
353353
int iovcnt,
354-
size_t *bytes_transferred = 0);
354+
size_t *bytes_transferred = nullptr);
355355
//@}
356356

357357
/**
@@ -686,15 +686,15 @@ namespace ACE
686686
/// Wrapper facade for @c select that uses @c ACE_Handle_Sets.
687687
extern ACE_Export int select (int width,
688688
ACE_Handle_Set *readfds,
689-
ACE_Handle_Set *writefds = 0,
690-
ACE_Handle_Set *exceptfds = 0,
691-
const ACE_Time_Value *timeout = 0);
689+
ACE_Handle_Set *writefds = nullptr,
690+
ACE_Handle_Set *exceptfds = nullptr,
691+
const ACE_Time_Value *timeout = nullptr);
692692

693693
/// Wrapper facade for the most common use of @c select that uses
694694
/// @c ACE_Handle_Sets.
695695
extern ACE_Export int select (int width,
696696
ACE_Handle_Set &readfds,
697-
const ACE_Time_Value *timeout = 0);
697+
const ACE_Time_Value *timeout = nullptr);
698698

699699
/// Timed wait for handle to get read ready.
700700
/// @retval -1 for error

‎ACE/ace/ARGV.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,8 @@ class ACE_ARGV_T
310310
ACE_Unbounded_Queue<ACE_ARGV_Queue_Entry_T<CHAR_TYPE> > queue_;
311311
};
312312

313-
typedef ACE_ARGV_Queue_Entry_T<ACE_TCHAR> ACE_ARGV_Queue_Entry;
314-
typedef ACE_ARGV_T<ACE_TCHAR> ACE_ARGV;
313+
using ACE_ARGV_Queue_Entry = ACE_ARGV_Queue_Entry_T<ACE_TCHAR>;
314+
using ACE_ARGV = ACE_ARGV_T<ACE_TCHAR>;
315315

316316
// Close versioned namespace, if enabled by the user.
317317
ACE_END_VERSIONED_NAMESPACE_DECL

‎ACE/ace/Abstract_Timer_Queue.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ class ACE_Abstract_Timer_Queue
201201
virtual ACE_Time_Value current_time() = 0;
202202

203203
/// Type of Iterator.
204-
typedef ACE_Timer_Queue_Iterator_T<TYPE> ITERATOR;
204+
using ITERATOR = ACE_Timer_Queue_Iterator_T<TYPE>;
205205

206206
/// Returns a pointer to this ACE_Timer_Queue's iterator.
207207
virtual ITERATOR & iter () = 0;

0 commit comments

Comments
 (0)