Skip to content

Commit 02128ab

Browse files
committed
COMP: Use C++11 = delete directly
git grep -l "ITK_DELETED_FUNCTION" | fgrep -v itk_compiler_detection.h | fgrep -v itkMacro.h | fgrep -v CMakeLists.txt |fgrep -v .cmake | xargs sed -i '' -e "s/ITK_DELETED_FUNCTION/= delete/g" Change-Id: Idc84bf128df49db65cd5969457d7f58fefc560f1
1 parent cc27fac commit 02128ab

11 files changed

Lines changed: 44 additions & 44 deletions

Modules/Core/Common/include/itkConstShapedNeighborhoodIterator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ class ITK_TEMPLATE_EXPORT ConstShapedNeighborhoodIterator:
372372
ConstIterator m_ConstBeginIterator;
373373
private:
374374
/** Copy constructor */
375-
ConstShapedNeighborhoodIterator(const ConstShapedNeighborhoodIterator &) ITK_DELETED_FUNCTION;
375+
ConstShapedNeighborhoodIterator(const ConstShapedNeighborhoodIterator &) = delete;
376376
};
377377
} // namespace itk
378378

Modules/Core/Common/include/itkProgressReporter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class ITKCommon_EXPORT ProgressReporter
107107
float m_ProgressWeight;
108108

109109
private:
110-
ProgressReporter() ITK_DELETED_FUNCTION;
110+
ProgressReporter() = delete;
111111
};
112112
} // end namespace itk
113113

Modules/Core/Common/include/itkShapedNeighborhoodIterator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ class ITK_TEMPLATE_EXPORT ShapedNeighborhoodIterator:
262262
protected:
263263

264264
/** Copy constructor */
265-
ShapedNeighborhoodIterator(const ShapedNeighborhoodIterator & o) ITK_DELETED_FUNCTION;
265+
ShapedNeighborhoodIterator(const ShapedNeighborhoodIterator & o) = delete;
266266

267267
typedef typename Superclass::NeighborIndexType NeighborIndexType;
268268

Modules/Numerics/Statistics/include/itkHistogram.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ class ITK_TEMPLATE_EXPORT Histogram:
393393
// Pointer of DenseFrequencyContainer
394394
const Self *m_Histogram;
395395
private:
396-
ConstIterator() ITK_DELETED_FUNCTION;
396+
ConstIterator() = delete;
397397
}; // end of iterator class
398398

399399
/** \class Iterator
@@ -430,11 +430,11 @@ class ITK_TEMPLATE_EXPORT Histogram:
430430
private:
431431
// To ensure const-correctness these method must not be in the public API.
432432
// The are not implemented, since they should never be called.
433-
Iterator() ITK_DELETED_FUNCTION;
434-
Iterator(const Self *histogram) ITK_DELETED_FUNCTION;
435-
Iterator(InstanceIdentifier id, const Self *histogram) ITK_DELETED_FUNCTION;
436-
Iterator(const ConstIterator & it) ITK_DELETED_FUNCTION;
437-
ConstIterator & operator=(const ConstIterator & it) ITK_DELETED_FUNCTION;
433+
Iterator() = delete;
434+
Iterator(const Self *histogram) = delete;
435+
Iterator(InstanceIdentifier id, const Self *histogram) = delete;
436+
Iterator(const ConstIterator & it) = delete;
437+
ConstIterator & operator=(const ConstIterator & it) = delete;
438438
}; // end of iterator class
439439

440440
Iterator Begin()

Modules/Numerics/Statistics/include/itkImageToListSampleAdaptor.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ class ITK_TEMPLATE_EXPORT ImageToListSampleAdaptor:
200200
{}
201201

202202
private:
203-
ConstIterator() ITK_DELETED_FUNCTION;
203+
ConstIterator() = delete;
204204
ImageConstIteratorType m_Iter;
205205
mutable MeasurementVectorType m_MeasurementVectorCache;
206206
InstanceIdentifier m_InstanceIdentifier;
@@ -239,11 +239,11 @@ class ITK_TEMPLATE_EXPORT ImageToListSampleAdaptor:
239239
private:
240240
// To ensure const-correctness these method must not be in the public API.
241241
// The are purposly not implemented, since they should never be called.
242-
Iterator() ITK_DELETED_FUNCTION;
243-
Iterator(const Self *adaptor) ITK_DELETED_FUNCTION;
244-
Iterator(const ImageConstIteratorType & iter, InstanceIdentifier iid) ITK_DELETED_FUNCTION;
245-
Iterator(const ConstIterator & it) ITK_DELETED_FUNCTION;
246-
ConstIterator & operator=(const ConstIterator & it) ITK_DELETED_FUNCTION;
242+
Iterator() = delete;
243+
Iterator(const Self *adaptor) = delete;
244+
Iterator(const ImageConstIteratorType & iter, InstanceIdentifier iid) = delete;
245+
Iterator(const ConstIterator & it) = delete;
246+
ConstIterator & operator=(const ConstIterator & it) = delete;
247247
};
248248

249249
/** returns an iterator that points to the beginning of the container */

Modules/Numerics/Statistics/include/itkImageToNeighborhoodSampleAdaptor.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ class ITK_TEMPLATE_EXPORT ImageToNeighborhoodSampleAdaptor :
211211
}
212212

213213
private:
214-
ConstIterator() ITK_DELETED_FUNCTION;
214+
ConstIterator() = delete;
215215
mutable MeasurementVectorType m_MeasurementVectorCache;
216216
InstanceIdentifier m_InstanceIdentifier;
217217
};
@@ -252,10 +252,10 @@ class ITK_TEMPLATE_EXPORT ImageToNeighborhoodSampleAdaptor :
252252
private:
253253
// To ensure const-correctness these method must not be in the public API.
254254
// The are not implemented, since they should never be called.
255-
Iterator() ITK_DELETED_FUNCTION;
256-
Iterator(const Self * adaptor) ITK_DELETED_FUNCTION;
257-
Iterator(const ConstIterator & it) ITK_DELETED_FUNCTION;
258-
ConstIterator& operator=(const ConstIterator& it) ITK_DELETED_FUNCTION;
255+
Iterator() = delete;
256+
Iterator(const Self * adaptor) = delete;
257+
Iterator(const ConstIterator & it) = delete;
258+
ConstIterator& operator=(const ConstIterator& it) = delete;
259259
};
260260

261261
/** returns an iterator that points to the beginning of the container */

Modules/Numerics/Statistics/include/itkJointDomainImageToListSampleAdaptor.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ class ITK_TEMPLATE_EXPORT JointDomainImageToListSampleAdaptor:
250250
}
251251

252252
private:
253-
ConstIterator() ITK_DELETED_FUNCTION;
253+
ConstIterator() = delete;
254254
mutable MeasurementVectorType m_MeasurementVectorCache;
255255
InstanceIdentifier m_InstanceIdentifier;
256256
const JointDomainImageToListSampleAdaptor *m_Adaptor;
@@ -287,10 +287,10 @@ class ITK_TEMPLATE_EXPORT JointDomainImageToListSampleAdaptor:
287287
private:
288288
// To ensure const-correctness these method must not be in the public API.
289289
// The are purposly not implemented, since they should never be called.
290-
Iterator() ITK_DELETED_FUNCTION;
291-
Iterator(const Self *adaptor) ITK_DELETED_FUNCTION;
292-
Iterator(const ConstIterator & it) ITK_DELETED_FUNCTION;
293-
ConstIterator & operator=(const ConstIterator & it) ITK_DELETED_FUNCTION;
290+
Iterator() = delete;
291+
Iterator(const Self *adaptor) = delete;
292+
Iterator(const ConstIterator & it) = delete;
293+
ConstIterator & operator=(const ConstIterator & it) = delete;
294294

295295
};
296296

Modules/Numerics/Statistics/include/itkKdTree.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ class ITK_TEMPLATE_EXPORT KdTree:public Object
589589
}
590590

591591
private:
592-
NearestNeighbors() ITK_DELETED_FUNCTION;
592+
NearestNeighbors() = delete;
593593
/** The index of the farthest neighbor among k-neighbors */
594594
unsigned int m_FarthestNeighborIndex;
595595

Modules/Numerics/Statistics/include/itkListSample.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ class ITK_TEMPLATE_EXPORT ListSample:public Sample< TMeasurementVector >
191191
}
192192

193193
private:
194-
ConstIterator() ITK_DELETED_FUNCTION;
194+
ConstIterator() = delete;
195195
typedef typename InternalDataContainerType::const_iterator InternalIterator;
196196
InternalIterator m_Iter;
197197
InstanceIdentifier m_InstanceIdentifier;
@@ -229,11 +229,11 @@ class ITK_TEMPLATE_EXPORT ListSample:public Sample< TMeasurementVector >
229229
private:
230230
// To ensure const-correctness these method must not be in the public API.
231231
// The are purposly not implemented, since they should never be called.
232-
Iterator() ITK_DELETED_FUNCTION;
233-
Iterator(const Self *sample) ITK_DELETED_FUNCTION;
234-
Iterator(typename InternalDataContainerType::const_iterator iter, InstanceIdentifier iid) ITK_DELETED_FUNCTION;
235-
Iterator(const ConstIterator & it) ITK_DELETED_FUNCTION;
236-
ConstIterator & operator=(const ConstIterator & it) ITK_DELETED_FUNCTION;
232+
Iterator() = delete;
233+
Iterator(const Self *sample) = delete;
234+
Iterator(typename InternalDataContainerType::const_iterator iter, InstanceIdentifier iid) = delete;
235+
Iterator(const ConstIterator & it) = delete;
236+
ConstIterator & operator=(const ConstIterator & it) = delete;
237237
};
238238

239239
/** returns an iterator that points to the beginning of the container */

Modules/Numerics/Statistics/include/itkPointSetToListSampleAdaptor.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ class ITK_TEMPLATE_EXPORT PointSetToListSampleAdaptor:
170170
}
171171

172172
private:
173-
ConstIterator() ITK_DELETED_FUNCTION;
173+
ConstIterator() = delete;
174174
PointsContainerConstIteratorType m_Iter;
175175
InstanceIdentifier m_InstanceIdentifier;
176176
};
@@ -205,11 +205,11 @@ class ITK_TEMPLATE_EXPORT PointSetToListSampleAdaptor:
205205
private:
206206
// To ensure const-correctness these method must not be in the public API.
207207
// The are not implemented, since they should never be called.
208-
Iterator() ITK_DELETED_FUNCTION;
209-
Iterator(const Self *adaptor) ITK_DELETED_FUNCTION;
210-
Iterator(PointsContainerConstIteratorType iter, InstanceIdentifier iid) ITK_DELETED_FUNCTION;
211-
Iterator(const ConstIterator & it) ITK_DELETED_FUNCTION;
212-
ConstIterator & operator=(const ConstIterator & it) ITK_DELETED_FUNCTION;
208+
Iterator() = delete;
209+
Iterator(const Self *adaptor) = delete;
210+
Iterator(PointsContainerConstIteratorType iter, InstanceIdentifier iid) = delete;
211+
Iterator(const ConstIterator & it) = delete;
212+
ConstIterator & operator=(const ConstIterator & it) = delete;
213213

214214
};
215215

0 commit comments

Comments
 (0)