Skip to content

Commit 3d8393b

Browse files
N-Dekkerhjmjohnson
N-Dekker
authored and
hjmjohnson
committed
STYLE: Remove accidentally duplicated [[nodiscard]] attributes
Replaced `[[nodiscard]] [[nodiscard]]` with `[[nodiscard]]`. Follow-up to pull request #5404 commit 85aa7bd "STYLE: Use C++17 [[nodiscard]] attribute"
1 parent 0d05705 commit 3d8393b

File tree

5 files changed

+39
-39
lines changed

5 files changed

+39
-39
lines changed

‎Modules/Core/Common/include/itkSymmetricEigenAnalysis.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ class ITK_TEMPLATE_EXPORT SymmetricEigenAnalysis
510510
* `TMatrix` (which is the case when `TMatrix` = `itk::Array2D`).
511511
*/
512512
template <typename QMatrix = TMatrix>
513-
[[nodiscard]] [[nodiscard]] auto
513+
[[nodiscard]] auto
514514
GetMatrixValueType(bool) const -> typename QMatrix::element_type
515515
{
516516
return QMatrix::element_type();

‎Modules/Core/QuadEdgeMesh/include/itkGeometricalQuadEdge.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -176,38 +176,38 @@ class ITK_TEMPLATE_EXPORT GeometricalQuadEdge : public QuadEdge
176176
/** @ITKStartGrouping */
177177
// ORIENTATION_NOTE: this definition of GetLeft (or GetRight)
178178
// implicitly assumes that the Onext order is counter-clockwise !
179-
[[nodiscard]] [[nodiscard]] inline const OriginRefType
179+
[[nodiscard]] inline const OriginRefType
180180
GetOrigin() const
181181
{
182182
return (m_Origin);
183183
}
184-
[[nodiscard]] [[nodiscard]] inline const OriginRefType
184+
[[nodiscard]] inline const OriginRefType
185185
GetDestination() const
186186
{
187187
return (GetSym()->GetOrigin());
188188
}
189-
[[nodiscard]] [[nodiscard]] inline const DualOriginRefType
189+
[[nodiscard]] inline const DualOriginRefType
190190
GetRight() const
191191
{
192192
return (GetRot()->GetOrigin());
193193
}
194-
[[nodiscard]] [[nodiscard]] inline const DualOriginRefType
194+
[[nodiscard]] inline const DualOriginRefType
195195
GetLeft() const
196196
{
197197
return (GetInvRot()->GetOrigin());
198198
}
199199
/** @ITKEndGrouping */
200200
/** Boolean accessors. */
201-
[[nodiscard]] [[nodiscard]] bool
201+
[[nodiscard]] bool
202202
IsOriginSet() const;
203203

204-
[[nodiscard]] [[nodiscard]] bool
204+
[[nodiscard]] bool
205205
IsDestinationSet() const;
206206

207-
[[nodiscard]] [[nodiscard]] bool
207+
[[nodiscard]] bool
208208
IsRightSet() const;
209209

210-
[[nodiscard]] [[nodiscard]] bool
210+
[[nodiscard]] bool
211211
IsLeftSet() const;
212212

213213
/** Extra data set methods. */
@@ -297,13 +297,13 @@ class ITK_TEMPLATE_EXPORT GeometricalQuadEdge : public QuadEdge
297297
* @return Returns true when "this" has faces set on both sides.
298298
* Return false otherwise.
299299
*/
300-
[[nodiscard]] [[nodiscard]] inline bool
300+
[[nodiscard]] inline bool
301301
IsInternal() const
302302
{
303303
return (this->IsLeftSet() && this->IsRightSet());
304304
}
305305

306-
[[nodiscard]] [[nodiscard]] bool
306+
[[nodiscard]] bool
307307
IsOriginInternal() const;
308308

309309
bool

‎Modules/Core/QuadEdgeMesh/include/itkQuadEdge.h‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -200,12 +200,12 @@ class ITKQuadEdgeMesh_EXPORT QuadEdge
200200
{
201201
return this->m_Rot;
202202
}
203-
[[nodiscard]] [[nodiscard]] inline const Self *
203+
[[nodiscard]] inline const Self *
204204
GetOnext() const
205205
{
206206
return this->m_Onext;
207207
}
208-
[[nodiscard]] [[nodiscard]] inline const Self *
208+
[[nodiscard]] inline const Self *
209209
GetRot() const
210210
{
211211
return this->m_Rot;
@@ -261,7 +261,7 @@ class ITKQuadEdgeMesh_EXPORT QuadEdge
261261
return nullptr;
262262
}
263263

264-
[[nodiscard]] [[nodiscard]] inline const Self *
264+
[[nodiscard]] inline const Self *
265265
GetSym() const
266266
{
267267
if (this->m_Rot)
@@ -277,7 +277,7 @@ class ITKQuadEdgeMesh_EXPORT QuadEdge
277277
Self *
278278
GetLnext();
279279

280-
[[nodiscard]] [[nodiscard]] const Self *
280+
[[nodiscard]] const Self *
281281
GetLnext() const;
282282

283283
/** Returns next edge with same Right face. The first edge
@@ -286,7 +286,7 @@ class ITKQuadEdgeMesh_EXPORT QuadEdge
286286
Self *
287287
GetRnext();
288288

289-
[[nodiscard]] [[nodiscard]] const Self *
289+
[[nodiscard]] const Self *
290290
GetRnext() const;
291291

292292
/** Returns next edge with same right face and same Destination. The
@@ -295,15 +295,15 @@ class ITKQuadEdgeMesh_EXPORT QuadEdge
295295
Self *
296296
GetDnext();
297297

298-
[[nodiscard]] [[nodiscard]] const Self *
298+
[[nodiscard]] const Self *
299299
GetDnext() const;
300300

301301
/** Returns previous edge with same Origin
302302
* (see "Accessing adjacent edges"). */
303303
Self *
304304
GetOprev();
305305

306-
[[nodiscard]] [[nodiscard]] const Self *
306+
[[nodiscard]] const Self *
307307
GetOprev() const;
308308

309309
/** Returns previous edge with same Left face. The first edge
@@ -312,7 +312,7 @@ class ITKQuadEdgeMesh_EXPORT QuadEdge
312312
Self *
313313
GetLprev();
314314

315-
[[nodiscard]] [[nodiscard]] const Self *
315+
[[nodiscard]] const Self *
316316
GetLprev() const;
317317

318318
/** Returns the previous edge with same Right face. The first edge
@@ -321,7 +321,7 @@ class ITKQuadEdgeMesh_EXPORT QuadEdge
321321
Self *
322322
GetRprev();
323323

324-
[[nodiscard]] [[nodiscard]] const Self *
324+
[[nodiscard]] const Self *
325325
GetRprev() const;
326326

327327
/** Returns the previous edge with same Right face and same Destination.
@@ -330,7 +330,7 @@ class ITKQuadEdgeMesh_EXPORT QuadEdge
330330
Self *
331331
GetDprev();
332332

333-
[[nodiscard]] [[nodiscard]] const Self *
333+
[[nodiscard]] const Self *
334334
GetDprev() const;
335335

336336
/** Inverse operators */
@@ -380,7 +380,7 @@ class ITKQuadEdgeMesh_EXPORT QuadEdge
380380
{
381381
return this->GetDprev();
382382
}
383-
[[nodiscard]] [[nodiscard]] inline const Self *
383+
[[nodiscard]] inline const Self *
384384
GetInvRot() const
385385
{
386386
#ifdef NDEBUG
@@ -405,22 +405,22 @@ class ITKQuadEdgeMesh_EXPORT QuadEdge
405405
#endif
406406
}
407407

408-
[[nodiscard]] [[nodiscard]] inline const Self *
408+
[[nodiscard]] inline const Self *
409409
GetInvOnext() const
410410
{
411411
return this->GetOprev();
412412
}
413-
[[nodiscard]] [[nodiscard]] inline const Self *
413+
[[nodiscard]] inline const Self *
414414
GetInvLnext() const
415415
{
416416
return this->GetLprev();
417417
}
418-
[[nodiscard]] [[nodiscard]] inline const Self *
418+
[[nodiscard]] inline const Self *
419419
GetInvRnext() const
420420
{
421421
return this->GetRprev();
422422
}
423-
[[nodiscard]] [[nodiscard]] inline const Self *
423+
[[nodiscard]] inline const Self *
424424
GetInvDnext() const
425425
{
426426
return this->GetDprev();
@@ -429,23 +429,23 @@ class ITKQuadEdgeMesh_EXPORT QuadEdge
429429

430430
/** Queries. */
431431
/** @ITKStartGrouping */
432-
[[nodiscard]] [[nodiscard]] inline bool
432+
[[nodiscard]] inline bool
433433
IsHalfEdge() const
434434
{
435435
return ((m_Onext == this) || (m_Rot == nullptr));
436436
}
437-
[[nodiscard]] [[nodiscard]] inline bool
437+
[[nodiscard]] inline bool
438438
IsIsolated() const
439439
{
440440
return (this == this->GetOnext());
441441
}
442442
bool
443443
IsEdgeInOnextRing(Self * testEdge) const;
444-
[[nodiscard]] [[nodiscard]] bool
444+
[[nodiscard]] bool
445445
IsLnextGivenSizeCyclic(const int size) const;
446446
/** @ITKEndGrouping */
447447

448-
[[nodiscard]] [[nodiscard]] unsigned int
448+
[[nodiscard]] unsigned int
449449
GetOrder() const;
450450

451451
private:

‎Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshBaseIterator.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,22 +108,22 @@ class QuadEdgeMeshBaseIterator
108108
return *this;
109109
}
110110

111-
[[nodiscard]] [[nodiscard]] QuadEdgeType *
111+
[[nodiscard]] QuadEdgeType *
112112
GetStartEdge() const
113113
{
114114
return (m_StartEdge);
115115
}
116-
[[nodiscard]] [[nodiscard]] QuadEdgeType *
116+
[[nodiscard]] QuadEdgeType *
117117
GetIterator() const
118118
{
119119
return (m_Iterator);
120120
}
121-
[[nodiscard]] [[nodiscard]] int
121+
[[nodiscard]] int
122122
GetOpType() const
123123
{
124124
return (m_OpType);
125125
}
126-
[[nodiscard]] [[nodiscard]] bool
126+
[[nodiscard]] bool
127127
GetStart() const
128128
{
129129
return (m_Start);
@@ -250,7 +250,7 @@ class ITK_TEMPLATE_EXPORT QuadEdgeMeshIterator : public QuadEdgeMeshBaseIterator
250250
{
251251
return (this->m_Iterator);
252252
}
253-
[[nodiscard]] [[nodiscard]] const QuadEdgeType *
253+
[[nodiscard]] const QuadEdgeType *
254254
Value() const
255255
{
256256
return (this->m_Iterator);
@@ -326,7 +326,7 @@ class ITK_TEMPLATE_EXPORT QuadEdgeMeshConstIterator : public QuadEdgeMeshBaseIte
326326
return *this;
327327
}
328328

329-
[[nodiscard]] [[nodiscard]] const QuadEdgeType *
329+
[[nodiscard]] const QuadEdgeType *
330330
Value() const
331331
{
332332
return (this->m_Iterator);

‎Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshPoint.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,21 +90,21 @@ class ITK_TEMPLATE_EXPORT QuadEdgeMeshPoint : public Point<TCoordinate, VPointDi
9090
TQuadEdge *
9191
GetEdge();
9292

93-
[[nodiscard]] [[nodiscard]] TQuadEdge *
93+
[[nodiscard]] TQuadEdge *
9494
GetEdge() const;
9595

9696
/** Return IsOriginalInternal of the edge.
9797
* @sa GeometricalQuadEdge::isOriginInternal
9898
*/
99-
[[nodiscard]] [[nodiscard]] bool
99+
[[nodiscard]] bool
100100
IsInternal() const;
101101

102102
/** Return the valence of this QuadEdgeMeshPoint i.e. the number of edges constituting
103103
* the Onext ring to which this point belongs.
104104
* @return the valence when an entry in the Onext ring is present,
105105
* and -1 otherwise.
106106
*/
107-
[[nodiscard]] [[nodiscard]] int
107+
[[nodiscard]] int
108108
GetValence() const;
109109

110110
protected:

0 commit comments

Comments
 (0)