Skip to content

Commit

Permalink
COMP: Fix inconsistent/missing override warnings
Browse files Browse the repository at this point in the history
Sample message:

M:\Dev\Nornir\ITKNornir\include/itkLegendrePolynomialTransform.h(118,3): warning : 'TransformPoint' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
  • Loading branch information
dzenanz committed Aug 28, 2024
1 parent eb18d0d commit d583283
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 31 deletions.
10 changes: 5 additions & 5 deletions include/itkGridTransform.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class GridTransform : public Transform<double, 2, 2>

// virtual:
OutputPointType
TransformPoint(const InputPointType & x) const
TransformPoint(const InputPointType & x) const override
{
OutputPointType y;
if (is_inverse())
Expand Down Expand Up @@ -175,14 +175,14 @@ class GridTransform : public Transform<double, 2, 2>

// virtual:
void
SetFixedParameters(const ParametersType & params)
SetFixedParameters(const ParametersType & params) override
{
this->m_FixedParameters = params;
}

// virtual:
const ParametersType &
GetFixedParameters() const
GetFixedParameters() const override
{
ParametersType params = this->m_FixedParameters;

Expand All @@ -201,7 +201,7 @@ class GridTransform : public Transform<double, 2, 2>

// virtual:
void
SetParameters(const ParametersType & params)
SetParameters(const ParametersType & params) override
{
this->m_Parameters = params;

Expand Down Expand Up @@ -231,7 +231,7 @@ class GridTransform : public Transform<double, 2, 2>

// virtual:
const ParametersType &
GetParameters() const
GetParameters() const override
{
ParametersType params(GetNumberOfParameters());
unsigned int num_pts = params.size() / 2;
Expand Down
14 changes: 7 additions & 7 deletions include/itkLegendrePolynomialTransform.h
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class LegendrePolynomialTransform : public Transform<TScalar, 2, 2>

// virtual:
OutputPointType
TransformPoint(const InputPointType & x) const;
TransformPoint(const InputPointType & x) const override;

// Inverse transformations:
// If y = Transform(x), then x = BackTransform(y);
Expand Down Expand Up @@ -145,28 +145,28 @@ class LegendrePolynomialTransform : public Transform<TScalar, 2, 2>

// virtual:
void
SetFixedParameters(const ParametersType & params)
SetFixedParameters(const ParametersType & params) override
{
this->m_FixedParameters = params;
}

// virtual:
const ParametersType &
GetFixedParameters() const
GetFixedParameters() const override
{
return this->m_FixedParameters;
}

// virtual:
void
SetParameters(const ParametersType & params)
SetParameters(const ParametersType & params) override
{
this->m_Parameters = params;
}

// virtual:
const ParametersType &
GetParameters() const
GetParameters() const override
{
return this->m_Parameters;
}
Expand Down Expand Up @@ -355,7 +355,7 @@ class LegendrePolynomialTransform : public Transform<TScalar, 2, 2>

// virtual: Generate a platform independent name:
std::string
GetTransformTypeAsString() const
GetTransformTypeAsString() const override
{
std::string base = Superclass::GetTransformTypeAsString();
std::ostringstream name;
Expand All @@ -368,7 +368,7 @@ class LegendrePolynomialTransform : public Transform<TScalar, 2, 2>

// virtual:
void
PrintSelf(std::ostream & s, Indent indent) const;
PrintSelf(std::ostream & s, Indent indent) const override;

private:
// disable default copy constructor and assignment operator:
Expand Down
10 changes: 5 additions & 5 deletions include/itkMeshTransform.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class MeshTransform : public Transform<double, 2, 2>

// virtual:
OutputPointType
TransformPoint(const InputPointType & x) const
TransformPoint(const InputPointType & x) const override
{
OutputPointType y;
if (transform_.grid_.cols_ == 0 || transform_.grid_.cols_ == 0)
Expand Down Expand Up @@ -180,14 +180,14 @@ class MeshTransform : public Transform<double, 2, 2>

// virtual:
void
SetFixedParameters(const ParametersType & params)
SetFixedParameters(const ParametersType & params) override
{
this->m_FixedParameters = params;
}

// virtual:
const ParametersType &
GetFixedParameters() const
GetFixedParameters() const override
{
ParametersType params = this->m_FixedParameters;

Expand All @@ -212,7 +212,7 @@ class MeshTransform : public Transform<double, 2, 2>

// virtual:
void
SetParameters(const ParametersType & params)
SetParameters(const ParametersType & params) override
{
this->m_Parameters = params;

Expand Down Expand Up @@ -246,7 +246,7 @@ class MeshTransform : public Transform<double, 2, 2>

// virtual:
const ParametersType &
GetParameters() const
GetParameters() const override
{
ParametersType params(GetNumberOfParameters());

Expand Down
12 changes: 6 additions & 6 deletions include/itkRBFTransform.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class RBFTransform : public Transform<double, 2, 2>

// virtual:
OutputPointType
TransformPoint(const InputPointType & uv) const;
TransformPoint(const InputPointType & uv) const override;

// Inverse transformations:
// If y = Transform(x), then x = BackTransform(y);
Expand Down Expand Up @@ -135,28 +135,28 @@ class RBFTransform : public Transform<double, 2, 2>

// virtual:
void
SetFixedParameters(const ParametersType & params)
SetFixedParameters(const ParametersType & params) override
{
this->m_FixedParameters = params;
}

// virtual:
const ParametersType &
GetFixedParameters() const
GetFixedParameters() const override
{
return this->m_FixedParameters;
}

// virtual:
void
SetParameters(const ParametersType & params)
SetParameters(const ParametersType & params) override
{
this->m_Parameters = params;
}

// virtual:
const ParametersType &
GetParameters() const
GetParameters() const override
{
return this->m_Parameters;
}
Expand Down Expand Up @@ -306,7 +306,7 @@ class RBFTransform : public Transform<double, 2, 2>

// virtual:
void
PrintSelf(std::ostream & s, Indent indent) const;
PrintSelf(std::ostream & s, Indent indent) const override;

private:
// disable default copy constructor and assignment operator:
Expand Down
12 changes: 6 additions & 6 deletions include/itkRadialDistortionTransform.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class RadialDistortionTransform : public Transform<TScalar, 2, 2>

// virtual:
OutputPointType
TransformPoint(const InputPointType & p) const;
TransformPoint(const InputPointType & p) const override;

// virtual: Inverse transformations:
// If y = Transform(x), then x = BackTransform(y);
Expand Down Expand Up @@ -131,28 +131,28 @@ class RadialDistortionTransform : public Transform<TScalar, 2, 2>

// virtual:
void
SetFixedParameters(const ParametersType & params)
SetFixedParameters(const ParametersType & params) override
{
this->m_FixedParameters = params;
}

// virtual:
const ParametersType &
GetFixedParameters() const
GetFixedParameters() const override
{
return this->m_FixedParameters;
}

// virtual:
void
SetParameters(const ParametersType & params)
SetParameters(const ParametersType & params) override
{
this->m_Parameters = params;
}

// virtual:
const ParametersType &
GetParameters() const
GetParameters() const override
{
return this->m_Parameters;
}
Expand Down Expand Up @@ -252,7 +252,7 @@ class RadialDistortionTransform : public Transform<TScalar, 2, 2>

// virtual:
void
PrintSelf(std::ostream & s, Indent indent) const;
PrintSelf(std::ostream & s, Indent indent) const override;

private:
// disable default copy constructor and assignment operator:
Expand Down
4 changes: 2 additions & 2 deletions include/itkRegularStepGradientDescentOptimizer2.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class ITK_EXPORT RegularStepGradientDescentOptimizer2 :
inline void MinimizeOff() { SetMaximize(true); }

// virtual:
void StartOptimization();
void StartOptimization() override;

// virtual:
void ResumeOptimization();
Expand Down Expand Up @@ -145,7 +145,7 @@ class ITK_EXPORT RegularStepGradientDescentOptimizer2 :
const DerivativeType & step_direction);

// virtual:
void PrintSelf(std::ostream& os, Indent indent) const;
void PrintSelf(std::ostream& os, Indent indent) const override;

// data members:
DerivativeType m_Gradient;
Expand Down

0 comments on commit d583283

Please sign in to comment.