Skip to content

Commit 6fc3d3c

Browse files
committed
COMP: Use C++11 override directly
git grep -l "ITK_OVERRIDE" | fgrep -v itk_compiler_detection.h | fgrep -v CMakeLists.txt |fgrep -v .cmake | xargs sed -i '' -e "s/ITK_OVERRIDE/override/g"
1 parent 6d8d304 commit 6fc3d3c

6 files changed

+33
-33
lines changed

include/itkArrivalFunctionToPathFilter.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ class ArrivalFunctionToPathCommand : public itk::Command
5858
itkGetConstObjectMacro( Filter, FilterType );
5959

6060
/** Execute */
61-
void Execute(itk::Object *caller, const itk::EventObject & event) ITK_OVERRIDE
61+
void Execute(itk::Object *caller, const itk::EventObject & event) override
6262
{
6363
Execute( (const itk::Object *)caller, event);
6464
}
6565

6666
/** Execute */
67-
void Execute(const itk::Object * object, const itk::EventObject & event) ITK_OVERRIDE
67+
void Execute(const itk::Object * object, const itk::EventObject & event) override
6868
{
6969
if( ! itk::IterationEvent().CheckEvent( &event ) )
7070
{
@@ -79,7 +79,7 @@ class ArrivalFunctionToPathCommand : public itk::Command
7979

8080
protected:
8181
ArrivalFunctionToPathCommand(){}
82-
~ArrivalFunctionToPathCommand() ITK_OVERRIDE{}
82+
~ArrivalFunctionToPathCommand() override{}
8383

8484
private:
8585
ITK_DISALLOW_COPY_AND_ASSIGN(ArrivalFunctionToPathCommand);
@@ -212,14 +212,14 @@ class ITK_EXPORT ArrivalFunctionToPathFilter :
212212

213213
protected:
214214
ArrivalFunctionToPathFilter();
215-
~ArrivalFunctionToPathFilter() ITK_OVERRIDE;
216-
void PrintSelf(std::ostream& os, Indent indent) const ITK_OVERRIDE;
215+
~ArrivalFunctionToPathFilter() override;
216+
void PrintSelf(std::ostream& os, Indent indent) const override;
217217

218218
/** Override since the filter needs all the data for the algorithm */
219-
void GenerateInputRequestedRegion() ITK_OVERRIDE;
219+
void GenerateInputRequestedRegion() override;
220220

221221
/** Implemention of algorithm */
222-
void GenerateData(void) ITK_OVERRIDE;
222+
void GenerateData(void) override;
223223

224224
/** Get the arrival function from which to extract the path. */
225225
virtual unsigned int GetNumberOfPathsToExtract( ) const;

include/itkIterateNeighborhoodOptimizer.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class MinimalPathExtraction_EXPORT IterateNeighborhoodOptimizer :
7171
virtual void AdvanceOneStep( void );
7272

7373
/** Start optimization. */
74-
void StartOptimization( void ) ITK_OVERRIDE;
74+
void StartOptimization( void ) override;
7575

7676
/** Resume previously stopped optimization with current parameters
7777
* \sa StopOptimization. */
@@ -104,8 +104,8 @@ class MinimalPathExtraction_EXPORT IterateNeighborhoodOptimizer :
104104

105105
protected:
106106
IterateNeighborhoodOptimizer();
107-
~IterateNeighborhoodOptimizer() ITK_OVERRIDE {};
108-
void PrintSelf(std::ostream& os, Indent indent) const ITK_OVERRIDE;
107+
~IterateNeighborhoodOptimizer() override {};
108+
void PrintSelf(std::ostream& os, Indent indent) const override;
109109

110110
private:
111111
ITK_DISALLOW_COPY_AND_ASSIGN(IterateNeighborhoodOptimizer);

include/itkPhysicalCentralDifferenceImageFunction.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class ITK_EXPORT PhysicalCentralDifferenceImageFunction :
8989
* \warning this method caches BufferedRegion information.
9090
* If the BufferedRegion has changed, user must call
9191
* SetInputImage again to update cached values. */
92-
void SetInputImage( const InputImageType * ptr ) ITK_OVERRIDE
92+
void SetInputImage( const InputImageType * ptr ) override
9393
{
9494
this->Superclass::SetInputImage( ptr );
9595
if ( m_Interpolator.IsNotNull() )
@@ -103,7 +103,7 @@ class ITK_EXPORT PhysicalCentralDifferenceImageFunction :
103103
* No bounds checking is done. The point is assume to lie within the
104104
* image buffer. ImageFunction::IsInsideBuffer() can be used to check
105105
* bounds before calling this method. */
106-
OutputType EvaluateAtIndex( const IndexType& index ) const ITK_OVERRIDE
106+
OutputType EvaluateAtIndex( const IndexType& index ) const override
107107
{
108108
PointType point;
109109
m_Interpolator->GetInputImage()->TransformIndexToPhysicalPoint( index, point );
@@ -117,7 +117,7 @@ class ITK_EXPORT PhysicalCentralDifferenceImageFunction :
117117
* image buffer. ImageFunction::IsInsideBuffer() can be used to check
118118
* bounds before calling this method. */
119119
OutputType EvaluateAtContinuousIndex(
120-
const ContinuousIndexType& cindex ) const ITK_OVERRIDE
120+
const ContinuousIndexType& cindex ) const override
121121
{
122122
PointType point;
123123
m_Interpolator->GetInputImage()->TransformContinuousIndexToPhysicalPoint( cindex, point );
@@ -130,12 +130,12 @@ class ITK_EXPORT PhysicalCentralDifferenceImageFunction :
130130
* No bounds checking is done. The point is assume to lie within the
131131
* image buffer. ImageFunction::IsInsideBuffer() can be used to check
132132
* bounds before calling this method. */
133-
OutputType Evaluate( const PointType& point ) const ITK_OVERRIDE;
133+
OutputType Evaluate( const PointType& point ) const override;
134134

135135
protected:
136136
PhysicalCentralDifferenceImageFunction();
137-
~PhysicalCentralDifferenceImageFunction() ITK_OVERRIDE{};
138-
void PrintSelf(std::ostream& os, Indent indent) const ITK_OVERRIDE;
137+
~PhysicalCentralDifferenceImageFunction() override{};
138+
void PrintSelf(std::ostream& os, Indent indent) const override;
139139

140140
private:
141141
ITK_DISALLOW_COPY_AND_ASSIGN(PhysicalCentralDifferenceImageFunction);

include/itkSingleImageCostFunction.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,17 @@ class ITK_EXPORT SingleImageCostFunction :
116116
virtual void Initialize(void) throw ( ExceptionObject );
117117

118118
/** Return the number of parameters required by the Transform */
119-
unsigned int GetNumberOfParameters(void) const ITK_OVERRIDE
119+
unsigned int GetNumberOfParameters(void) const override
120120
{ return ImageDimension; }
121121

122122
/** This method returns the value of the cost function corresponding
123123
* to the specified parameters. */
124-
MeasureType GetValue( const ParametersType & parameters ) const ITK_OVERRIDE;
124+
MeasureType GetValue( const ParametersType & parameters ) const override;
125125

126126
/** This method returns the derivative of the cost function corresponding
127127
* to the specified parameters. */
128128
void GetDerivative( const ParametersType & parameters,
129-
DerivativeType & derivative ) const ITK_OVERRIDE;
129+
DerivativeType & derivative ) const override;
130130

131131
// Set these depending on whether you will be minimizing or maximizing.
132132
// They control the value returned when the point isn't inside the buffer.
@@ -142,8 +142,8 @@ class ITK_EXPORT SingleImageCostFunction :
142142

143143
protected:
144144
SingleImageCostFunction();
145-
~SingleImageCostFunction() ITK_OVERRIDE {}
146-
void PrintSelf(std::ostream& os, Indent indent) const ITK_OVERRIDE;
145+
~SingleImageCostFunction() override {}
146+
void PrintSelf(std::ostream& os, Indent indent) const override;
147147

148148
private:
149149
ITK_DISALLOW_COPY_AND_ASSIGN(SingleImageCostFunction);

include/itkSpeedFunctionPathInformation.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ class SpeedFunctionPathInformation :
119119

120120
protected:
121121
SpeedFunctionPathInformation( );
122-
~SpeedFunctionPathInformation( ) ITK_OVERRIDE;
123-
void PrintSelf( std::ostream& os, Indent indent ) const ITK_OVERRIDE;
122+
~SpeedFunctionPathInformation( ) override;
123+
void PrintSelf( std::ostream& os, Indent indent ) const override;
124124

125125
std::vector< PointsContainerType > m_Information;
126126
SizeValueType m_Front;

include/itkSpeedFunctionToPathFilter.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class ITK_EXPORT SpeedFunctionToPathFilter :
110110
* Warning: SetPathEndPoint() is not valid for this filter.
111111
* This method is provided by the superclass, however it is not
112112
* used by this subclass. Use AddPathInfo() instead.*/
113-
void SetPathEndPoint( const PointType& ) ITK_OVERRIDE
113+
void SetPathEndPoint( const PointType& ) override
114114
{
115115
itkWarningMacro("SetPathEndPoint() is not valid for this filter. Use AddPathInfo() instead.");
116116
}
@@ -119,7 +119,7 @@ class ITK_EXPORT SpeedFunctionToPathFilter :
119119
* Warning: AddPathEndPoint() is not valid for this filter.
120120
* This method is provided by the superclass, however it is not
121121
* used by this subclass. Use AddPathInfo() instead.*/
122-
void AddPathEndPoint( const PointType& ) ITK_OVERRIDE
122+
void AddPathEndPoint( const PointType& ) override
123123
{
124124
itkWarningMacro("AddPathEndPoint() is not valid for this filter. Use AddPathInfo() instead.");
125125
}
@@ -128,7 +128,7 @@ class ITK_EXPORT SpeedFunctionToPathFilter :
128128
* Warning: ClearPathEndPoints() is not valid for this filter.
129129
* This method is provided by the superclass, however it is not
130130
* used by this subclass. Use ClearPathInfo() instead.*/
131-
void ClearPathEndPoints() ITK_OVERRIDE
131+
void ClearPathEndPoints() override
132132
{
133133
itkWarningMacro("ClearPathEndPoints() is not valid for this filter. Use ClearPathInfo() instead.");
134134
}
@@ -147,27 +147,27 @@ class ITK_EXPORT SpeedFunctionToPathFilter :
147147
}
148148

149149
/** Handle optimizer iteration events. */
150-
void Execute( const itk::Object * object, const itk::EventObject & event ) ITK_OVERRIDE;
150+
void Execute( const itk::Object * object, const itk::EventObject & event ) override;
151151

152152
/** access the arrival image for debugging purposes */
153153
itkGetConstMacro( CurrentArrivalFunction, InputImagePointer );
154154

155155
protected:
156156
SpeedFunctionToPathFilter( );
157-
~SpeedFunctionToPathFilter( ) ITK_OVERRIDE;
158-
void PrintSelf( std::ostream& os, Indent indent ) const ITK_OVERRIDE;
157+
~SpeedFunctionToPathFilter( ) override;
158+
void PrintSelf( std::ostream& os, Indent indent ) const override;
159159

160160
/** Implemention of algorithm. */
161-
void GenerateData( void ) ITK_OVERRIDE;
161+
void GenerateData( void ) override;
162162

163163
/** Get the number of paths which the user has instructed to extracted. */
164-
unsigned int GetNumberOfPathsToExtract( ) const ITK_OVERRIDE;
164+
unsigned int GetNumberOfPathsToExtract( ) const override;
165165

166166
/** Compute the arrival function from which to extract the path. */
167-
InputImageType * ComputeArrivalFunction( ) ITK_OVERRIDE;
167+
InputImageType * ComputeArrivalFunction( ) override;
168168

169169
/** Override handling of optimizer iteration events to accomodate way points. */
170-
const PointsContainerType & GetNextEndPoint( ) ITK_OVERRIDE;
170+
const PointsContainerType & GetNextEndPoint( ) override;
171171

172172
std::vector< typename PathInformationType::Pointer > m_Information;
173173
InputImagePointer m_CurrentArrivalFunction;

0 commit comments

Comments
 (0)