Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

COMP: Use and move ITK_DISALLOW_COPY_AND_ASSIGN calls to public section. #9

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions include/itkMetamorphosisImageRegistrationMethodv4.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ class ConstantImageFilter:
public ImageToImageFilter<TInputImage, TOutputImage>
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(ConstantImageFilter);

/** Standard class type alias. */
using Self = ConstantImageFilter;
using Superclass = ImageToImageFilter< TInputImage, TOutputImage >;
Expand Down Expand Up @@ -84,8 +86,6 @@ public ImageToImageFilter<TInputImage, TOutputImage>
}

private:
ConstantImageFilter(const Self &); //purposely not implemented
void operator=(const Self &); //purposely not implemented

OutputPixelType m_Constant;
};
Expand All @@ -104,6 +104,8 @@ class MetamorphosisImageRegistrationMethodv4:
public TimeVaryingVelocityFieldImageRegistrationMethodv4<TFixedImage, TMovingImage, TimeVaryingVelocityFieldSemiLagrangianTransform<double, TFixedImage::ImageDimension> >
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(MetamorphosisImageRegistrationMethodv4);

/** Standard class type alias. */
using Self = MetamorphosisImageRegistrationMethodv4;
using Superclass = TimeVaryingVelocityFieldImageRegistrationMethodv4<TFixedImage, TMovingImage, TimeVaryingVelocityFieldSemiLagrangianTransform<double, TFixedImage::ImageDimension> >;
Expand Down Expand Up @@ -228,8 +230,6 @@ public TimeVaryingVelocityFieldImageRegistrationMethodv4<TFixedImage, TMovingIma
void PrintSelf(std::ostream& os, Indent indent) const override;

private:
MetamorphosisImageRegistrationMethodv4(const Self&); // Intentionally not implemened
void operator=(const Self&); //Intentionally not implemented

double m_Scale;
double m_RegistrationSmoothness;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ class TimeVaryingVelocityFieldSemiLagrangianIntegrationImageFilter :
public TimeVaryingVelocityFieldIntegrationImageFilter<TTimeVaryingVelocityField, TDisplacementField>
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(TimeVaryingVelocityFieldSemiLagrangianIntegrationImageFilter);

using Self = TimeVaryingVelocityFieldSemiLagrangianIntegrationImageFilter;
using Superclass = TimeVaryingVelocityFieldIntegrationImageFilter
<TTimeVaryingVelocityField, TDisplacementField>;
Expand Down Expand Up @@ -111,8 +113,6 @@ class TimeVaryingVelocityFieldSemiLagrangianIntegrationImageFilter :
DisplacementFieldExtrapolatorPointer m_DisplacementFieldExtrapolator;

private:
TimeVaryingVelocityFieldSemiLagrangianIntegrationImageFilter( const Self & ) ITK_DELETE_FUNCTION;
void operator=( const Self & ) ITK_DELETE_FUNCTION;

VelocityFieldInterpolatorPointer m_VelocityFieldInterpolator;
VelocityFieldExtrapolatorPointer m_VelocityFieldExtrapolator;
Expand Down
5 changes: 3 additions & 2 deletions include/itkTimeVaryingVelocityFieldSemiLagrangianTransform.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ class TimeVaryingVelocityFieldSemiLagrangianTransform :
public TimeVaryingVelocityFieldTransform<TParametersValueType, NDimensions>
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(TimeVaryingVelocityFieldSemiLagrangianTransform);

/** Standard class type alias. */
using Self = TimeVaryingVelocityFieldSemiLagrangianTransform;
using Superclass = TimeVaryingVelocityFieldTransform<TParametersValueType, NDimensions>;
Expand Down Expand Up @@ -87,8 +89,7 @@ class TimeVaryingVelocityFieldSemiLagrangianTransform :
~TimeVaryingVelocityFieldSemiLagrangianTransform() override = default;

private:
TimeVaryingVelocityFieldSemiLagrangianTransform( const Self& ) ITK_DELETE_FUNCTION;
void operator=( const Self& ) ITK_DELETE_FUNCTION;

bool m_UseInverse;
};

Expand Down
4 changes: 2 additions & 2 deletions include/itkWrapExtrapolateImageFunction.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ class WrapExtrapolateImageFunction:
public ExtrapolateImageFunction< TInputImage, TCoordRep >
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(WrapExtrapolateImageFunction);

/** Standard class type alias. */
using Self = WrapExtrapolateImageFunction;
using Superclass = ExtrapolateImageFunction< TInputImage, TCoordRep >;
Expand Down Expand Up @@ -163,8 +165,6 @@ class WrapExtrapolateImageFunction:
}

private:
WrapExtrapolateImageFunction(const Self &) ITK_DELETE_FUNCTION;
void operator=(const Self &) ITK_DELETE_FUNCTION;

InterpolatorPointerType m_Interpolator;
};
Expand Down