Skip to content

Commit 54f8952

Browse files
authored
Merge pull request InsightSoftwareConsortium#5685 from N-Dekker/nodiscard-non-const
STYLE: Add `[[nodiscard]]` to non-const data(), begin(), end(), etc.
2 parents ac0bff8 + 13e6533 commit 54f8952

File tree

7 files changed

+33
-33
lines changed

7 files changed

+33
-33
lines changed

Modules/Core/Common/include/itkFixedArray.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ class ITK_TEMPLATE_EXPORT FixedArray
324324
return m_InternalArray;
325325
}
326326

327-
ValueType *
327+
[[nodiscard]] ValueType *
328328
data()
329329
{
330330
return m_InternalArray;
@@ -370,7 +370,7 @@ class ITK_TEMPLATE_EXPORT FixedArray
370370
return m_InternalArray;
371371
}
372372

373-
constexpr iterator
373+
[[nodiscard]] constexpr iterator
374374
begin() noexcept
375375
{
376376
return m_InternalArray;
@@ -388,7 +388,7 @@ class ITK_TEMPLATE_EXPORT FixedArray
388388
return m_InternalArray + VLength;
389389
}
390390

391-
constexpr iterator
391+
[[nodiscard]] constexpr iterator
392392
end() noexcept
393393
{
394394
return m_InternalArray + VLength;
@@ -400,7 +400,7 @@ class ITK_TEMPLATE_EXPORT FixedArray
400400
return this->cend();
401401
}
402402

403-
reverse_iterator
403+
[[nodiscard]] reverse_iterator
404404
rbegin()
405405
{
406406
return reverse_iterator{ this->end() };
@@ -418,7 +418,7 @@ class ITK_TEMPLATE_EXPORT FixedArray
418418
return this->crbegin();
419419
}
420420

421-
reverse_iterator
421+
[[nodiscard]] reverse_iterator
422422
rend()
423423
{
424424
return reverse_iterator{ this->begin() };

Modules/Core/Common/include/itkIndex.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ struct ITK_TEMPLATE_EXPORT Index final
355355
return &m_InternalArray[0];
356356
}
357357

358-
constexpr iterator
358+
[[nodiscard]] constexpr iterator
359359
begin()
360360
{
361361
return &m_InternalArray[0];
@@ -373,7 +373,7 @@ struct ITK_TEMPLATE_EXPORT Index final
373373
return &m_InternalArray[VDimension];
374374
}
375375

376-
constexpr iterator
376+
[[nodiscard]] constexpr iterator
377377
end()
378378
{
379379
return &m_InternalArray[VDimension];
@@ -385,7 +385,7 @@ struct ITK_TEMPLATE_EXPORT Index final
385385
return &m_InternalArray[VDimension];
386386
}
387387

388-
reverse_iterator
388+
[[nodiscard]] reverse_iterator
389389
rbegin()
390390
{
391391
return reverse_iterator(end());
@@ -397,7 +397,7 @@ struct ITK_TEMPLATE_EXPORT Index final
397397
return const_reverse_iterator(end());
398398
}
399399

400-
reverse_iterator
400+
[[nodiscard]] reverse_iterator
401401
rend()
402402
{
403403
return reverse_iterator(begin());
@@ -453,7 +453,7 @@ struct ITK_TEMPLATE_EXPORT Index final
453453
return m_InternalArray[pos];
454454
}
455455

456-
constexpr reference
456+
[[nodiscard]] constexpr reference
457457
front()
458458
{
459459
return *begin();
@@ -465,7 +465,7 @@ struct ITK_TEMPLATE_EXPORT Index final
465465
return *begin();
466466
}
467467

468-
constexpr reference
468+
[[nodiscard]] constexpr reference
469469
back()
470470
{
471471
return VDimension ? *(end() - 1) : *end();
@@ -477,7 +477,7 @@ struct ITK_TEMPLATE_EXPORT Index final
477477
return VDimension ? *(end() - 1) : *end();
478478
}
479479

480-
IndexValueType *
480+
[[nodiscard]] IndexValueType *
481481
data()
482482
{
483483
return &m_InternalArray[0];

Modules/Core/Common/include/itkMatrix.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,14 +341,14 @@ class ITK_TEMPLATE_EXPORT Matrix
341341
}
342342

343343
/** Returns an iterator to the first element. */
344-
iterator
344+
[[nodiscard]] iterator
345345
begin()
346346
{
347347
return m_Matrix.begin();
348348
}
349349

350350
/** Returns an iterator just beyond the last element. */
351-
iterator
351+
[[nodiscard]] iterator
352352
end()
353353
{
354354
return m_Matrix.end();

Modules/Core/Common/include/itkNeighborhoodAllocator.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class NeighborhoodAllocator
120120

121121
/** STL-style iterator support for the memory buffer. */
122122
/** @ITKStartGrouping */
123-
iterator
123+
[[nodiscard]] iterator
124124
begin()
125125
{
126126
return m_Data.get();
@@ -130,7 +130,7 @@ class NeighborhoodAllocator
130130
{
131131
return m_Data.get();
132132
}
133-
iterator
133+
[[nodiscard]] iterator
134134
end()
135135
{
136136
return m_Data.get() + m_ElementCount;
@@ -173,7 +173,7 @@ class NeighborhoodAllocator
173173
}
174174
}
175175

176-
TPixel *
176+
[[nodiscard]] TPixel *
177177
data() noexcept
178178
{
179179
return m_Data.get();

Modules/Core/Common/include/itkOffset.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ struct ITK_TEMPLATE_EXPORT Offset final
304304
return &m_InternalArray[0];
305305
}
306306

307-
constexpr iterator
307+
[[nodiscard]] constexpr iterator
308308
begin()
309309
{
310310
return &m_InternalArray[0];
@@ -322,7 +322,7 @@ struct ITK_TEMPLATE_EXPORT Offset final
322322
return &m_InternalArray[VDimension];
323323
}
324324

325-
constexpr iterator
325+
[[nodiscard]] constexpr iterator
326326
end()
327327
{
328328
return &m_InternalArray[VDimension];
@@ -334,7 +334,7 @@ struct ITK_TEMPLATE_EXPORT Offset final
334334
return &m_InternalArray[VDimension];
335335
}
336336

337-
reverse_iterator
337+
[[nodiscard]] reverse_iterator
338338
rbegin()
339339
{
340340
return reverse_iterator(end());
@@ -346,7 +346,7 @@ struct ITK_TEMPLATE_EXPORT Offset final
346346
return const_reverse_iterator(end());
347347
}
348348

349-
reverse_iterator
349+
[[nodiscard]] reverse_iterator
350350
rend()
351351
{
352352
return reverse_iterator(begin());
@@ -402,7 +402,7 @@ struct ITK_TEMPLATE_EXPORT Offset final
402402
return m_InternalArray[pos];
403403
}
404404

405-
constexpr reference
405+
[[nodiscard]] constexpr reference
406406
front()
407407
{
408408
return *begin();
@@ -414,7 +414,7 @@ struct ITK_TEMPLATE_EXPORT Offset final
414414
return *begin();
415415
}
416416

417-
constexpr reference
417+
[[nodiscard]] constexpr reference
418418
back()
419419
{
420420
return VDimension ? *(end() - 1) : *end();
@@ -426,7 +426,7 @@ struct ITK_TEMPLATE_EXPORT Offset final
426426
return VDimension ? *(end() - 1) : *end();
427427
}
428428

429-
OffsetValueType *
429+
[[nodiscard]] OffsetValueType *
430430
data()
431431
{
432432
return &m_InternalArray[0];

Modules/Core/Common/include/itkSize.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ struct ITK_TEMPLATE_EXPORT Size final
279279
return &m_InternalArray[0];
280280
}
281281

282-
constexpr iterator
282+
[[nodiscard]] constexpr iterator
283283
begin()
284284
{
285285
return &m_InternalArray[0];
@@ -297,7 +297,7 @@ struct ITK_TEMPLATE_EXPORT Size final
297297
return &m_InternalArray[VDimension];
298298
}
299299

300-
constexpr iterator
300+
[[nodiscard]] constexpr iterator
301301
end()
302302
{
303303
return &m_InternalArray[VDimension];
@@ -309,7 +309,7 @@ struct ITK_TEMPLATE_EXPORT Size final
309309
return &m_InternalArray[VDimension];
310310
}
311311

312-
reverse_iterator
312+
[[nodiscard]] reverse_iterator
313313
rbegin()
314314
{
315315
return reverse_iterator(end());
@@ -321,7 +321,7 @@ struct ITK_TEMPLATE_EXPORT Size final
321321
return const_reverse_iterator(end());
322322
}
323323

324-
reverse_iterator
324+
[[nodiscard]] reverse_iterator
325325
rend()
326326
{
327327
return reverse_iterator(begin());
@@ -377,7 +377,7 @@ struct ITK_TEMPLATE_EXPORT Size final
377377
return m_InternalArray[pos];
378378
}
379379

380-
constexpr reference
380+
[[nodiscard]] constexpr reference
381381
front()
382382
{
383383
return *begin();
@@ -389,7 +389,7 @@ struct ITK_TEMPLATE_EXPORT Size final
389389
return *begin();
390390
}
391391

392-
constexpr reference
392+
[[nodiscard]] constexpr reference
393393
back()
394394
{
395395
return VDimension ? *(end() - 1) : *end();
@@ -401,7 +401,7 @@ struct ITK_TEMPLATE_EXPORT Size final
401401
return VDimension ? *(end() - 1) : *end();
402402
}
403403

404-
SizeValueType *
404+
[[nodiscard]] SizeValueType *
405405
data()
406406
{
407407
return &m_InternalArray[0];

Modules/IO/IPL/include/itkIPLFileNameList.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,13 @@ class ITKIOIPL_EXPORT IPLFileNameList
139139

140140
virtual ~IPLFileNameList();
141141

142-
IteratorType
142+
[[nodiscard]] IteratorType
143143
begin()
144144
{
145145
return m_List.begin();
146146
}
147147

148-
IteratorType
148+
[[nodiscard]] IteratorType
149149
end()
150150
{
151151
return m_List.end();

0 commit comments

Comments
 (0)