From 8ac7f0b2870ad9f6d9179c4b638bbd3b3bc1c8b5 Mon Sep 17 00:00:00 2001 From: Simon Rit Date: Fri, 16 Oct 2020 16:56:30 +0200 Subject: [PATCH] STYLE: Call ITK_DISALLOW_COPY_AND_MOVE, not ITK_DISALLOW_COPY_AND_ASSIGN See InsightSoftwareConsortium/ITK@7d177ca0c77aedb38cc8cf5561b785317617c315 --- documentation/Doxygen/doxygen.config.in | 1 + include/rtkADMMTotalVariationConeBeamReconstructionFilter.h | 4 ++++ include/rtkADMMTotalVariationConjugateGradientOperator.h | 4 ++++ include/rtkADMMWaveletsConeBeamReconstructionFilter.h | 4 ++++ include/rtkADMMWaveletsConjugateGradientOperator.h | 4 ++++ include/rtkAddMatrixAndDiagonalImageFilter.h | 4 ++++ include/rtkAdditiveGaussianNoiseImageFilter.h | 4 ++++ include/rtkAmsterdamShroudImageFilter.h | 4 ++++ include/rtkAverageOutOfROIImageFilter.h | 4 ++++ include/rtkBackProjectionImageFilter.h | 4 ++++ include/rtkBackwardDifferenceDivergenceImageFilter.h | 4 ++++ include/rtkBioscanGeometryReader.h | 4 ++++ include/rtkBlockDiagonalMatrixVectorMultiplyImageFilter.h | 4 ++++ include/rtkBoellaardScatterCorrectionImageFilter.h | 4 ++++ include/rtkConditionalMedianImageFilter.h | 4 ++++ include/rtkConjugateGradientConeBeamReconstructionFilter.h | 4 ++++ include/rtkConjugateGradientGetP_kPlusOneImageFilter.h | 4 ++++ include/rtkConjugateGradientGetR_kPlusOneImageFilter.h | 4 ++++ include/rtkConjugateGradientGetX_kPlusOneImageFilter.h | 4 ++++ include/rtkConjugateGradientImageFilter.h | 4 ++++ include/rtkConjugateGradientOperator.h | 4 ++++ include/rtkConstantImageSource.h | 4 ++++ include/rtkConvexShape.h | 4 ++++ include/rtkCudaAverageOutOfROIImageFilter.h | 4 ++++ include/rtkCudaBackProjectionImageFilter.h | 4 ++++ include/rtkCudaConjugateGradientImageFilter.h | 4 ++++ include/rtkCudaConstantVolumeSeriesSource.h | 4 ++++ include/rtkCudaConstantVolumeSource.h | 4 ++++ include/rtkCudaCropImageFilter.h | 4 ++++ include/rtkCudaCyclicDeformationImageFilter.h | 4 ++++ include/rtkCudaDisplacedDetectorImageFilter.h | 4 ++++ include/rtkCudaFDKBackProjectionImageFilter.h | 4 ++++ include/rtkCudaFDKConeBeamReconstructionFilter.h | 4 ++++ include/rtkCudaFDKWeightProjectionFilter.h | 4 ++++ include/rtkCudaFFTProjectionsConvolutionImageFilter.h | 4 ++++ include/rtkCudaFFTRampImageFilter.h | 4 ++++ include/rtkCudaForwardProjectionImageFilter.h | 4 ++++ include/rtkCudaForwardWarpImageFilter.h | 4 ++++ include/rtkCudaInterpolateImageFilter.h | 4 ++++ include/rtkCudaIterativeFDKConeBeamReconstructionFilter.h | 4 ++++ include/rtkCudaLagCorrectionImageFilter.h | 4 ++++ include/rtkCudaLaplacianImageFilter.h | 4 ++++ include/rtkCudaLastDimensionTVDenoisingImageFilter.h | 4 ++++ include/rtkCudaParkerShortScanImageFilter.h | 4 ++++ include/rtkCudaPolynomialGainCorrectionImageFilter.h | 4 ++++ include/rtkCudaRayCastBackProjectionImageFilter.h | 4 ++++ include/rtkCudaScatterGlareCorrectionImageFilter.h | 4 ++++ include/rtkCudaSplatImageFilter.h | 4 ++++ include/rtkCudaTotalVariationDenoisingBPDQImageFilter.h | 4 ++++ include/rtkCudaWarpBackProjectionImageFilter.h | 4 ++++ include/rtkCudaWarpForwardProjectionImageFilter.h | 4 ++++ include/rtkCudaWarpImageFilter.h | 4 ++++ include/rtkCudaWeidingerForwardModelImageFilter.h | 4 ++++ include/rtkCyclicDeformationImageFilter.h | 4 ++++ include/rtkDCMImagXImageIO.h | 4 ++++ include/rtkDCMImagXImageIOFactory.h | 4 ++++ include/rtkDPExtractShroudSignalImageFilter.h | 4 ++++ include/rtkDaubechiesWaveletsConvolutionImageFilter.h | 4 ++++ include/rtkDaubechiesWaveletsDenoiseSequenceImageFilter.h | 4 ++++ include/rtkDePierroRegularizationImageFilter.h | 4 ++++ include/rtkDeconstructImageFilter.h | 4 ++++ include/rtkDeconstructSoftThresholdReconstructImageFilter.h | 4 ++++ include/rtkDenoisingBPDQImageFilter.h | 4 ++++ include/rtkDigisensGeometryReader.h | 4 ++++ include/rtkDigisensGeometryXMLFileReader.h | 4 ++++ include/rtkDisplacedDetectorForOffsetFieldOfViewImageFilter.h | 4 ++++ include/rtkDisplacedDetectorImageFilter.h | 4 ++++ include/rtkDivergenceOfGradientConjugateGradientOperator.h | 4 ++++ include/rtkDownsampleImageFilter.h | 4 ++++ include/rtkDrawBoxImageFilter.h | 4 ++++ include/rtkDrawConeImageFilter.h | 4 ++++ include/rtkDrawConvexImageFilter.h | 4 ++++ include/rtkDrawCylinderImageFilter.h | 4 ++++ include/rtkDrawEllipsoidImageFilter.h | 4 ++++ include/rtkDrawGeometricPhantomImageFilter.h | 4 ++++ include/rtkDrawQuadricImageFilter.h | 4 ++++ include/rtkDrawSheppLoganFilter.h | 4 ++++ include/rtkDualEnergyNegativeLogLikelihood.h | 4 ++++ include/rtkEdfImageIO.h | 4 ++++ include/rtkEdfImageIOFactory.h | 4 ++++ include/rtkEdfRawToAttenuationImageFilter.h | 4 ++++ include/rtkElektaSynergyGeometryReader.h | 4 ++++ include/rtkElektaSynergyLookupTableImageFilter.h | 4 ++++ include/rtkElektaSynergyRawLookupTableImageFilter.h | 4 ++++ include/rtkElektaXVI5GeometryXMLFile.h | 4 ++++ include/rtkExtractPhaseImageFilter.h | 4 ++++ include/rtkFDKBackProjectionImageFilter.h | 4 ++++ include/rtkFDKConeBeamReconstructionFilter.h | 4 ++++ include/rtkFDKWarpBackProjectionImageFilter.h | 4 ++++ include/rtkFDKWeightProjectionFilter.h | 4 ++++ include/rtkFFTProjectionsConvolutionImageFilter.h | 4 ++++ include/rtkFFTRampImageFilter.h | 4 ++++ include/rtkFieldOfViewImageFilter.h | 4 ++++ include/rtkForbildPhantomFileReader.h | 4 ++++ include/rtkForwardDifferenceGradientImageFilter.h | 4 ++++ include/rtkForwardProjectionImageFilter.h | 4 ++++ include/rtkForwardWarpImageFilter.h | 4 ++++ .../rtkFourDConjugateGradientConeBeamReconstructionFilter.h | 4 ++++ include/rtkFourDROOSTERConeBeamReconstructionFilter.h | 4 ++++ include/rtkFourDReconstructionConjugateGradientOperator.h | 4 ++++ include/rtkFourDSARTConeBeamReconstructionFilter.h | 4 ++++ include/rtkFourDToProjectionStackImageFilter.h | 4 ++++ include/rtkGeometricPhantom.h | 4 ++++ include/rtkGeometricPhantomFileReader.h | 4 ++++ include/rtkGetNewtonUpdateImageFilter.h | 4 ++++ include/rtkGlobalResourceProbe.h | 4 ++++ include/rtkHilbertImageFilter.h | 4 ++++ include/rtkHisImageIOFactory.h | 4 ++++ include/rtkHndImageIOFactory.h | 4 ++++ include/rtkI0EstimationProjectionFilter.h | 4 ++++ include/rtkImagXGeometryReader.h | 4 ++++ include/rtkImagXImageIOFactory.h | 4 ++++ include/rtkImagXXMLFileReader.h | 4 ++++ include/rtkImageToVectorImageFilter.h | 4 ++++ include/rtkImportImageFilter.h | 4 ++++ include/rtkInterpolatorWithKnownWeightsImageFilter.h | 4 ++++ include/rtkIterativeConeBeamReconstructionFilter.h | 4 ++++ include/rtkIterativeFDKConeBeamReconstructionFilter.h | 4 ++++ include/rtkJosephBackAttenuatedProjectionImageFilter.h | 4 ++++ include/rtkJosephBackProjectionImageFilter.h | 4 ++++ include/rtkJosephForwardAttenuatedProjectionImageFilter.h | 4 ++++ include/rtkJosephForwardProjectionImageFilter.h | 4 ++++ include/rtkLUTbasedVariableI0RawToAttenuationImageFilter.h | 4 ++++ include/rtkLagCorrectionImageFilter.h | 4 ++++ include/rtkLaplacianImageFilter.h | 4 ++++ include/rtkLastDimensionL0GradientDenoisingImageFilter.h | 4 ++++ include/rtkLookupTableImageFilter.h | 4 ++++ include/rtkMagnitudeThresholdImageFilter.h | 4 ++++ include/rtkMaskCollimationImageFilter.h | 4 ++++ include/rtkMechlemOneStepSpectralReconstructionFilter.h | 4 ++++ ...nsatedFourDConjugateGradientConeBeamReconstructionFilter.h | 4 ++++ ...otionCompensatedFourDROOSTERConeBeamReconstructionFilter.h | 4 ++++ ...nCompensatedFourDReconstructionConjugateGradientOperator.h | 4 ++++ include/rtkMultiplyByVectorImageFilter.h | 4 ++++ include/rtkNesterovUpdateImageFilter.h | 4 ++++ include/rtkOSEMConeBeamReconstructionFilter.h | 4 ++++ include/rtkOraGeometryReader.h | 4 ++++ include/rtkOraImageIOFactory.h | 4 ++++ include/rtkOraLookupTableImageFilter.h | 4 ++++ include/rtkOraXMLFileReader.h | 4 ++++ include/rtkParkerShortScanImageFilter.h | 4 ++++ include/rtkPhaseGatingImageFilter.h | 4 ++++ include/rtkPhaseReader.h | 4 ++++ include/rtkPhasesToInterpolationWeights.h | 4 ++++ include/rtkPolynomialGainCorrectionImageFilter.h | 4 ++++ include/rtkProjectGeometricPhantomImageFilter.h | 4 ++++ include/rtkProjectionGeometry.h | 4 ++++ include/rtkProjectionStackToFourDImageFilter.h | 4 ++++ include/rtkProjectionsDecompositionNegativeLogLikelihood.h | 4 ++++ include/rtkProjectionsReader.h | 4 ++++ include/rtkRayBoxIntersectionImageFilter.h | 4 ++++ include/rtkRayConvexIntersectionImageFilter.h | 4 ++++ include/rtkRayEllipsoidIntersectionImageFilter.h | 4 ++++ include/rtkRayQuadricIntersectionImageFilter.h | 4 ++++ include/rtkReconstructImageFilter.h | 4 ++++ include/rtkReconstructionConjugateGradientOperator.h | 4 ++++ include/rtkReg1DExtractShroudSignalImageFilter.h | 4 ++++ include/rtkReg23ProjectionGeometry.h | 4 ++++ ...RegularizedConjugateGradientConeBeamReconstructionFilter.h | 4 ++++ include/rtkReorderProjectionsImageFilter.h | 4 ++++ include/rtkSARTConeBeamReconstructionFilter.h | 4 ++++ include/rtkScatterGlareCorrectionImageFilter.h | 4 ++++ include/rtkSchlomka2008NegativeLogLikelihood.h | 4 ++++ include/rtkSelectOneProjectionPerCycleImageFilter.h | 4 ++++ .../rtkSeparableQuadraticSurrogateRegularizationImageFilter.h | 4 ++++ include/rtkSheppLoganPhantom.h | 4 ++++ include/rtkSheppLoganPhantomFilter.h | 4 ++++ include/rtkSignalToInterpolationWeights.h | 4 ++++ .../rtkSimplexSpectralProjectionsDecompositionImageFilter.h | 4 ++++ include/rtkSingularValueThresholdImageFilter.h | 4 ++++ include/rtkSoftThresholdImageFilter.h | 4 ++++ include/rtkSoftThresholdTVImageFilter.h | 4 ++++ include/rtkSpectralForwardModelImageFilter.h | 4 ++++ include/rtkSplatWithKnownWeightsImageFilter.h | 4 ++++ include/rtkSubSelectFromListImageFilter.h | 4 ++++ include/rtkSubSelectImageFilter.h | 4 ++++ include/rtkSumOfSquaresImageFilter.h | 4 ++++ include/rtkThreeDCircularProjectionGeometry.h | 4 ++++ include/rtkThreeDCircularProjectionGeometryXMLFileReader.h | 4 ++++ include/rtkThreeDCircularProjectionGeometryXMLFileWriter.h | 4 ++++ include/rtkTotalNuclearVariationDenoisingBPDQImageFilter.h | 4 ++++ include/rtkTotalVariationDenoiseSequenceImageFilter.h | 4 ++++ include/rtkTotalVariationDenoisingBPDQImageFilter.h | 4 ++++ include/rtkTotalVariationImageFilter.h | 4 ++++ include/rtkUnwarpSequenceConjugateGradientOperator.h | 4 ++++ include/rtkUnwarpSequenceImageFilter.h | 4 ++++ include/rtkUpsampleImageFilter.h | 4 ++++ include/rtkVarianObiGeometryReader.h | 4 ++++ include/rtkVarianObiRawImageFilter.h | 4 ++++ include/rtkVarianObiXMLFileReader.h | 4 ++++ include/rtkVarianProBeamGeometryReader.h | 4 ++++ include/rtkVarianProBeamXMLFileReader.h | 4 ++++ include/rtkVectorImageToImageFilter.h | 4 ++++ include/rtkWarpFourDToProjectionStackImageFilter.h | 4 ++++ include/rtkWarpProjectionStackToFourDImageFilter.h | 4 ++++ include/rtkWarpSequenceImageFilter.h | 4 ++++ include/rtkWaterPrecorrectionImageFilter.h | 4 ++++ include/rtkWeidingerForwardModelImageFilter.h | 4 ++++ include/rtkXRadGeometryReader.h | 4 ++++ include/rtkXRadImageIOFactory.h | 4 ++++ include/rtkXRadRawToAttenuationImageFilter.h | 4 ++++ include/rtkXimImageIOFactory.h | 4 ++++ 202 files changed, 805 insertions(+) diff --git a/documentation/Doxygen/doxygen.config.in b/documentation/Doxygen/doxygen.config.in index 19038ee88..554742ccf 100644 --- a/documentation/Doxygen/doxygen.config.in +++ b/documentation/Doxygen/doxygen.config.in @@ -2175,6 +2175,7 @@ PREDEFINED = "itkNotUsed(x)=" \ "ITK_OVERRIDE= override " \ "ITK_NULLPTR= nullptr " \ "ITK_NOEXCEPT= noexcept " \ + "ITK_DISALLOW_COPY_AND_MOVE(type)=" \ "ITK_DISALLOW_COPY_AND_ASSIGN(type)=" \ "ITK_FORCE_EXPORT_MACRO(X)=" diff --git a/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h b/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h index 790e82ea4..e8c3f7918 100644 --- a/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h +++ b/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h @@ -138,7 +138,11 @@ class ADMMTotalVariationConeBeamReconstructionFilter : public rtk::IterativeConeBeamReconstructionFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ADMMTotalVariationConeBeamReconstructionFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ADMMTotalVariationConeBeamReconstructionFilter); +#endif /** Standard class type alias. */ using Self = ADMMTotalVariationConeBeamReconstructionFilter; diff --git a/include/rtkADMMTotalVariationConjugateGradientOperator.h b/include/rtkADMMTotalVariationConjugateGradientOperator.h index 34d219e8b..961b66a10 100644 --- a/include/rtkADMMTotalVariationConjugateGradientOperator.h +++ b/include/rtkADMMTotalVariationConjugateGradientOperator.h @@ -107,7 +107,11 @@ template { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ADMMTotalVariationConjugateGradientOperator); +#else + ITK_DISALLOW_COPY_AND_MOVE(ADMMTotalVariationConjugateGradientOperator); +#endif /** Standard class type alias. */ using Self = ADMMTotalVariationConjugateGradientOperator; diff --git a/include/rtkADMMWaveletsConeBeamReconstructionFilter.h b/include/rtkADMMWaveletsConeBeamReconstructionFilter.h index 71c6ebdc1..3887c9dda 100644 --- a/include/rtkADMMWaveletsConeBeamReconstructionFilter.h +++ b/include/rtkADMMWaveletsConeBeamReconstructionFilter.h @@ -144,7 +144,11 @@ class ADMMWaveletsConeBeamReconstructionFilter : public rtk::IterativeConeBeamReconstructionFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ADMMWaveletsConeBeamReconstructionFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ADMMWaveletsConeBeamReconstructionFilter); +#endif /** Standard class type alias. */ using Self = ADMMWaveletsConeBeamReconstructionFilter; diff --git a/include/rtkADMMWaveletsConjugateGradientOperator.h b/include/rtkADMMWaveletsConjugateGradientOperator.h index def383903..1ef381271 100644 --- a/include/rtkADMMWaveletsConjugateGradientOperator.h +++ b/include/rtkADMMWaveletsConjugateGradientOperator.h @@ -98,7 +98,11 @@ template class ADMMWaveletsConjugateGradientOperator : public ConjugateGradientOperator { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ADMMWaveletsConjugateGradientOperator); +#else + ITK_DISALLOW_COPY_AND_MOVE(ADMMWaveletsConjugateGradientOperator); +#endif /** Standard class type alias. */ using Self = ADMMWaveletsConjugateGradientOperator; diff --git a/include/rtkAddMatrixAndDiagonalImageFilter.h b/include/rtkAddMatrixAndDiagonalImageFilter.h index b54db7604..fab18dcb4 100644 --- a/include/rtkAddMatrixAndDiagonalImageFilter.h +++ b/include/rtkAddMatrixAndDiagonalImageFilter.h @@ -44,7 +44,11 @@ template { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(AddMatrixAndDiagonalImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(AddMatrixAndDiagonalImageFilter); +#endif /** Standard class type alias. */ using Self = AddMatrixAndDiagonalImageFilter; diff --git a/include/rtkAdditiveGaussianNoiseImageFilter.h b/include/rtkAdditiveGaussianNoiseImageFilter.h index a3642b376..7d23279be 100644 --- a/include/rtkAdditiveGaussianNoiseImageFilter.h +++ b/include/rtkAdditiveGaussianNoiseImageFilter.h @@ -171,7 +171,11 @@ template class ITK_EXPORT AdditiveGaussianNoiseImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(AdditiveGaussianNoiseImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(AdditiveGaussianNoiseImageFilter); +#endif /** Standard class type alias. */ using Self = AdditiveGaussianNoiseImageFilter; diff --git a/include/rtkAmsterdamShroudImageFilter.h b/include/rtkAmsterdamShroudImageFilter.h index 359ff2fd7..eb115bcd1 100644 --- a/include/rtkAmsterdamShroudImageFilter.h +++ b/include/rtkAmsterdamShroudImageFilter.h @@ -82,7 +82,11 @@ class ITK_EXPORT AmsterdamShroudImageFilter : public itk::ImageToImageFilter> { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(AmsterdamShroudImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(AmsterdamShroudImageFilter); +#endif /** Standard class type alias. */ using Self = AmsterdamShroudImageFilter; diff --git a/include/rtkAverageOutOfROIImageFilter.h b/include/rtkAverageOutOfROIImageFilter.h index 9cc2bdac2..73b659c30 100644 --- a/include/rtkAverageOutOfROIImageFilter.h +++ b/include/rtkAverageOutOfROIImageFilter.h @@ -52,7 +52,11 @@ template { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(AverageOutOfROIImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(AverageOutOfROIImageFilter); +#endif /** Standard class type alias. */ using Self = AverageOutOfROIImageFilter; diff --git a/include/rtkBackProjectionImageFilter.h b/include/rtkBackProjectionImageFilter.h index 4f300ce5a..cd5dce4fc 100644 --- a/include/rtkBackProjectionImageFilter.h +++ b/include/rtkBackProjectionImageFilter.h @@ -50,7 +50,11 @@ template class BackProjectionImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(BackProjectionImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(BackProjectionImageFilter); +#endif /** Standard class type alias. */ using Self = BackProjectionImageFilter; diff --git a/include/rtkBackwardDifferenceDivergenceImageFilter.h b/include/rtkBackwardDifferenceDivergenceImageFilter.h index 663f0e93e..2878f37d2 100644 --- a/include/rtkBackwardDifferenceDivergenceImageFilter.h +++ b/include/rtkBackwardDifferenceDivergenceImageFilter.h @@ -40,7 +40,11 @@ template { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(BackwardDifferenceDivergenceImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(BackwardDifferenceDivergenceImageFilter); +#endif /** Extract dimension from input and output image. */ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension); diff --git a/include/rtkBioscanGeometryReader.h b/include/rtkBioscanGeometryReader.h index 6b449ac9b..e07f9a00a 100644 --- a/include/rtkBioscanGeometryReader.h +++ b/include/rtkBioscanGeometryReader.h @@ -52,7 +52,11 @@ namespace rtk class RTK_EXPORT BioscanGeometryReader : public itk::LightProcessObject { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(BioscanGeometryReader); +#else + ITK_DISALLOW_COPY_AND_MOVE(BioscanGeometryReader); +#endif /** Standard type alias */ using Self = BioscanGeometryReader; diff --git a/include/rtkBlockDiagonalMatrixVectorMultiplyImageFilter.h b/include/rtkBlockDiagonalMatrixVectorMultiplyImageFilter.h index ddb3eece0..a28a3958f 100644 --- a/include/rtkBlockDiagonalMatrixVectorMultiplyImageFilter.h +++ b/include/rtkBlockDiagonalMatrixVectorMultiplyImageFilter.h @@ -39,7 +39,11 @@ template { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(BlockDiagonalMatrixVectorMultiplyImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(BlockDiagonalMatrixVectorMultiplyImageFilter); +#endif /** Standard class type alias. */ using Self = BlockDiagonalMatrixVectorMultiplyImageFilter; diff --git a/include/rtkBoellaardScatterCorrectionImageFilter.h b/include/rtkBoellaardScatterCorrectionImageFilter.h index 2ad66ed88..fc61f06d4 100644 --- a/include/rtkBoellaardScatterCorrectionImageFilter.h +++ b/include/rtkBoellaardScatterCorrectionImageFilter.h @@ -40,7 +40,11 @@ template class ITK_EXPORT BoellaardScatterCorrectionImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(BoellaardScatterCorrectionImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(BoellaardScatterCorrectionImageFilter); +#endif /** Standard class type alias. */ using Self = BoellaardScatterCorrectionImageFilter; diff --git a/include/rtkConditionalMedianImageFilter.h b/include/rtkConditionalMedianImageFilter.h index 196cbe13c..87a265ef9 100644 --- a/include/rtkConditionalMedianImageFilter.h +++ b/include/rtkConditionalMedianImageFilter.h @@ -49,7 +49,11 @@ template class ConditionalMedianImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ConditionalMedianImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ConditionalMedianImageFilter); +#endif /** Standard class type alias. */ using Self = ConditionalMedianImageFilter; diff --git a/include/rtkConjugateGradientConeBeamReconstructionFilter.h b/include/rtkConjugateGradientConeBeamReconstructionFilter.h index f9fc42714..541bf5a38 100644 --- a/include/rtkConjugateGradientConeBeamReconstructionFilter.h +++ b/include/rtkConjugateGradientConeBeamReconstructionFilter.h @@ -110,7 +110,11 @@ template { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ConjugateGradientConeBeamReconstructionFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ConjugateGradientConeBeamReconstructionFilter); +#endif /** Standard class type alias. */ using Self = ConjugateGradientConeBeamReconstructionFilter; diff --git a/include/rtkConjugateGradientGetP_kPlusOneImageFilter.h b/include/rtkConjugateGradientGetP_kPlusOneImageFilter.h index 63c185578..2ab4f1edf 100644 --- a/include/rtkConjugateGradientGetP_kPlusOneImageFilter.h +++ b/include/rtkConjugateGradientGetP_kPlusOneImageFilter.h @@ -35,7 +35,11 @@ template class ConjugateGradientGetP_kPlusOneImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ConjugateGradientGetP_kPlusOneImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ConjugateGradientGetP_kPlusOneImageFilter); +#endif /** Standard class type alias. */ using Self = ConjugateGradientGetP_kPlusOneImageFilter; diff --git a/include/rtkConjugateGradientGetR_kPlusOneImageFilter.h b/include/rtkConjugateGradientGetR_kPlusOneImageFilter.h index cdae35a67..0e1e835b1 100644 --- a/include/rtkConjugateGradientGetR_kPlusOneImageFilter.h +++ b/include/rtkConjugateGradientGetR_kPlusOneImageFilter.h @@ -37,7 +37,11 @@ template class ConjugateGradientGetR_kPlusOneImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ConjugateGradientGetR_kPlusOneImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ConjugateGradientGetR_kPlusOneImageFilter); +#endif /** Standard class type alias. */ using Self = ConjugateGradientGetR_kPlusOneImageFilter; diff --git a/include/rtkConjugateGradientGetX_kPlusOneImageFilter.h b/include/rtkConjugateGradientGetX_kPlusOneImageFilter.h index bb7610a52..77e0bf3a0 100644 --- a/include/rtkConjugateGradientGetX_kPlusOneImageFilter.h +++ b/include/rtkConjugateGradientGetX_kPlusOneImageFilter.h @@ -35,7 +35,11 @@ template class ConjugateGradientGetX_kPlusOneImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ConjugateGradientGetX_kPlusOneImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ConjugateGradientGetX_kPlusOneImageFilter); +#endif /** Standard class type alias. */ using Self = ConjugateGradientGetX_kPlusOneImageFilter; diff --git a/include/rtkConjugateGradientImageFilter.h b/include/rtkConjugateGradientImageFilter.h index 521994aca..e70a1c5a3 100644 --- a/include/rtkConjugateGradientImageFilter.h +++ b/include/rtkConjugateGradientImageFilter.h @@ -46,7 +46,11 @@ template class ConjugateGradientImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ConjugateGradientImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ConjugateGradientImageFilter); +#endif /** Standard class type alias. */ using Self = ConjugateGradientImageFilter; diff --git a/include/rtkConjugateGradientOperator.h b/include/rtkConjugateGradientOperator.h index a35c5b16f..0b5c4e0a3 100644 --- a/include/rtkConjugateGradientOperator.h +++ b/include/rtkConjugateGradientOperator.h @@ -32,7 +32,11 @@ template class ConjugateGradientOperator : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ConjugateGradientOperator); +#else + ITK_DISALLOW_COPY_AND_MOVE(ConjugateGradientOperator); +#endif /** Standard class type alias. */ using Self = ConjugateGradientOperator; diff --git a/include/rtkConstantImageSource.h b/include/rtkConstantImageSource.h index 3b01b1252..6c5570be8 100644 --- a/include/rtkConstantImageSource.h +++ b/include/rtkConstantImageSource.h @@ -51,7 +51,11 @@ template class ITK_EXPORT ConstantImageSource : public itk::ImageSource { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ConstantImageSource); +#else + ITK_DISALLOW_COPY_AND_MOVE(ConstantImageSource); +#endif /** Standard class type alias. */ using Self = ConstantImageSource; diff --git a/include/rtkConvexShape.h b/include/rtkConvexShape.h index 100bec750..7a04c367a 100644 --- a/include/rtkConvexShape.h +++ b/include/rtkConvexShape.h @@ -46,7 +46,11 @@ namespace rtk class RTK_EXPORT ConvexShape : public itk::DataObject { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ConvexShape); +#else + ITK_DISALLOW_COPY_AND_MOVE(ConvexShape); +#endif /** Standard class type alias. */ using Self = ConvexShape; diff --git a/include/rtkCudaAverageOutOfROIImageFilter.h b/include/rtkCudaAverageOutOfROIImageFilter.h index 37a92d48e..233353d85 100644 --- a/include/rtkCudaAverageOutOfROIImageFilter.h +++ b/include/rtkCudaAverageOutOfROIImageFilter.h @@ -47,7 +47,11 @@ class RTK_EXPORT CudaAverageOutOfROIImageFilter { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaAverageOutOfROIImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaAverageOutOfROIImageFilter); +# endif /** Standard class type alias. */ using Self = rtk::CudaAverageOutOfROIImageFilter; diff --git a/include/rtkCudaBackProjectionImageFilter.h b/include/rtkCudaBackProjectionImageFilter.h index e3bb0bd3f..c71e0c182 100644 --- a/include/rtkCudaBackProjectionImageFilter.h +++ b/include/rtkCudaBackProjectionImageFilter.h @@ -51,7 +51,11 @@ class ITK_EXPORT CudaBackProjectionImageFilter : public itk::CudaInPlaceImageFilter> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaBackProjectionImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaBackProjectionImageFilter); +# endif /** Standard class type alias. */ using BackProjectionImageFilterType = BackProjectionImageFilter; diff --git a/include/rtkCudaConjugateGradientImageFilter.h b/include/rtkCudaConjugateGradientImageFilter.h index a7799459c..c77f7eb6b 100644 --- a/include/rtkCudaConjugateGradientImageFilter.h +++ b/include/rtkCudaConjugateGradientImageFilter.h @@ -45,7 +45,11 @@ class CudaConjugateGradientImageFilter : public itk::CudaImageToImageFilter> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaConjugateGradientImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaConjugateGradientImageFilter); +# endif /** Standard class type alias. */ using Self = rtk::CudaConjugateGradientImageFilter; diff --git a/include/rtkCudaConstantVolumeSeriesSource.h b/include/rtkCudaConstantVolumeSeriesSource.h index 14ba341f2..ff8cd78e3 100644 --- a/include/rtkCudaConstantVolumeSeriesSource.h +++ b/include/rtkCudaConstantVolumeSeriesSource.h @@ -46,7 +46,11 @@ class RTK_EXPORT CudaConstantVolumeSeriesSource ConstantImageSource>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaConstantVolumeSeriesSource); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaConstantVolumeSeriesSource); +# endif /** Standard class type alias. */ using Self = rtk::CudaConstantVolumeSeriesSource; diff --git a/include/rtkCudaConstantVolumeSource.h b/include/rtkCudaConstantVolumeSource.h index 68db60a6b..416f6fe36 100644 --- a/include/rtkCudaConstantVolumeSource.h +++ b/include/rtkCudaConstantVolumeSource.h @@ -46,7 +46,11 @@ class RTK_EXPORT CudaConstantVolumeSource ConstantImageSource>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaConstantVolumeSource); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaConstantVolumeSource); +# endif /** Standard class type alias. */ using Self = rtk::CudaConstantVolumeSource; diff --git a/include/rtkCudaCropImageFilter.h b/include/rtkCudaCropImageFilter.h index 8943797e8..01b8314d8 100644 --- a/include/rtkCudaCropImageFilter.h +++ b/include/rtkCudaCropImageFilter.h @@ -51,7 +51,11 @@ class RTK_EXPORT CudaCropImageFilter itk::CropImageFilter, itk::CudaImage>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaCropImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaCropImageFilter); +# endif /** Standard class type alias. */ using ImageType = itk::CudaImage; diff --git a/include/rtkCudaCyclicDeformationImageFilter.h b/include/rtkCudaCyclicDeformationImageFilter.h index a144e18c3..a6c050832 100644 --- a/include/rtkCudaCyclicDeformationImageFilter.h +++ b/include/rtkCudaCyclicDeformationImageFilter.h @@ -48,7 +48,11 @@ class RTK_EXPORT CudaCyclicDeformationImageFilter itk::CudaImage, 3>>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaCyclicDeformationImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaCyclicDeformationImageFilter); +# endif /** Standard class type alias. */ using Self = rtk::CudaCyclicDeformationImageFilter; diff --git a/include/rtkCudaDisplacedDetectorImageFilter.h b/include/rtkCudaDisplacedDetectorImageFilter.h index c3b7b33e6..8f1e35637 100644 --- a/include/rtkCudaDisplacedDetectorImageFilter.h +++ b/include/rtkCudaDisplacedDetectorImageFilter.h @@ -52,7 +52,11 @@ class RTK_EXPORT CudaDisplacedDetectorImageFilter rtk::DisplacedDetectorImageFilter>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaDisplacedDetectorImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaDisplacedDetectorImageFilter); +# endif /** Convenience type alias **/ using ImageType = itk::CudaImage; diff --git a/include/rtkCudaFDKBackProjectionImageFilter.h b/include/rtkCudaFDKBackProjectionImageFilter.h index baa787462..547ecc08a 100644 --- a/include/rtkCudaFDKBackProjectionImageFilter.h +++ b/include/rtkCudaFDKBackProjectionImageFilter.h @@ -49,7 +49,11 @@ class RTK_EXPORT CudaFDKBackProjectionImageFilter FDKBackProjectionImageFilter, itk::CudaImage>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaFDKBackProjectionImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaFDKBackProjectionImageFilter); +# endif /** Standard class type alias. */ using ImageType = itk::CudaImage; diff --git a/include/rtkCudaFDKConeBeamReconstructionFilter.h b/include/rtkCudaFDKConeBeamReconstructionFilter.h index 7d78f8a4f..c72c1a84b 100644 --- a/include/rtkCudaFDKConeBeamReconstructionFilter.h +++ b/include/rtkCudaFDKConeBeamReconstructionFilter.h @@ -53,7 +53,11 @@ class RTK_EXPORT CudaFDKConeBeamReconstructionFilter FDKConeBeamReconstructionFilter, itk::CudaImage, float>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaFDKConeBeamReconstructionFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaFDKConeBeamReconstructionFilter); +# endif /** Standard class type alias. */ using Self = CudaFDKConeBeamReconstructionFilter; diff --git a/include/rtkCudaFDKWeightProjectionFilter.h b/include/rtkCudaFDKWeightProjectionFilter.h index 9fc91cd39..3e3dcd7c1 100644 --- a/include/rtkCudaFDKWeightProjectionFilter.h +++ b/include/rtkCudaFDKWeightProjectionFilter.h @@ -53,7 +53,11 @@ class RTK_EXPORT CudaFDKWeightProjectionFilter rtk::FDKWeightProjectionFilter>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaFDKWeightProjectionFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaFDKWeightProjectionFilter); +# endif /** Convenience type alias **/ using ImageType = itk::CudaImage; diff --git a/include/rtkCudaFFTProjectionsConvolutionImageFilter.h b/include/rtkCudaFFTProjectionsConvolutionImageFilter.h index a2c13c56e..239d4aa05 100644 --- a/include/rtkCudaFFTProjectionsConvolutionImageFilter.h +++ b/include/rtkCudaFFTProjectionsConvolutionImageFilter.h @@ -50,7 +50,11 @@ class CudaFFTProjectionsConvolutionImageFilter : public itk::CudaImageToImageFilter, itk::CudaImage, TParentImageFilter> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaFFTProjectionsConvolutionImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaFFTProjectionsConvolutionImageFilter); +# endif /** Standard class type alias. */ using Self = CudaFFTProjectionsConvolutionImageFilter; diff --git a/include/rtkCudaFFTRampImageFilter.h b/include/rtkCudaFFTRampImageFilter.h index b07089bc9..a6c76bbb9 100644 --- a/include/rtkCudaFFTRampImageFilter.h +++ b/include/rtkCudaFFTRampImageFilter.h @@ -43,7 +43,11 @@ class CudaFFTRampImageFilter FFTRampImageFilter, itk::CudaImage, float>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaFFTRampImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaFFTRampImageFilter); +# endif /** Standard class type alias. */ using Self = CudaFFTRampImageFilter; diff --git a/include/rtkCudaForwardProjectionImageFilter.h b/include/rtkCudaForwardProjectionImageFilter.h index 94e46345e..b605f6b12 100644 --- a/include/rtkCudaForwardProjectionImageFilter.h +++ b/include/rtkCudaForwardProjectionImageFilter.h @@ -54,7 +54,11 @@ class ITK_EXPORT CudaForwardProjectionImageFilter CudaInPlaceImageFilter> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaForwardProjectionImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaForwardProjectionImageFilter); +# endif /** Standard class type alias. */ using Self = CudaForwardProjectionImageFilter; diff --git a/include/rtkCudaForwardWarpImageFilter.h b/include/rtkCudaForwardWarpImageFilter.h index e8ffa7564..9c1cebee2 100644 --- a/include/rtkCudaForwardWarpImageFilter.h +++ b/include/rtkCudaForwardWarpImageFilter.h @@ -52,7 +52,11 @@ class RTK_EXPORT CudaForwardWarpImageFilter itk::CudaImage, 3>>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaForwardWarpImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaForwardWarpImageFilter); +# endif /** Standard class type alias. */ using ImageType = itk::CudaImage; diff --git a/include/rtkCudaInterpolateImageFilter.h b/include/rtkCudaInterpolateImageFilter.h index 6527d00fd..ecdd946b7 100644 --- a/include/rtkCudaInterpolateImageFilter.h +++ b/include/rtkCudaInterpolateImageFilter.h @@ -47,7 +47,11 @@ class RTK_EXPORT CudaInterpolateImageFilter InterpolatorWithKnownWeightsImageFilter, itk::CudaImage>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaInterpolateImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaInterpolateImageFilter); +# endif /** Standard class type alias. */ using Self = rtk::CudaInterpolateImageFilter; diff --git a/include/rtkCudaIterativeFDKConeBeamReconstructionFilter.h b/include/rtkCudaIterativeFDKConeBeamReconstructionFilter.h index e095e714d..f9a0761b4 100644 --- a/include/rtkCudaIterativeFDKConeBeamReconstructionFilter.h +++ b/include/rtkCudaIterativeFDKConeBeamReconstructionFilter.h @@ -55,7 +55,11 @@ class RTK_EXPORT CudaIterativeFDKConeBeamReconstructionFilter IterativeFDKConeBeamReconstructionFilter, itk::CudaImage, float>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaIterativeFDKConeBeamReconstructionFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaIterativeFDKConeBeamReconstructionFilter); +# endif /** Standard class type alias. */ using Self = CudaIterativeFDKConeBeamReconstructionFilter; diff --git a/include/rtkCudaLagCorrectionImageFilter.h b/include/rtkCudaLagCorrectionImageFilter.h index 5a98b651f..e0d706197 100644 --- a/include/rtkCudaLagCorrectionImageFilter.h +++ b/include/rtkCudaLagCorrectionImageFilter.h @@ -51,7 +51,11 @@ class RTK_EXPORT CudaLagCorrectionImageFilter LagCorrectionImageFilter, 4>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaLagCorrectionImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaLagCorrectionImageFilter); +# endif /** Convenience type alias **/ using ImageType = itk::CudaImage; diff --git a/include/rtkCudaLaplacianImageFilter.h b/include/rtkCudaLaplacianImageFilter.h index 9091c4cd9..b86f4c05e 100644 --- a/include/rtkCudaLaplacianImageFilter.h +++ b/include/rtkCudaLaplacianImageFilter.h @@ -45,7 +45,11 @@ class RTK_EXPORT CudaLaplacianImageFilter LaplacianImageFilter, itk::CudaImage, 3>>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaLaplacianImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaLaplacianImageFilter); +# endif /** Standard class type alias. */ using Self = rtk::CudaLaplacianImageFilter; diff --git a/include/rtkCudaLastDimensionTVDenoisingImageFilter.h b/include/rtkCudaLastDimensionTVDenoisingImageFilter.h index 98f4a6dc6..497f2ea53 100644 --- a/include/rtkCudaLastDimensionTVDenoisingImageFilter.h +++ b/include/rtkCudaLastDimensionTVDenoisingImageFilter.h @@ -49,7 +49,11 @@ class RTK_EXPORT CudaLastDimensionTVDenoisingImageFilter itk::CudaImage, 4>>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaLastDimensionTVDenoisingImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaLastDimensionTVDenoisingImageFilter); +# endif /** Standard class type alias. */ using Self = rtk::CudaLastDimensionTVDenoisingImageFilter; diff --git a/include/rtkCudaParkerShortScanImageFilter.h b/include/rtkCudaParkerShortScanImageFilter.h index 027965aca..eadb5db22 100644 --- a/include/rtkCudaParkerShortScanImageFilter.h +++ b/include/rtkCudaParkerShortScanImageFilter.h @@ -52,7 +52,11 @@ class RTK_EXPORT CudaParkerShortScanImageFilter rtk::ParkerShortScanImageFilter>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaParkerShortScanImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaParkerShortScanImageFilter); +# endif /** Convenience type alias **/ using ImageType = itk::CudaImage; diff --git a/include/rtkCudaPolynomialGainCorrectionImageFilter.h b/include/rtkCudaPolynomialGainCorrectionImageFilter.h index ea2f27e78..c6914e851 100644 --- a/include/rtkCudaPolynomialGainCorrectionImageFilter.h +++ b/include/rtkCudaPolynomialGainCorrectionImageFilter.h @@ -52,7 +52,11 @@ class RTK_EXPORT CudaPolynomialGainCorrectionImageFilter PolynomialGainCorrectionImageFilter, itk::CudaImage>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaPolynomialGainCorrectionImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaPolynomialGainCorrectionImageFilter); +# endif /** Convenience type alias **/ using ImageType = itk::CudaImage; diff --git a/include/rtkCudaRayCastBackProjectionImageFilter.h b/include/rtkCudaRayCastBackProjectionImageFilter.h index 4e7cf9750..233be9a6d 100644 --- a/include/rtkCudaRayCastBackProjectionImageFilter.h +++ b/include/rtkCudaRayCastBackProjectionImageFilter.h @@ -52,7 +52,11 @@ class RTK_EXPORT CudaRayCastBackProjectionImageFilter BackProjectionImageFilter, itk::CudaImage>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaRayCastBackProjectionImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaRayCastBackProjectionImageFilter); +# endif /** Standard class type alias. */ using ImageType = itk::CudaImage; diff --git a/include/rtkCudaScatterGlareCorrectionImageFilter.h b/include/rtkCudaScatterGlareCorrectionImageFilter.h index f6f929dbd..42f0e7ac6 100644 --- a/include/rtkCudaScatterGlareCorrectionImageFilter.h +++ b/include/rtkCudaScatterGlareCorrectionImageFilter.h @@ -45,7 +45,11 @@ class CudaScatterGlareCorrectionImageFilter ScatterGlareCorrectionImageFilter, itk::CudaImage, float>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaScatterGlareCorrectionImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaScatterGlareCorrectionImageFilter); +# endif /** Standard class type alias. */ using Self = CudaScatterGlareCorrectionImageFilter; diff --git a/include/rtkCudaSplatImageFilter.h b/include/rtkCudaSplatImageFilter.h index 6f36cc498..8ba98c76b 100644 --- a/include/rtkCudaSplatImageFilter.h +++ b/include/rtkCudaSplatImageFilter.h @@ -48,7 +48,11 @@ class RTK_EXPORT CudaSplatImageFilter { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaSplatImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaSplatImageFilter); +# endif /** Standard class type alias. */ using Self = rtk::CudaSplatImageFilter; diff --git a/include/rtkCudaTotalVariationDenoisingBPDQImageFilter.h b/include/rtkCudaTotalVariationDenoisingBPDQImageFilter.h index 55506eed7..e0cbf4fe0 100644 --- a/include/rtkCudaTotalVariationDenoisingBPDQImageFilter.h +++ b/include/rtkCudaTotalVariationDenoisingBPDQImageFilter.h @@ -48,7 +48,11 @@ class RTK_EXPORT CudaTotalVariationDenoisingBPDQImageFilter itk::CudaImage, 3>>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaTotalVariationDenoisingBPDQImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaTotalVariationDenoisingBPDQImageFilter); +# endif /** Standard class type alias. */ using Self = rtk::CudaTotalVariationDenoisingBPDQImageFilter; diff --git a/include/rtkCudaWarpBackProjectionImageFilter.h b/include/rtkCudaWarpBackProjectionImageFilter.h index 9ff0f6dec..1d3ec14da 100644 --- a/include/rtkCudaWarpBackProjectionImageFilter.h +++ b/include/rtkCudaWarpBackProjectionImageFilter.h @@ -50,7 +50,11 @@ class RTK_EXPORT CudaWarpBackProjectionImageFilter BackProjectionImageFilter, itk::CudaImage>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaWarpBackProjectionImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaWarpBackProjectionImageFilter); +# endif /** Standard class type alias. */ using ImageType = itk::CudaImage; diff --git a/include/rtkCudaWarpForwardProjectionImageFilter.h b/include/rtkCudaWarpForwardProjectionImageFilter.h index 4013b258f..22906286b 100644 --- a/include/rtkCudaWarpForwardProjectionImageFilter.h +++ b/include/rtkCudaWarpForwardProjectionImageFilter.h @@ -50,7 +50,11 @@ class RTK_EXPORT CudaWarpForwardProjectionImageFilter ForwardProjectionImageFilter, itk::CudaImage>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaWarpForwardProjectionImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaWarpForwardProjectionImageFilter); +# endif /** Standard class type alias. */ using InputImageType = itk::CudaImage; diff --git a/include/rtkCudaWarpImageFilter.h b/include/rtkCudaWarpImageFilter.h index 7c4b9b568..180f1cdad 100644 --- a/include/rtkCudaWarpImageFilter.h +++ b/include/rtkCudaWarpImageFilter.h @@ -51,7 +51,11 @@ class RTK_EXPORT CudaWarpImageFilter itk::CudaImage, 3>>> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaWarpImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaWarpImageFilter); +# endif /** Standard class type alias. */ using ImageType = itk::CudaImage; diff --git a/include/rtkCudaWeidingerForwardModelImageFilter.h b/include/rtkCudaWeidingerForwardModelImageFilter.h index 285d71abb..91b541329 100644 --- a/include/rtkCudaWeidingerForwardModelImageFilter.h +++ b/include/rtkCudaWeidingerForwardModelImageFilter.h @@ -50,7 +50,11 @@ class ITK_EXPORT CudaWeidingerForwardModelImageFilter WeidingerForwardModelImageFilter> { public: +# if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CudaWeidingerForwardModelImageFilter); +# else + ITK_DISALLOW_COPY_AND_MOVE(CudaWeidingerForwardModelImageFilter); +# endif /** Standard class type alias. */ using Self = CudaWeidingerForwardModelImageFilter; diff --git a/include/rtkCyclicDeformationImageFilter.h b/include/rtkCyclicDeformationImageFilter.h index 1ddfe40ad..fffacef03 100644 --- a/include/rtkCyclicDeformationImageFilter.h +++ b/include/rtkCyclicDeformationImageFilter.h @@ -50,7 +50,11 @@ template class ITK_EXPORT CyclicDeformationImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(CyclicDeformationImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(CyclicDeformationImageFilter); +#endif /** Standard class type alias. */ using Self = CyclicDeformationImageFilter; diff --git a/include/rtkDCMImagXImageIO.h b/include/rtkDCMImagXImageIO.h index 2a70ae046..96b0f969d 100644 --- a/include/rtkDCMImagXImageIO.h +++ b/include/rtkDCMImagXImageIO.h @@ -35,7 +35,11 @@ namespace rtk class DCMImagXImageIO : public itk::GDCMImageIO { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DCMImagXImageIO); +#else + ITK_DISALLOW_COPY_AND_MOVE(DCMImagXImageIO); +#endif /** Standard class type alias. */ using Self = DCMImagXImageIO; diff --git a/include/rtkDCMImagXImageIOFactory.h b/include/rtkDCMImagXImageIOFactory.h index 70ed051fc..0d76d3776 100644 --- a/include/rtkDCMImagXImageIOFactory.h +++ b/include/rtkDCMImagXImageIOFactory.h @@ -37,7 +37,11 @@ namespace rtk class RTK_EXPORT DCMImagXImageIOFactory : public itk::ObjectFactoryBase { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DCMImagXImageIOFactory); +#else + ITK_DISALLOW_COPY_AND_MOVE(DCMImagXImageIOFactory); +#endif /** Standard class type alias. */ using Self = DCMImagXImageIOFactory; diff --git a/include/rtkDPExtractShroudSignalImageFilter.h b/include/rtkDPExtractShroudSignalImageFilter.h index 2979885aa..f54547447 100644 --- a/include/rtkDPExtractShroudSignalImageFilter.h +++ b/include/rtkDPExtractShroudSignalImageFilter.h @@ -39,7 +39,11 @@ class ITK_EXPORT DPExtractShroudSignalImageFilter : public itk::ImageToImageFilter, itk::Image> { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DPExtractShroudSignalImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(DPExtractShroudSignalImageFilter); +#endif /** Standard class type alias. */ using TInputImage = itk::Image; diff --git a/include/rtkDaubechiesWaveletsConvolutionImageFilter.h b/include/rtkDaubechiesWaveletsConvolutionImageFilter.h index c2288d4c2..c1807059f 100644 --- a/include/rtkDaubechiesWaveletsConvolutionImageFilter.h +++ b/include/rtkDaubechiesWaveletsConvolutionImageFilter.h @@ -45,7 +45,11 @@ template class DaubechiesWaveletsConvolutionImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DaubechiesWaveletsConvolutionImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(DaubechiesWaveletsConvolutionImageFilter); +#endif enum Pass { diff --git a/include/rtkDaubechiesWaveletsDenoiseSequenceImageFilter.h b/include/rtkDaubechiesWaveletsDenoiseSequenceImageFilter.h index e50165630..2b7df3999 100644 --- a/include/rtkDaubechiesWaveletsDenoiseSequenceImageFilter.h +++ b/include/rtkDaubechiesWaveletsDenoiseSequenceImageFilter.h @@ -74,7 +74,11 @@ template class DaubechiesWaveletsDenoiseSequenceImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DaubechiesWaveletsDenoiseSequenceImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(DaubechiesWaveletsDenoiseSequenceImageFilter); +#endif /** Standard class type alias. */ using Self = DaubechiesWaveletsDenoiseSequenceImageFilter; diff --git a/include/rtkDePierroRegularizationImageFilter.h b/include/rtkDePierroRegularizationImageFilter.h index 3da7bbd98..b42f373cb 100644 --- a/include/rtkDePierroRegularizationImageFilter.h +++ b/include/rtkDePierroRegularizationImageFilter.h @@ -75,7 +75,11 @@ template class ITK_EXPORT DePierroRegularizationImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DePierroRegularizationImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(DePierroRegularizationImageFilter); +#endif /** Standard class type alias. */ using Self = DePierroRegularizationImageFilter; diff --git a/include/rtkDeconstructImageFilter.h b/include/rtkDeconstructImageFilter.h index f7ca14df4..fb55ffe55 100644 --- a/include/rtkDeconstructImageFilter.h +++ b/include/rtkDeconstructImageFilter.h @@ -128,7 +128,11 @@ template class DeconstructImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DeconstructImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(DeconstructImageFilter); +#endif /** Standard class type alias. */ using Self = DeconstructImageFilter; diff --git a/include/rtkDeconstructSoftThresholdReconstructImageFilter.h b/include/rtkDeconstructSoftThresholdReconstructImageFilter.h index 42c247494..452c12344 100644 --- a/include/rtkDeconstructSoftThresholdReconstructImageFilter.h +++ b/include/rtkDeconstructSoftThresholdReconstructImageFilter.h @@ -47,7 +47,11 @@ template class DeconstructSoftThresholdReconstructImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DeconstructSoftThresholdReconstructImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(DeconstructSoftThresholdReconstructImageFilter); +#endif /** Standard class type alias. */ using Self = DeconstructSoftThresholdReconstructImageFilter; diff --git a/include/rtkDenoisingBPDQImageFilter.h b/include/rtkDenoisingBPDQImageFilter.h index b0c018dbb..04ab2938c 100644 --- a/include/rtkDenoisingBPDQImageFilter.h +++ b/include/rtkDenoisingBPDQImageFilter.h @@ -41,7 +41,11 @@ template class DenoisingBPDQImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DenoisingBPDQImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(DenoisingBPDQImageFilter); +#endif /** Standard class type alias. */ using Self = DenoisingBPDQImageFilter; diff --git a/include/rtkDigisensGeometryReader.h b/include/rtkDigisensGeometryReader.h index 52127e0de..5a03e81a0 100644 --- a/include/rtkDigisensGeometryReader.h +++ b/include/rtkDigisensGeometryReader.h @@ -40,7 +40,11 @@ namespace rtk class RTK_EXPORT DigisensGeometryReader : public itk::LightProcessObject { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DigisensGeometryReader); +#else + ITK_DISALLOW_COPY_AND_MOVE(DigisensGeometryReader); +#endif /** Standard type alias */ using Self = DigisensGeometryReader; diff --git a/include/rtkDigisensGeometryXMLFileReader.h b/include/rtkDigisensGeometryXMLFileReader.h index 8e8869303..4f2b826e3 100644 --- a/include/rtkDigisensGeometryXMLFileReader.h +++ b/include/rtkDigisensGeometryXMLFileReader.h @@ -41,7 +41,11 @@ namespace rtk class DigisensGeometryXMLFileReader : public itk::XMLReader { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DigisensGeometryXMLFileReader); +#else + ITK_DISALLOW_COPY_AND_MOVE(DigisensGeometryXMLFileReader); +#endif /** Standard type alias */ using Self = DigisensGeometryXMLFileReader; diff --git a/include/rtkDisplacedDetectorForOffsetFieldOfViewImageFilter.h b/include/rtkDisplacedDetectorForOffsetFieldOfViewImageFilter.h index 364ed8375..3b16cd918 100644 --- a/include/rtkDisplacedDetectorForOffsetFieldOfViewImageFilter.h +++ b/include/rtkDisplacedDetectorForOffsetFieldOfViewImageFilter.h @@ -42,7 +42,11 @@ class ITK_EXPORT DisplacedDetectorForOffsetFieldOfViewImageFilter : public rtk::DisplacedDetectorImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DisplacedDetectorForOffsetFieldOfViewImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(DisplacedDetectorForOffsetFieldOfViewImageFilter); +#endif /** Standard class type alias. */ using Self = DisplacedDetectorForOffsetFieldOfViewImageFilter; diff --git a/include/rtkDisplacedDetectorImageFilter.h b/include/rtkDisplacedDetectorImageFilter.h index 063ca8f2f..1604610a9 100644 --- a/include/rtkDisplacedDetectorImageFilter.h +++ b/include/rtkDisplacedDetectorImageFilter.h @@ -60,7 +60,11 @@ template class ITK_EXPORT DisplacedDetectorImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DisplacedDetectorImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(DisplacedDetectorImageFilter); +#endif /** Standard class type alias. */ using Self = DisplacedDetectorImageFilter; diff --git a/include/rtkDivergenceOfGradientConjugateGradientOperator.h b/include/rtkDivergenceOfGradientConjugateGradientOperator.h index f204a75df..941fc4584 100644 --- a/include/rtkDivergenceOfGradientConjugateGradientOperator.h +++ b/include/rtkDivergenceOfGradientConjugateGradientOperator.h @@ -38,7 +38,11 @@ template class DivergenceOfGradientConjugateGradientOperator : public ConjugateGradientOperator { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DivergenceOfGradientConjugateGradientOperator); +#else + ITK_DISALLOW_COPY_AND_MOVE(DivergenceOfGradientConjugateGradientOperator); +#endif /** Extract dimension from input and output image. */ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension); diff --git a/include/rtkDownsampleImageFilter.h b/include/rtkDownsampleImageFilter.h index f7f5a28e3..416bb8e01 100644 --- a/include/rtkDownsampleImageFilter.h +++ b/include/rtkDownsampleImageFilter.h @@ -38,7 +38,11 @@ template class ITK_EXPORT DownsampleImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DownsampleImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(DownsampleImageFilter); +#endif /** Standard class type alias. */ using Self = DownsampleImageFilter; diff --git a/include/rtkDrawBoxImageFilter.h b/include/rtkDrawBoxImageFilter.h index b3b4582f1..0ec26d3e2 100644 --- a/include/rtkDrawBoxImageFilter.h +++ b/include/rtkDrawBoxImageFilter.h @@ -39,7 +39,11 @@ template class DrawBoxImageFilter : public DrawConvexImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DrawBoxImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(DrawBoxImageFilter); +#endif /** Standard class type alias. */ using Self = DrawBoxImageFilter; diff --git a/include/rtkDrawConeImageFilter.h b/include/rtkDrawConeImageFilter.h index 2b2f92843..ae2b1dde2 100644 --- a/include/rtkDrawConeImageFilter.h +++ b/include/rtkDrawConeImageFilter.h @@ -38,7 +38,11 @@ template class DrawConeImageFilter : public DrawEllipsoidImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DrawConeImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(DrawConeImageFilter); +#endif /** Standard class type alias. */ using Self = DrawConeImageFilter; diff --git a/include/rtkDrawConvexImageFilter.h b/include/rtkDrawConvexImageFilter.h index 3bc06a1f4..3960a9e3d 100644 --- a/include/rtkDrawConvexImageFilter.h +++ b/include/rtkDrawConvexImageFilter.h @@ -42,7 +42,11 @@ template class DrawConvexImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DrawConvexImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(DrawConvexImageFilter); +#endif /** Standard class type alias. */ using Self = DrawConvexImageFilter; diff --git a/include/rtkDrawCylinderImageFilter.h b/include/rtkDrawCylinderImageFilter.h index 4b9fe9c88..1d6044645 100644 --- a/include/rtkDrawCylinderImageFilter.h +++ b/include/rtkDrawCylinderImageFilter.h @@ -42,7 +42,11 @@ template class DrawCylinderImageFilter : public DrawEllipsoidImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DrawCylinderImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(DrawCylinderImageFilter); +#endif /** Standard class type alias. */ using Self = DrawCylinderImageFilter; diff --git a/include/rtkDrawEllipsoidImageFilter.h b/include/rtkDrawEllipsoidImageFilter.h index d5eb5f129..ef25ff965 100644 --- a/include/rtkDrawEllipsoidImageFilter.h +++ b/include/rtkDrawEllipsoidImageFilter.h @@ -38,7 +38,11 @@ template class DrawEllipsoidImageFilter : public DrawConvexImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DrawEllipsoidImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(DrawEllipsoidImageFilter); +#endif /** Standard class type alias. */ using Self = DrawEllipsoidImageFilter; diff --git a/include/rtkDrawGeometricPhantomImageFilter.h b/include/rtkDrawGeometricPhantomImageFilter.h index 5776ceb7f..cec6a55db 100644 --- a/include/rtkDrawGeometricPhantomImageFilter.h +++ b/include/rtkDrawGeometricPhantomImageFilter.h @@ -39,7 +39,11 @@ template class DrawGeometricPhantomImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DrawGeometricPhantomImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(DrawGeometricPhantomImageFilter); +#endif /** Standard class type alias. */ using Self = DrawGeometricPhantomImageFilter; diff --git a/include/rtkDrawQuadricImageFilter.h b/include/rtkDrawQuadricImageFilter.h index 22bba20e8..e5b1c1b39 100644 --- a/include/rtkDrawQuadricImageFilter.h +++ b/include/rtkDrawQuadricImageFilter.h @@ -38,7 +38,11 @@ template class DrawQuadricImageFilter : public DrawConvexImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DrawQuadricImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(DrawQuadricImageFilter); +#endif /** Standard class type alias. */ using Self = DrawQuadricImageFilter; diff --git a/include/rtkDrawSheppLoganFilter.h b/include/rtkDrawSheppLoganFilter.h index 805382866..c37cb12de 100644 --- a/include/rtkDrawSheppLoganFilter.h +++ b/include/rtkDrawSheppLoganFilter.h @@ -40,7 +40,11 @@ template class ITK_EXPORT DrawSheppLoganFilter : public DrawGeometricPhantomImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DrawSheppLoganFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(DrawSheppLoganFilter); +#endif /** Standard class type alias. */ using Self = DrawSheppLoganFilter; diff --git a/include/rtkDualEnergyNegativeLogLikelihood.h b/include/rtkDualEnergyNegativeLogLikelihood.h index 3f522ce09..3ea63d311 100644 --- a/include/rtkDualEnergyNegativeLogLikelihood.h +++ b/include/rtkDualEnergyNegativeLogLikelihood.h @@ -43,7 +43,11 @@ namespace rtk class DualEnergyNegativeLogLikelihood : public rtk::ProjectionsDecompositionNegativeLogLikelihood { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(DualEnergyNegativeLogLikelihood); +#else + ITK_DISALLOW_COPY_AND_MOVE(DualEnergyNegativeLogLikelihood); +#endif using Self = DualEnergyNegativeLogLikelihood; using Superclass = rtk::ProjectionsDecompositionNegativeLogLikelihood; diff --git a/include/rtkEdfImageIO.h b/include/rtkEdfImageIO.h index 66499c56b..10c377541 100644 --- a/include/rtkEdfImageIO.h +++ b/include/rtkEdfImageIO.h @@ -39,7 +39,11 @@ namespace rtk class EdfImageIO : public itk::ImageIOBase { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(EdfImageIO); +#else + ITK_DISALLOW_COPY_AND_MOVE(EdfImageIO); +#endif /** Standard class type alias. */ using Self = EdfImageIO; diff --git a/include/rtkEdfImageIOFactory.h b/include/rtkEdfImageIOFactory.h index 4f850d604..3c0e2ce8b 100644 --- a/include/rtkEdfImageIOFactory.h +++ b/include/rtkEdfImageIOFactory.h @@ -38,7 +38,11 @@ namespace rtk class RTK_EXPORT EdfImageIOFactory : public itk::ObjectFactoryBase { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(EdfImageIOFactory); +#else + ITK_DISALLOW_COPY_AND_MOVE(EdfImageIOFactory); +#endif /** Standard class type alias. */ using Self = EdfImageIOFactory; diff --git a/include/rtkEdfRawToAttenuationImageFilter.h b/include/rtkEdfRawToAttenuationImageFilter.h index 29ab9af7e..a643f10d9 100644 --- a/include/rtkEdfRawToAttenuationImageFilter.h +++ b/include/rtkEdfRawToAttenuationImageFilter.h @@ -39,7 +39,11 @@ template class ITKIOImageBase_HIDDEN EdfRawToAttenuationImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(EdfRawToAttenuationImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(EdfRawToAttenuationImageFilter); +#endif /** Standard class type alias. */ using Self = EdfRawToAttenuationImageFilter; diff --git a/include/rtkElektaSynergyGeometryReader.h b/include/rtkElektaSynergyGeometryReader.h index f361301a3..a5f3e95c6 100644 --- a/include/rtkElektaSynergyGeometryReader.h +++ b/include/rtkElektaSynergyGeometryReader.h @@ -39,7 +39,11 @@ namespace rtk class RTK_EXPORT ElektaSynergyGeometryReader : public itk::LightProcessObject { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ElektaSynergyGeometryReader); +#else + ITK_DISALLOW_COPY_AND_MOVE(ElektaSynergyGeometryReader); +#endif /** Standard type alias */ using Self = ElektaSynergyGeometryReader; diff --git a/include/rtkElektaSynergyLookupTableImageFilter.h b/include/rtkElektaSynergyLookupTableImageFilter.h index 8c008132e..6467d3948 100644 --- a/include/rtkElektaSynergyLookupTableImageFilter.h +++ b/include/rtkElektaSynergyLookupTableImageFilter.h @@ -43,7 +43,11 @@ class ITK_EXPORT ElektaSynergyLookupTableImageFilter : public LookupTableImageFilter, TOutputImage> { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ElektaSynergyLookupTableImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ElektaSynergyLookupTableImageFilter); +#endif /** Standard class type alias. */ using Self = ElektaSynergyLookupTableImageFilter; diff --git a/include/rtkElektaSynergyRawLookupTableImageFilter.h b/include/rtkElektaSynergyRawLookupTableImageFilter.h index a89c9a6c9..7151aaa21 100644 --- a/include/rtkElektaSynergyRawLookupTableImageFilter.h +++ b/include/rtkElektaSynergyRawLookupTableImageFilter.h @@ -43,7 +43,11 @@ class ITK_EXPORT ElektaSynergyRawLookupTableImageFilter : public LookupTableImag { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ElektaSynergyRawLookupTableImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ElektaSynergyRawLookupTableImageFilter); +#endif /** Standard class type alias. */ using Self = ElektaSynergyRawLookupTableImageFilter; diff --git a/include/rtkElektaXVI5GeometryXMLFile.h b/include/rtkElektaXVI5GeometryXMLFile.h index fb32e7964..c0a0b437f 100644 --- a/include/rtkElektaXVI5GeometryXMLFile.h +++ b/include/rtkElektaXVI5GeometryXMLFile.h @@ -46,7 +46,11 @@ namespace rtk class RTK_EXPORT ElektaXVI5GeometryXMLFileReader : public itk::XMLReader { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ElektaXVI5GeometryXMLFileReader); +#else + ITK_DISALLOW_COPY_AND_MOVE(ElektaXVI5GeometryXMLFileReader); +#endif /** Standard type alias */ using Self = ElektaXVI5GeometryXMLFileReader; diff --git a/include/rtkExtractPhaseImageFilter.h b/include/rtkExtractPhaseImageFilter.h index 74026eb07..37b1e91c5 100644 --- a/include/rtkExtractPhaseImageFilter.h +++ b/include/rtkExtractPhaseImageFilter.h @@ -47,7 +47,11 @@ template class ITK_EXPORT ExtractPhaseImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ExtractPhaseImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ExtractPhaseImageFilter); +#endif /** Standard class type alias. */ using Self = ExtractPhaseImageFilter; diff --git a/include/rtkFDKBackProjectionImageFilter.h b/include/rtkFDKBackProjectionImageFilter.h index 37bdbb26b..3d4455498 100644 --- a/include/rtkFDKBackProjectionImageFilter.h +++ b/include/rtkFDKBackProjectionImageFilter.h @@ -39,7 +39,11 @@ template class ITK_EXPORT FDKBackProjectionImageFilter : public BackProjectionImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(FDKBackProjectionImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(FDKBackProjectionImageFilter); +#endif /** Standard class type alias. */ using Self = FDKBackProjectionImageFilter; diff --git a/include/rtkFDKConeBeamReconstructionFilter.h b/include/rtkFDKConeBeamReconstructionFilter.h index 0d4634b25..57bddbebe 100644 --- a/include/rtkFDKConeBeamReconstructionFilter.h +++ b/include/rtkFDKConeBeamReconstructionFilter.h @@ -63,7 +63,11 @@ template { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(FDKConeBeamReconstructionFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(FDKConeBeamReconstructionFilter); +#endif /** Standard class type alias. */ using Self = FDKConeBeamReconstructionFilter; diff --git a/include/rtkFDKWarpBackProjectionImageFilter.h b/include/rtkFDKWarpBackProjectionImageFilter.h index 133f79b64..c6e635afc 100644 --- a/include/rtkFDKWarpBackProjectionImageFilter.h +++ b/include/rtkFDKWarpBackProjectionImageFilter.h @@ -46,7 +46,11 @@ template class ITK_EXPORT FDKWarpBackProjectionImageFilter : public FDKBackProjectionImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(FDKWarpBackProjectionImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(FDKWarpBackProjectionImageFilter); +#endif /** Standard class type alias. */ using Self = FDKWarpBackProjectionImageFilter; diff --git a/include/rtkFDKWeightProjectionFilter.h b/include/rtkFDKWeightProjectionFilter.h index 279d43ae6..1bb423358 100644 --- a/include/rtkFDKWeightProjectionFilter.h +++ b/include/rtkFDKWeightProjectionFilter.h @@ -51,7 +51,11 @@ template class ITK_EXPORT FDKWeightProjectionFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(FDKWeightProjectionFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(FDKWeightProjectionFilter); +#endif /** Standard class type alias. */ using Self = FDKWeightProjectionFilter; diff --git a/include/rtkFFTProjectionsConvolutionImageFilter.h b/include/rtkFFTProjectionsConvolutionImageFilter.h index c290bf259..e5486dec4 100644 --- a/include/rtkFFTProjectionsConvolutionImageFilter.h +++ b/include/rtkFFTProjectionsConvolutionImageFilter.h @@ -45,7 +45,11 @@ template class ITK_EXPORT FFTProjectionsConvolutionImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(FFTProjectionsConvolutionImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(FFTProjectionsConvolutionImageFilter); +#endif /** Standard class type alias. */ using Self = FFTProjectionsConvolutionImageFilter; diff --git a/include/rtkFFTRampImageFilter.h b/include/rtkFFTRampImageFilter.h index 520797fb2..b7945dd30 100644 --- a/include/rtkFFTRampImageFilter.h +++ b/include/rtkFFTRampImageFilter.h @@ -62,7 +62,11 @@ class ITK_EXPORT FFTRampImageFilter : public rtk::FFTProjectionsConvolutionImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(FFTRampImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(FFTRampImageFilter); +#endif /** Standard class type alias. */ using Self = FFTRampImageFilter; diff --git a/include/rtkFieldOfViewImageFilter.h b/include/rtkFieldOfViewImageFilter.h index f52608ed5..3333f8848 100644 --- a/include/rtkFieldOfViewImageFilter.h +++ b/include/rtkFieldOfViewImageFilter.h @@ -48,7 +48,11 @@ template class ITK_EXPORT FieldOfViewImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(FieldOfViewImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(FieldOfViewImageFilter); +#endif /** Standard class type alias. */ using Self = FieldOfViewImageFilter; diff --git a/include/rtkForbildPhantomFileReader.h b/include/rtkForbildPhantomFileReader.h index 53abab0d8..8d1083511 100644 --- a/include/rtkForbildPhantomFileReader.h +++ b/include/rtkForbildPhantomFileReader.h @@ -41,7 +41,11 @@ namespace rtk class RTK_EXPORT ForbildPhantomFileReader : public itk::LightProcessObject { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ForbildPhantomFileReader); +#else + ITK_DISALLOW_COPY_AND_MOVE(ForbildPhantomFileReader); +#endif /** Standard class type alias. */ using Self = ForbildPhantomFileReader; diff --git a/include/rtkForwardDifferenceGradientImageFilter.h b/include/rtkForwardDifferenceGradientImageFilter.h index c091ea550..049058658 100644 --- a/include/rtkForwardDifferenceGradientImageFilter.h +++ b/include/rtkForwardDifferenceGradientImageFilter.h @@ -55,7 +55,11 @@ template { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ForwardDifferenceGradientImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ForwardDifferenceGradientImageFilter); +#endif /** Extract dimension from input image. */ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension); diff --git a/include/rtkForwardProjectionImageFilter.h b/include/rtkForwardProjectionImageFilter.h index d7d99d81a..8871d8136 100644 --- a/include/rtkForwardProjectionImageFilter.h +++ b/include/rtkForwardProjectionImageFilter.h @@ -37,7 +37,11 @@ template class ForwardProjectionImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ForwardProjectionImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ForwardProjectionImageFilter); +#endif /** Standard class type alias. */ using Self = ForwardProjectionImageFilter; diff --git a/include/rtkForwardWarpImageFilter.h b/include/rtkForwardWarpImageFilter.h index d972ce421..4ca3687a7 100644 --- a/include/rtkForwardWarpImageFilter.h +++ b/include/rtkForwardWarpImageFilter.h @@ -45,7 +45,11 @@ template { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ForwardWarpImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ForwardWarpImageFilter); +#endif /** Standard class type alias. */ using Self = ForwardWarpImageFilter; diff --git a/include/rtkFourDConjugateGradientConeBeamReconstructionFilter.h b/include/rtkFourDConjugateGradientConeBeamReconstructionFilter.h index 1d46f806b..2449d28f5 100644 --- a/include/rtkFourDConjugateGradientConeBeamReconstructionFilter.h +++ b/include/rtkFourDConjugateGradientConeBeamReconstructionFilter.h @@ -97,7 +97,11 @@ class ITK_EXPORT FourDConjugateGradientConeBeamReconstructionFilter : public rtk::IterativeConeBeamReconstructionFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(FourDConjugateGradientConeBeamReconstructionFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(FourDConjugateGradientConeBeamReconstructionFilter); +#endif /** Standard class type alias. */ using Self = FourDConjugateGradientConeBeamReconstructionFilter; diff --git a/include/rtkFourDROOSTERConeBeamReconstructionFilter.h b/include/rtkFourDROOSTERConeBeamReconstructionFilter.h index a39b0321d..e89c38fbd 100644 --- a/include/rtkFourDROOSTERConeBeamReconstructionFilter.h +++ b/include/rtkFourDROOSTERConeBeamReconstructionFilter.h @@ -208,7 +208,11 @@ class FourDROOSTERConeBeamReconstructionFilter : public rtk::IterativeConeBeamReconstructionFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(FourDROOSTERConeBeamReconstructionFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(FourDROOSTERConeBeamReconstructionFilter); +#endif /** Standard class type alias. */ using Self = FourDROOSTERConeBeamReconstructionFilter; diff --git a/include/rtkFourDReconstructionConjugateGradientOperator.h b/include/rtkFourDReconstructionConjugateGradientOperator.h index 2c3596fa5..e5bd00948 100644 --- a/include/rtkFourDReconstructionConjugateGradientOperator.h +++ b/include/rtkFourDReconstructionConjugateGradientOperator.h @@ -130,7 +130,11 @@ template class FourDReconstructionConjugateGradientOperator : public ConjugateGradientOperator { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(FourDReconstructionConjugateGradientOperator); +#else + ITK_DISALLOW_COPY_AND_MOVE(FourDReconstructionConjugateGradientOperator); +#endif /** Standard class type alias. */ using Self = FourDReconstructionConjugateGradientOperator; diff --git a/include/rtkFourDSARTConeBeamReconstructionFilter.h b/include/rtkFourDSARTConeBeamReconstructionFilter.h index 20331fe9c..ff87cf6a0 100644 --- a/include/rtkFourDSARTConeBeamReconstructionFilter.h +++ b/include/rtkFourDSARTConeBeamReconstructionFilter.h @@ -123,7 +123,11 @@ class ITK_EXPORT FourDSARTConeBeamReconstructionFilter : public rtk::IterativeConeBeamReconstructionFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(FourDSARTConeBeamReconstructionFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(FourDSARTConeBeamReconstructionFilter); +#endif /** Standard class type alias. */ using Self = FourDSARTConeBeamReconstructionFilter; diff --git a/include/rtkFourDToProjectionStackImageFilter.h b/include/rtkFourDToProjectionStackImageFilter.h index d0c56b5ec..a15fd5fda 100644 --- a/include/rtkFourDToProjectionStackImageFilter.h +++ b/include/rtkFourDToProjectionStackImageFilter.h @@ -100,7 +100,11 @@ template class FourDToProjectionStackImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(FourDToProjectionStackImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(FourDToProjectionStackImageFilter); +#endif /** Standard class type alias. */ using Self = FourDToProjectionStackImageFilter; diff --git a/include/rtkGeometricPhantom.h b/include/rtkGeometricPhantom.h index 017a5c7e0..2e8486142 100644 --- a/include/rtkGeometricPhantom.h +++ b/include/rtkGeometricPhantom.h @@ -36,7 +36,11 @@ namespace rtk class RTK_EXPORT GeometricPhantom : public itk::DataObject { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(GeometricPhantom); +#else + ITK_DISALLOW_COPY_AND_MOVE(GeometricPhantom); +#endif /** Standard class type alias. */ using Self = GeometricPhantom; diff --git a/include/rtkGeometricPhantomFileReader.h b/include/rtkGeometricPhantomFileReader.h index 1df218de3..6584951f3 100644 --- a/include/rtkGeometricPhantomFileReader.h +++ b/include/rtkGeometricPhantomFileReader.h @@ -38,7 +38,11 @@ namespace rtk class RTK_EXPORT GeometricPhantomFileReader : public itk::LightProcessObject { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(GeometricPhantomFileReader); +#else + ITK_DISALLOW_COPY_AND_MOVE(GeometricPhantomFileReader); +#endif /** Standard class type alias. */ using Self = GeometricPhantomFileReader; diff --git a/include/rtkGetNewtonUpdateImageFilter.h b/include/rtkGetNewtonUpdateImageFilter.h index 81c32f240..a2dec66f0 100644 --- a/include/rtkGetNewtonUpdateImageFilter.h +++ b/include/rtkGetNewtonUpdateImageFilter.h @@ -45,7 +45,11 @@ template { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(GetNewtonUpdateImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(GetNewtonUpdateImageFilter); +#endif /** Standard class type alias. */ using Self = GetNewtonUpdateImageFilter; diff --git a/include/rtkGlobalResourceProbe.h b/include/rtkGlobalResourceProbe.h index 715f98f2d..17b190f3e 100644 --- a/include/rtkGlobalResourceProbe.h +++ b/include/rtkGlobalResourceProbe.h @@ -36,7 +36,11 @@ namespace rtk class RTK_EXPORT GlobalResourceProbe : public itk::Object { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(GlobalResourceProbe); +#else + ITK_DISALLOW_COPY_AND_MOVE(GlobalResourceProbe); +#endif /** Standard class type alias. */ using Self = GlobalResourceProbe; diff --git a/include/rtkHilbertImageFilter.h b/include/rtkHilbertImageFilter.h index b7a792589..bd5d0aada 100644 --- a/include/rtkHilbertImageFilter.h +++ b/include/rtkHilbertImageFilter.h @@ -44,7 +44,11 @@ template class ITK_EXPORT HilbertImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(HilbertImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(HilbertImageFilter); +#endif /** Standard class type alias. */ using Self = HilbertImageFilter; diff --git a/include/rtkHisImageIOFactory.h b/include/rtkHisImageIOFactory.h index 8530dd238..2d76909c0 100644 --- a/include/rtkHisImageIOFactory.h +++ b/include/rtkHisImageIOFactory.h @@ -41,7 +41,11 @@ namespace rtk class RTK_EXPORT HisImageIOFactory : public itk::ObjectFactoryBase { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(HisImageIOFactory); +#else + ITK_DISALLOW_COPY_AND_MOVE(HisImageIOFactory); +#endif /** Standard class type alias. */ using Self = HisImageIOFactory; diff --git a/include/rtkHndImageIOFactory.h b/include/rtkHndImageIOFactory.h index 2dd6c7753..133835a45 100644 --- a/include/rtkHndImageIOFactory.h +++ b/include/rtkHndImageIOFactory.h @@ -43,7 +43,11 @@ namespace rtk class RTK_EXPORT HndImageIOFactory : public itk::ObjectFactoryBase { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(HndImageIOFactory); +#else + ITK_DISALLOW_COPY_AND_MOVE(HndImageIOFactory); +#endif /** Standard class type alias. */ using Self = HndImageIOFactory; diff --git a/include/rtkI0EstimationProjectionFilter.h b/include/rtkI0EstimationProjectionFilter.h index 01414c190..ed1856098 100644 --- a/include/rtkI0EstimationProjectionFilter.h +++ b/include/rtkI0EstimationProjectionFilter.h @@ -46,7 +46,11 @@ template , class ITK_EXPORT I0EstimationProjectionFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(I0EstimationProjectionFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(I0EstimationProjectionFilter); +#endif /** Standard class type alias. */ using Self = I0EstimationProjectionFilter; diff --git a/include/rtkImagXGeometryReader.h b/include/rtkImagXGeometryReader.h index 1e082b4f3..87996e619 100644 --- a/include/rtkImagXGeometryReader.h +++ b/include/rtkImagXGeometryReader.h @@ -41,7 +41,11 @@ template class ImagXGeometryReader : public itk::LightProcessObject { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ImagXGeometryReader); +#else + ITK_DISALLOW_COPY_AND_MOVE(ImagXGeometryReader); +#endif /** Standard type alias */ using Self = ImagXGeometryReader; diff --git a/include/rtkImagXImageIOFactory.h b/include/rtkImagXImageIOFactory.h index 0ea89a080..f58a5b5e9 100644 --- a/include/rtkImagXImageIOFactory.h +++ b/include/rtkImagXImageIOFactory.h @@ -37,7 +37,11 @@ namespace rtk class RTK_EXPORT ImagXImageIOFactory : public itk::ObjectFactoryBase { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ImagXImageIOFactory); +#else + ITK_DISALLOW_COPY_AND_MOVE(ImagXImageIOFactory); +#endif /** Standard class type alias. */ using Self = ImagXImageIOFactory; diff --git a/include/rtkImagXXMLFileReader.h b/include/rtkImagXXMLFileReader.h index f0800acbf..fdb4405d0 100644 --- a/include/rtkImagXXMLFileReader.h +++ b/include/rtkImagXXMLFileReader.h @@ -42,7 +42,11 @@ namespace rtk class ImagXXMLFileReader : public itk::XMLReader { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ImagXXMLFileReader); +#else + ITK_DISALLOW_COPY_AND_MOVE(ImagXXMLFileReader); +#endif /** Standard type alias */ using Self = ImagXXMLFileReader; diff --git a/include/rtkImageToVectorImageFilter.h b/include/rtkImageToVectorImageFilter.h index 16f9fe881..2a73ae98d 100644 --- a/include/rtkImageToVectorImageFilter.h +++ b/include/rtkImageToVectorImageFilter.h @@ -47,7 +47,11 @@ template class ImageToVectorImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ImageToVectorImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ImageToVectorImageFilter); +#endif /** Standard class type alias. */ using Self = ImageToVectorImageFilter; diff --git a/include/rtkImportImageFilter.h b/include/rtkImportImageFilter.h index fa87811de..06204e9d6 100644 --- a/include/rtkImportImageFilter.h +++ b/include/rtkImportImageFilter.h @@ -44,7 +44,11 @@ template class ImportImageFilter : public itk::ImageSource { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ImportImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ImportImageFilter); +#endif /** Typedef for the output image. */ using OutputImagePointer = typename TImage::Pointer; diff --git a/include/rtkInterpolatorWithKnownWeightsImageFilter.h b/include/rtkInterpolatorWithKnownWeightsImageFilter.h index 77b68e255..90ef31f6b 100644 --- a/include/rtkInterpolatorWithKnownWeightsImageFilter.h +++ b/include/rtkInterpolatorWithKnownWeightsImageFilter.h @@ -64,7 +64,11 @@ template class InterpolatorWithKnownWeightsImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(InterpolatorWithKnownWeightsImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(InterpolatorWithKnownWeightsImageFilter); +#endif /** Standard class type alias. */ using Self = InterpolatorWithKnownWeightsImageFilter; diff --git a/include/rtkIterativeConeBeamReconstructionFilter.h b/include/rtkIterativeConeBeamReconstructionFilter.h index 9a8f19513..e1bacdeb2 100644 --- a/include/rtkIterativeConeBeamReconstructionFilter.h +++ b/include/rtkIterativeConeBeamReconstructionFilter.h @@ -57,7 +57,11 @@ template class ITK_EXPORT IterativeConeBeamReconstructionFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(IterativeConeBeamReconstructionFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(IterativeConeBeamReconstructionFilter); +#endif /** Standard class type alias. */ using Self = IterativeConeBeamReconstructionFilter; diff --git a/include/rtkIterativeFDKConeBeamReconstructionFilter.h b/include/rtkIterativeFDKConeBeamReconstructionFilter.h index 629740814..cd92cd0d9 100644 --- a/include/rtkIterativeFDKConeBeamReconstructionFilter.h +++ b/include/rtkIterativeFDKConeBeamReconstructionFilter.h @@ -108,7 +108,11 @@ class ITK_EXPORT IterativeFDKConeBeamReconstructionFilter : public rtk::IterativeConeBeamReconstructionFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(IterativeFDKConeBeamReconstructionFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(IterativeFDKConeBeamReconstructionFilter); +#endif /** Standard class type alias. */ using Self = IterativeFDKConeBeamReconstructionFilter; diff --git a/include/rtkJosephBackAttenuatedProjectionImageFilter.h b/include/rtkJosephBackAttenuatedProjectionImageFilter.h index 03a71087f..2aa2e2693 100644 --- a/include/rtkJosephBackAttenuatedProjectionImageFilter.h +++ b/include/rtkJosephBackAttenuatedProjectionImageFilter.h @@ -212,7 +212,11 @@ class ITK_EXPORT JosephBackAttenuatedProjectionImageFilter TSumAlongRay> { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(JosephBackAttenuatedProjectionImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(JosephBackAttenuatedProjectionImageFilter); +#endif /** Standard class type alias. */ using Self = JosephBackAttenuatedProjectionImageFilter; diff --git a/include/rtkJosephBackProjectionImageFilter.h b/include/rtkJosephBackProjectionImageFilter.h index 1709868d5..d457a95e2 100644 --- a/include/rtkJosephBackProjectionImageFilter.h +++ b/include/rtkJosephBackProjectionImageFilter.h @@ -164,7 +164,11 @@ template < class ITK_EXPORT JosephBackProjectionImageFilter : public BackProjectionImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(JosephBackProjectionImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(JosephBackProjectionImageFilter); +#endif /** Standard class type alias. */ using Self = JosephBackProjectionImageFilter; diff --git a/include/rtkJosephForwardAttenuatedProjectionImageFilter.h b/include/rtkJosephForwardAttenuatedProjectionImageFilter.h index ac287cde5..85bb3d478 100644 --- a/include/rtkJosephForwardAttenuatedProjectionImageFilter.h +++ b/include/rtkJosephForwardAttenuatedProjectionImageFilter.h @@ -270,7 +270,11 @@ class ITK_EXPORT JosephForwardAttenuatedProjectionImageFilter TSumAlongRay> { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(JosephForwardAttenuatedProjectionImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(JosephForwardAttenuatedProjectionImageFilter); +#endif /** Standard class type alias. */ using Self = JosephForwardAttenuatedProjectionImageFilter; diff --git a/include/rtkJosephForwardProjectionImageFilter.h b/include/rtkJosephForwardProjectionImageFilter.h index a8d812256..ca30da768 100644 --- a/include/rtkJosephForwardProjectionImageFilter.h +++ b/include/rtkJosephForwardProjectionImageFilter.h @@ -170,7 +170,11 @@ template { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(JosephForwardProjectionImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(JosephForwardProjectionImageFilter); +#endif /** Standard class type alias. */ using Self = JosephForwardProjectionImageFilter; diff --git a/include/rtkLUTbasedVariableI0RawToAttenuationImageFilter.h b/include/rtkLUTbasedVariableI0RawToAttenuationImageFilter.h index bf035367e..930882e43 100644 --- a/include/rtkLUTbasedVariableI0RawToAttenuationImageFilter.h +++ b/include/rtkLUTbasedVariableI0RawToAttenuationImageFilter.h @@ -78,7 +78,11 @@ template class LUTbasedVariableI0RawToAttenuationImageFilter : public LookupTableImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(LUTbasedVariableI0RawToAttenuationImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(LUTbasedVariableI0RawToAttenuationImageFilter); +#endif /** Standard class type alias. */ using Self = LUTbasedVariableI0RawToAttenuationImageFilter; diff --git a/include/rtkLagCorrectionImageFilter.h b/include/rtkLagCorrectionImageFilter.h index 07ada222a..afe229d0d 100644 --- a/include/rtkLagCorrectionImageFilter.h +++ b/include/rtkLagCorrectionImageFilter.h @@ -55,7 +55,11 @@ template class LagCorrectionImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(LagCorrectionImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(LagCorrectionImageFilter); +#endif /** Standard class type alias. */ using Self = LagCorrectionImageFilter; diff --git a/include/rtkLaplacianImageFilter.h b/include/rtkLaplacianImageFilter.h index 0adbc1fbe..15a273048 100644 --- a/include/rtkLaplacianImageFilter.h +++ b/include/rtkLaplacianImageFilter.h @@ -41,7 +41,11 @@ template class LaplacianImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(LaplacianImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(LaplacianImageFilter); +#endif /** Standard class type alias. */ using Self = LaplacianImageFilter; diff --git a/include/rtkLastDimensionL0GradientDenoisingImageFilter.h b/include/rtkLastDimensionL0GradientDenoisingImageFilter.h index 894da5efe..cac3a44d1 100644 --- a/include/rtkLastDimensionL0GradientDenoisingImageFilter.h +++ b/include/rtkLastDimensionL0GradientDenoisingImageFilter.h @@ -43,7 +43,11 @@ template class LastDimensionL0GradientDenoisingImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(LastDimensionL0GradientDenoisingImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(LastDimensionL0GradientDenoisingImageFilter); +#endif /** Standard class type alias. */ using Self = LastDimensionL0GradientDenoisingImageFilter; diff --git a/include/rtkLookupTableImageFilter.h b/include/rtkLookupTableImageFilter.h index e8f973037..23ae6402e 100644 --- a/include/rtkLookupTableImageFilter.h +++ b/include/rtkLookupTableImageFilter.h @@ -147,7 +147,11 @@ class ITK_EXPORT LookupTableImageFilter Functor::LUT> { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(LookupTableImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(LookupTableImageFilter); +#endif /** Lookup table type definition. */ using FunctorType = Functor::LUT; diff --git a/include/rtkMagnitudeThresholdImageFilter.h b/include/rtkMagnitudeThresholdImageFilter.h index e564e56f2..2e87d8ce3 100644 --- a/include/rtkMagnitudeThresholdImageFilter.h +++ b/include/rtkMagnitudeThresholdImageFilter.h @@ -40,7 +40,11 @@ template { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(MagnitudeThresholdImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(MagnitudeThresholdImageFilter); +#endif /** Standard class type alias. */ using Self = MagnitudeThresholdImageFilter; diff --git a/include/rtkMaskCollimationImageFilter.h b/include/rtkMaskCollimationImageFilter.h index 838a15ca9..b28c19158 100644 --- a/include/rtkMaskCollimationImageFilter.h +++ b/include/rtkMaskCollimationImageFilter.h @@ -40,7 +40,11 @@ template class ITK_EXPORT MaskCollimationImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(MaskCollimationImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(MaskCollimationImageFilter); +#endif /** Standard class type alias. */ using Self = MaskCollimationImageFilter; diff --git a/include/rtkMechlemOneStepSpectralReconstructionFilter.h b/include/rtkMechlemOneStepSpectralReconstructionFilter.h index 6ff22f08c..b09455d05 100644 --- a/include/rtkMechlemOneStepSpectralReconstructionFilter.h +++ b/include/rtkMechlemOneStepSpectralReconstructionFilter.h @@ -147,7 +147,11 @@ class MechlemOneStepSpectralReconstructionFilter : public rtk::IterativeConeBeamReconstructionFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(MechlemOneStepSpectralReconstructionFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(MechlemOneStepSpectralReconstructionFilter); +#endif /** Standard class type alias. */ using Self = MechlemOneStepSpectralReconstructionFilter; diff --git a/include/rtkMotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter.h b/include/rtkMotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter.h index ad1b26885..ffed91884 100644 --- a/include/rtkMotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter.h +++ b/include/rtkMotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter.h @@ -71,7 +71,11 @@ class ITK_EXPORT MotionCompensatedFourDConjugateGradientConeBeamReconstructionFi : public rtk::FourDConjugateGradientConeBeamReconstructionFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(MotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(MotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter); +#endif /** Standard class type alias. */ using Self = MotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter; diff --git a/include/rtkMotionCompensatedFourDROOSTERConeBeamReconstructionFilter.h b/include/rtkMotionCompensatedFourDROOSTERConeBeamReconstructionFilter.h index 1a9b00c89..6f52319c2 100644 --- a/include/rtkMotionCompensatedFourDROOSTERConeBeamReconstructionFilter.h +++ b/include/rtkMotionCompensatedFourDROOSTERConeBeamReconstructionFilter.h @@ -140,7 +140,11 @@ class MotionCompensatedFourDROOSTERConeBeamReconstructionFilter : public rtk::FourDROOSTERConeBeamReconstructionFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(MotionCompensatedFourDROOSTERConeBeamReconstructionFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(MotionCompensatedFourDROOSTERConeBeamReconstructionFilter); +#endif /** Standard class type alias. */ using Self = MotionCompensatedFourDROOSTERConeBeamReconstructionFilter; diff --git a/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h b/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h index 458148537..da7fcead6 100644 --- a/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h +++ b/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h @@ -101,7 +101,11 @@ class MotionCompensatedFourDReconstructionConjugateGradientOperator : public FourDReconstructionConjugateGradientOperator { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(MotionCompensatedFourDReconstructionConjugateGradientOperator); +#else + ITK_DISALLOW_COPY_AND_MOVE(MotionCompensatedFourDReconstructionConjugateGradientOperator); +#endif /** Standard class type alias. */ using Self = MotionCompensatedFourDReconstructionConjugateGradientOperator; diff --git a/include/rtkMultiplyByVectorImageFilter.h b/include/rtkMultiplyByVectorImageFilter.h index b276dc148..0bd662452 100644 --- a/include/rtkMultiplyByVectorImageFilter.h +++ b/include/rtkMultiplyByVectorImageFilter.h @@ -40,7 +40,11 @@ template class MultiplyByVectorImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(MultiplyByVectorImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(MultiplyByVectorImageFilter); +#endif /** Standard class type alias. */ using Self = MultiplyByVectorImageFilter; diff --git a/include/rtkNesterovUpdateImageFilter.h b/include/rtkNesterovUpdateImageFilter.h index ff0cc9404..9e41835a2 100644 --- a/include/rtkNesterovUpdateImageFilter.h +++ b/include/rtkNesterovUpdateImageFilter.h @@ -42,7 +42,11 @@ template class NesterovUpdateImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(NesterovUpdateImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(NesterovUpdateImageFilter); +#endif /** Standard class type alias. */ using Self = NesterovUpdateImageFilter; diff --git a/include/rtkOSEMConeBeamReconstructionFilter.h b/include/rtkOSEMConeBeamReconstructionFilter.h index 434a7ce41..8e3513f2e 100644 --- a/include/rtkOSEMConeBeamReconstructionFilter.h +++ b/include/rtkOSEMConeBeamReconstructionFilter.h @@ -119,7 +119,11 @@ class ITK_EXPORT OSEMConeBeamReconstructionFilter : public rtk::IterativeConeBeamReconstructionFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(OSEMConeBeamReconstructionFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(OSEMConeBeamReconstructionFilter); +#endif /** Standard class type alias. */ using Self = OSEMConeBeamReconstructionFilter; diff --git a/include/rtkOraGeometryReader.h b/include/rtkOraGeometryReader.h index e9ffb90a5..f637ee5ce 100644 --- a/include/rtkOraGeometryReader.h +++ b/include/rtkOraGeometryReader.h @@ -39,7 +39,11 @@ namespace rtk class RTK_EXPORT OraGeometryReader : public itk::LightProcessObject { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(OraGeometryReader); +#else + ITK_DISALLOW_COPY_AND_MOVE(OraGeometryReader); +#endif /** Standard type alias */ using Self = OraGeometryReader; diff --git a/include/rtkOraImageIOFactory.h b/include/rtkOraImageIOFactory.h index 17d9e6763..8455aa38a 100644 --- a/include/rtkOraImageIOFactory.h +++ b/include/rtkOraImageIOFactory.h @@ -40,7 +40,11 @@ namespace rtk class RTK_EXPORT OraImageIOFactory : public itk::ObjectFactoryBase { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(OraImageIOFactory); +#else + ITK_DISALLOW_COPY_AND_MOVE(OraImageIOFactory); +#endif /** Standard class type alias. */ using Self = OraImageIOFactory; diff --git a/include/rtkOraLookupTableImageFilter.h b/include/rtkOraLookupTableImageFilter.h index d4e129ad2..1403b0808 100644 --- a/include/rtkOraLookupTableImageFilter.h +++ b/include/rtkOraLookupTableImageFilter.h @@ -43,7 +43,11 @@ class ITK_EXPORT OraLookupTableImageFilter : public LookupTableImageFilter, TOutputImage> { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(OraLookupTableImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(OraLookupTableImageFilter); +#endif /** Standard class type alias. */ using Self = OraLookupTableImageFilter; diff --git a/include/rtkOraXMLFileReader.h b/include/rtkOraXMLFileReader.h index 68e531fa3..3133acb21 100644 --- a/include/rtkOraXMLFileReader.h +++ b/include/rtkOraXMLFileReader.h @@ -39,7 +39,11 @@ namespace rtk class OraXMLFileReader : public itk::XMLReader { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(OraXMLFileReader); +#else + ITK_DISALLOW_COPY_AND_MOVE(OraXMLFileReader); +#endif /** Standard type alias */ using Self = OraXMLFileReader; diff --git a/include/rtkParkerShortScanImageFilter.h b/include/rtkParkerShortScanImageFilter.h index dcb47bd3e..95550d738 100644 --- a/include/rtkParkerShortScanImageFilter.h +++ b/include/rtkParkerShortScanImageFilter.h @@ -47,7 +47,11 @@ template class ITK_EXPORT ParkerShortScanImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ParkerShortScanImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ParkerShortScanImageFilter); +#endif /** Standard class type alias. */ using Self = ParkerShortScanImageFilter; diff --git a/include/rtkPhaseGatingImageFilter.h b/include/rtkPhaseGatingImageFilter.h index a2bd45362..83db331bd 100644 --- a/include/rtkPhaseGatingImageFilter.h +++ b/include/rtkPhaseGatingImageFilter.h @@ -34,7 +34,11 @@ template class PhaseGatingImageFilter : public SubSelectImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(PhaseGatingImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(PhaseGatingImageFilter); +#endif /** Standard class type alias. */ using Self = PhaseGatingImageFilter; diff --git a/include/rtkPhaseReader.h b/include/rtkPhaseReader.h index c6944e24a..cb20ff792 100644 --- a/include/rtkPhaseReader.h +++ b/include/rtkPhaseReader.h @@ -34,7 +34,11 @@ namespace rtk class ITK_EXPORT PhaseReader : public itk::CSVFileReaderBase { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(PhaseReader); +#else + ITK_DISALLOW_COPY_AND_MOVE(PhaseReader); +#endif /** Standard class type alias */ using Self = PhaseReader; diff --git a/include/rtkPhasesToInterpolationWeights.h b/include/rtkPhasesToInterpolationWeights.h index d4918825b..af49a70db 100644 --- a/include/rtkPhasesToInterpolationWeights.h +++ b/include/rtkPhasesToInterpolationWeights.h @@ -39,7 +39,11 @@ namespace rtk class ITK_EXPORT PhasesToInterpolationWeights : public itk::CSVFileReaderBase { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(PhasesToInterpolationWeights); +#else + ITK_DISALLOW_COPY_AND_MOVE(PhasesToInterpolationWeights); +#endif /** Standard class type alias */ using Self = PhasesToInterpolationWeights; diff --git a/include/rtkPolynomialGainCorrectionImageFilter.h b/include/rtkPolynomialGainCorrectionImageFilter.h index 0a84c04fc..9e78d66fb 100644 --- a/include/rtkPolynomialGainCorrectionImageFilter.h +++ b/include/rtkPolynomialGainCorrectionImageFilter.h @@ -44,7 +44,11 @@ template class PolynomialGainCorrectionImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(PolynomialGainCorrectionImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(PolynomialGainCorrectionImageFilter); +#endif /** Standard class type alias. */ using Self = PolynomialGainCorrectionImageFilter; diff --git a/include/rtkProjectGeometricPhantomImageFilter.h b/include/rtkProjectGeometricPhantomImageFilter.h index 14cf4f88f..1962a9262 100644 --- a/include/rtkProjectGeometricPhantomImageFilter.h +++ b/include/rtkProjectGeometricPhantomImageFilter.h @@ -40,7 +40,11 @@ template class ProjectGeometricPhantomImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ProjectGeometricPhantomImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ProjectGeometricPhantomImageFilter); +#endif /** Standard class type alias. */ using Self = ProjectGeometricPhantomImageFilter; diff --git a/include/rtkProjectionGeometry.h b/include/rtkProjectionGeometry.h index e5831611f..ce60a5b1f 100644 --- a/include/rtkProjectionGeometry.h +++ b/include/rtkProjectionGeometry.h @@ -44,7 +44,11 @@ template class ProjectionGeometry : public itk::DataObject { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ProjectionGeometry); +#else + ITK_DISALLOW_COPY_AND_MOVE(ProjectionGeometry); +#endif using Self = ProjectionGeometry; using Superclass = itk::DataObject; diff --git a/include/rtkProjectionStackToFourDImageFilter.h b/include/rtkProjectionStackToFourDImageFilter.h index 8ebc8f555..0a02882ef 100644 --- a/include/rtkProjectionStackToFourDImageFilter.h +++ b/include/rtkProjectionStackToFourDImageFilter.h @@ -105,7 +105,11 @@ template { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ProjectionStackToFourDImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ProjectionStackToFourDImageFilter); +#endif /** Standard class type alias. */ using Self = ProjectionStackToFourDImageFilter; diff --git a/include/rtkProjectionsDecompositionNegativeLogLikelihood.h b/include/rtkProjectionsDecompositionNegativeLogLikelihood.h index 100547a33..ceba7dd99 100644 --- a/include/rtkProjectionsDecompositionNegativeLogLikelihood.h +++ b/include/rtkProjectionsDecompositionNegativeLogLikelihood.h @@ -39,7 +39,11 @@ namespace rtk class ProjectionsDecompositionNegativeLogLikelihood : public itk::SingleValuedCostFunction { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ProjectionsDecompositionNegativeLogLikelihood); +#else + ITK_DISALLOW_COPY_AND_MOVE(ProjectionsDecompositionNegativeLogLikelihood); +#endif using Self = ProjectionsDecompositionNegativeLogLikelihood; using Superclass = itk::SingleValuedCostFunction; diff --git a/include/rtkProjectionsReader.h b/include/rtkProjectionsReader.h index b0376f6bf..22d759b95 100644 --- a/include/rtkProjectionsReader.h +++ b/include/rtkProjectionsReader.h @@ -125,7 +125,11 @@ template class ITK_EXPORT ProjectionsReader : public itk::ImageSource { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ProjectionsReader); +#else + ITK_DISALLOW_COPY_AND_MOVE(ProjectionsReader); +#endif /** Standard class type alias. */ using Self = ProjectionsReader; diff --git a/include/rtkRayBoxIntersectionImageFilter.h b/include/rtkRayBoxIntersectionImageFilter.h index 43a74cebd..bf6664e56 100644 --- a/include/rtkRayBoxIntersectionImageFilter.h +++ b/include/rtkRayBoxIntersectionImageFilter.h @@ -39,7 +39,11 @@ template class RayBoxIntersectionImageFilter : public RayConvexIntersectionImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(RayBoxIntersectionImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(RayBoxIntersectionImageFilter); +#endif /** Standard class type alias. */ using Self = RayBoxIntersectionImageFilter; diff --git a/include/rtkRayConvexIntersectionImageFilter.h b/include/rtkRayConvexIntersectionImageFilter.h index 1c6381f75..011d2499f 100644 --- a/include/rtkRayConvexIntersectionImageFilter.h +++ b/include/rtkRayConvexIntersectionImageFilter.h @@ -40,7 +40,11 @@ template class RayConvexIntersectionImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(RayConvexIntersectionImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(RayConvexIntersectionImageFilter); +#endif /** Standard class type alias. */ using Self = RayConvexIntersectionImageFilter; diff --git a/include/rtkRayEllipsoidIntersectionImageFilter.h b/include/rtkRayEllipsoidIntersectionImageFilter.h index bdf3465d8..a0fb7a021 100644 --- a/include/rtkRayEllipsoidIntersectionImageFilter.h +++ b/include/rtkRayEllipsoidIntersectionImageFilter.h @@ -44,7 +44,11 @@ class ITK_EXPORT RayEllipsoidIntersectionImageFilter : public RayConvexIntersectionImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(RayEllipsoidIntersectionImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(RayEllipsoidIntersectionImageFilter); +#endif /** Standard class type alias. */ using Self = RayEllipsoidIntersectionImageFilter; diff --git a/include/rtkRayQuadricIntersectionImageFilter.h b/include/rtkRayQuadricIntersectionImageFilter.h index a18802ebe..0abde5bfa 100644 --- a/include/rtkRayQuadricIntersectionImageFilter.h +++ b/include/rtkRayQuadricIntersectionImageFilter.h @@ -38,7 +38,11 @@ template class RayQuadricIntersectionImageFilter : public RayConvexIntersectionImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(RayQuadricIntersectionImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(RayQuadricIntersectionImageFilter); +#endif /** Standard class type alias. */ using Self = RayQuadricIntersectionImageFilter; diff --git a/include/rtkReconstructImageFilter.h b/include/rtkReconstructImageFilter.h index ccca3976f..9fd59886e 100644 --- a/include/rtkReconstructImageFilter.h +++ b/include/rtkReconstructImageFilter.h @@ -123,7 +123,11 @@ template class ReconstructImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ReconstructImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ReconstructImageFilter); +#endif /** Standard class type alias. */ using Self = ReconstructImageFilter; diff --git a/include/rtkReconstructionConjugateGradientOperator.h b/include/rtkReconstructionConjugateGradientOperator.h index 0cb844937..02d6e14b2 100644 --- a/include/rtkReconstructionConjugateGradientOperator.h +++ b/include/rtkReconstructionConjugateGradientOperator.h @@ -118,7 +118,11 @@ template { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ReconstructionConjugateGradientOperator); +#else + ITK_DISALLOW_COPY_AND_MOVE(ReconstructionConjugateGradientOperator); +#endif /** Standard class type alias. */ using Self = ReconstructionConjugateGradientOperator; diff --git a/include/rtkReg1DExtractShroudSignalImageFilter.h b/include/rtkReg1DExtractShroudSignalImageFilter.h index fe5b97bf4..a6c41db25 100644 --- a/include/rtkReg1DExtractShroudSignalImageFilter.h +++ b/include/rtkReg1DExtractShroudSignalImageFilter.h @@ -39,7 +39,11 @@ class ITK_EXPORT Reg1DExtractShroudSignalImageFilter : public itk::ImageToImageFilter, itk::Image> { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(Reg1DExtractShroudSignalImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(Reg1DExtractShroudSignalImageFilter); +#endif /** Standard class type alias. */ using TInputImage = itk::Image; diff --git a/include/rtkReg23ProjectionGeometry.h b/include/rtkReg23ProjectionGeometry.h index c71cae154..27fa9547d 100644 --- a/include/rtkReg23ProjectionGeometry.h +++ b/include/rtkReg23ProjectionGeometry.h @@ -63,7 +63,11 @@ namespace rtk class RTK_EXPORT Reg23ProjectionGeometry : public rtk::ThreeDCircularProjectionGeometry { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(Reg23ProjectionGeometry); +#else + ITK_DISALLOW_COPY_AND_MOVE(Reg23ProjectionGeometry); +#endif /** General type alias **/ using Self = Reg23ProjectionGeometry; diff --git a/include/rtkRegularizedConjugateGradientConeBeamReconstructionFilter.h b/include/rtkRegularizedConjugateGradientConeBeamReconstructionFilter.h index 0ca363cc5..312727a9e 100644 --- a/include/rtkRegularizedConjugateGradientConeBeamReconstructionFilter.h +++ b/include/rtkRegularizedConjugateGradientConeBeamReconstructionFilter.h @@ -108,7 +108,11 @@ class RegularizedConjugateGradientConeBeamReconstructionFilter : public rtk::IterativeConeBeamReconstructionFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(RegularizedConjugateGradientConeBeamReconstructionFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(RegularizedConjugateGradientConeBeamReconstructionFilter); +#endif /** Standard class type alias. */ using Self = RegularizedConjugateGradientConeBeamReconstructionFilter; diff --git a/include/rtkReorderProjectionsImageFilter.h b/include/rtkReorderProjectionsImageFilter.h index 8eb6bf114..aa36e4d0d 100644 --- a/include/rtkReorderProjectionsImageFilter.h +++ b/include/rtkReorderProjectionsImageFilter.h @@ -45,7 +45,11 @@ template class ITK_EXPORT ReorderProjectionsImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ReorderProjectionsImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ReorderProjectionsImageFilter); +#endif /** Standard class type alias. */ using Self = ReorderProjectionsImageFilter; diff --git a/include/rtkSARTConeBeamReconstructionFilter.h b/include/rtkSARTConeBeamReconstructionFilter.h index 4b4c3cf65..0b7670d7c 100644 --- a/include/rtkSARTConeBeamReconstructionFilter.h +++ b/include/rtkSARTConeBeamReconstructionFilter.h @@ -136,7 +136,11 @@ class ITK_EXPORT SARTConeBeamReconstructionFilter : public rtk::IterativeConeBeamReconstructionFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(SARTConeBeamReconstructionFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(SARTConeBeamReconstructionFilter); +#endif /** Standard class type alias. */ using Self = SARTConeBeamReconstructionFilter; diff --git a/include/rtkScatterGlareCorrectionImageFilter.h b/include/rtkScatterGlareCorrectionImageFilter.h index 31e8ed81a..ff41f3d02 100644 --- a/include/rtkScatterGlareCorrectionImageFilter.h +++ b/include/rtkScatterGlareCorrectionImageFilter.h @@ -43,7 +43,11 @@ class ITK_EXPORT ScatterGlareCorrectionImageFilter : public rtk::FFTProjectionsConvolutionImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ScatterGlareCorrectionImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ScatterGlareCorrectionImageFilter); +#endif /** Standard class type alias. */ using Self = ScatterGlareCorrectionImageFilter; diff --git a/include/rtkSchlomka2008NegativeLogLikelihood.h b/include/rtkSchlomka2008NegativeLogLikelihood.h index fbf0cc476..249e4d305 100644 --- a/include/rtkSchlomka2008NegativeLogLikelihood.h +++ b/include/rtkSchlomka2008NegativeLogLikelihood.h @@ -45,7 +45,11 @@ namespace rtk class Schlomka2008NegativeLogLikelihood : public rtk::ProjectionsDecompositionNegativeLogLikelihood { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(Schlomka2008NegativeLogLikelihood); +#else + ITK_DISALLOW_COPY_AND_MOVE(Schlomka2008NegativeLogLikelihood); +#endif using Self = Schlomka2008NegativeLogLikelihood; using Superclass = rtk::ProjectionsDecompositionNegativeLogLikelihood; diff --git a/include/rtkSelectOneProjectionPerCycleImageFilter.h b/include/rtkSelectOneProjectionPerCycleImageFilter.h index 337f5fb5b..3cb8845ad 100644 --- a/include/rtkSelectOneProjectionPerCycleImageFilter.h +++ b/include/rtkSelectOneProjectionPerCycleImageFilter.h @@ -39,7 +39,11 @@ template class SelectOneProjectionPerCycleImageFilter : public SubSelectImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(SelectOneProjectionPerCycleImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(SelectOneProjectionPerCycleImageFilter); +#endif /** Standard class type alias. */ using Self = SelectOneProjectionPerCycleImageFilter; diff --git a/include/rtkSeparableQuadraticSurrogateRegularizationImageFilter.h b/include/rtkSeparableQuadraticSurrogateRegularizationImageFilter.h index cadc0a5fc..7bc865ab7 100644 --- a/include/rtkSeparableQuadraticSurrogateRegularizationImageFilter.h +++ b/include/rtkSeparableQuadraticSurrogateRegularizationImageFilter.h @@ -44,7 +44,11 @@ template class SeparableQuadraticSurrogateRegularizationImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(SeparableQuadraticSurrogateRegularizationImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(SeparableQuadraticSurrogateRegularizationImageFilter); +#endif /** Standard class type alias. */ using Self = SeparableQuadraticSurrogateRegularizationImageFilter; diff --git a/include/rtkSheppLoganPhantom.h b/include/rtkSheppLoganPhantom.h index 78ba11a4b..080faff36 100644 --- a/include/rtkSheppLoganPhantom.h +++ b/include/rtkSheppLoganPhantom.h @@ -40,7 +40,11 @@ namespace rtk class RTK_EXPORT SheppLoganPhantom : public GeometricPhantom { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(SheppLoganPhantom); +#else + ITK_DISALLOW_COPY_AND_MOVE(SheppLoganPhantom); +#endif /** Standard class type alias. */ using Self = SheppLoganPhantom; diff --git a/include/rtkSheppLoganPhantomFilter.h b/include/rtkSheppLoganPhantomFilter.h index 18187bbda..b543c2b11 100644 --- a/include/rtkSheppLoganPhantomFilter.h +++ b/include/rtkSheppLoganPhantomFilter.h @@ -40,7 +40,11 @@ template class ITK_EXPORT SheppLoganPhantomFilter : public ProjectGeometricPhantomImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(SheppLoganPhantomFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(SheppLoganPhantomFilter); +#endif /** Standard class type alias. */ using Self = SheppLoganPhantomFilter; diff --git a/include/rtkSignalToInterpolationWeights.h b/include/rtkSignalToInterpolationWeights.h index 8dc69a3c4..e2eb92960 100644 --- a/include/rtkSignalToInterpolationWeights.h +++ b/include/rtkSignalToInterpolationWeights.h @@ -39,7 +39,11 @@ namespace rtk class ITK_EXPORT SignalToInterpolationWeights : public itk::CSVFileReaderBase { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(SignalToInterpolationWeights); +#else + ITK_DISALLOW_COPY_AND_MOVE(SignalToInterpolationWeights); +#endif /** Standard class type alias */ using Self = SignalToInterpolationWeights; diff --git a/include/rtkSimplexSpectralProjectionsDecompositionImageFilter.h b/include/rtkSimplexSpectralProjectionsDecompositionImageFilter.h index 91d134c0b..c7e4154e1 100644 --- a/include/rtkSimplexSpectralProjectionsDecompositionImageFilter.h +++ b/include/rtkSimplexSpectralProjectionsDecompositionImageFilter.h @@ -46,7 +46,11 @@ class ITK_EXPORT SimplexSpectralProjectionsDecompositionImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(SimplexSpectralProjectionsDecompositionImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(SimplexSpectralProjectionsDecompositionImageFilter); +#endif /** Standard class type alias. */ using Self = SimplexSpectralProjectionsDecompositionImageFilter; diff --git a/include/rtkSingularValueThresholdImageFilter.h b/include/rtkSingularValueThresholdImageFilter.h index 8d4f5b2bb..dd80cc434 100644 --- a/include/rtkSingularValueThresholdImageFilter.h +++ b/include/rtkSingularValueThresholdImageFilter.h @@ -50,7 +50,11 @@ template { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(SingularValueThresholdImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(SingularValueThresholdImageFilter); +#endif /** Standard class type alias. */ using Self = SingularValueThresholdImageFilter; diff --git a/include/rtkSoftThresholdImageFilter.h b/include/rtkSoftThresholdImageFilter.h index bf9413ecc..131d45107 100644 --- a/include/rtkSoftThresholdImageFilter.h +++ b/include/rtkSoftThresholdImageFilter.h @@ -87,7 +87,11 @@ class ITK_EXPORT SoftThresholdImageFilter Functor::SoftThreshold> { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(SoftThresholdImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(SoftThresholdImageFilter); +#endif /** Standard class type alias. */ using Self = SoftThresholdImageFilter; diff --git a/include/rtkSoftThresholdTVImageFilter.h b/include/rtkSoftThresholdTVImageFilter.h index 5bb90e5e6..b3af86cb8 100644 --- a/include/rtkSoftThresholdTVImageFilter.h +++ b/include/rtkSoftThresholdTVImageFilter.h @@ -45,7 +45,11 @@ template class ITK_EXPORT SoftThresholdTVImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(SoftThresholdTVImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(SoftThresholdTVImageFilter); +#endif /** Standard class type alias. */ using Self = SoftThresholdTVImageFilter; diff --git a/include/rtkSpectralForwardModelImageFilter.h b/include/rtkSpectralForwardModelImageFilter.h index 31971b0af..9273a73b9 100644 --- a/include/rtkSpectralForwardModelImageFilter.h +++ b/include/rtkSpectralForwardModelImageFilter.h @@ -48,7 +48,11 @@ class ITK_EXPORT SpectralForwardModelImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(SpectralForwardModelImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(SpectralForwardModelImageFilter); +#endif /** Standard class type alias. */ using Self = SpectralForwardModelImageFilter; diff --git a/include/rtkSplatWithKnownWeightsImageFilter.h b/include/rtkSplatWithKnownWeightsImageFilter.h index 5af1c2076..32545e14f 100644 --- a/include/rtkSplatWithKnownWeightsImageFilter.h +++ b/include/rtkSplatWithKnownWeightsImageFilter.h @@ -67,7 +67,11 @@ template class SplatWithKnownWeightsImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(SplatWithKnownWeightsImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(SplatWithKnownWeightsImageFilter); +#endif /** Standard class type alias. */ using Self = SplatWithKnownWeightsImageFilter; diff --git a/include/rtkSubSelectFromListImageFilter.h b/include/rtkSubSelectFromListImageFilter.h index b410bdfc5..ee4296229 100644 --- a/include/rtkSubSelectFromListImageFilter.h +++ b/include/rtkSubSelectFromListImageFilter.h @@ -33,7 +33,11 @@ template class SubSelectFromListImageFilter : public SubSelectImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(SubSelectFromListImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(SubSelectFromListImageFilter); +#endif /** Standard class type alias. */ using Self = SubSelectFromListImageFilter; diff --git a/include/rtkSubSelectImageFilter.h b/include/rtkSubSelectImageFilter.h index 7ff0b4f93..b95d95182 100644 --- a/include/rtkSubSelectImageFilter.h +++ b/include/rtkSubSelectImageFilter.h @@ -64,7 +64,11 @@ template class SubSelectImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(SubSelectImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(SubSelectImageFilter); +#endif /** Standard class type alias. */ using Self = SubSelectImageFilter; diff --git a/include/rtkSumOfSquaresImageFilter.h b/include/rtkSumOfSquaresImageFilter.h index 61e35b56c..f75297a08 100644 --- a/include/rtkSumOfSquaresImageFilter.h +++ b/include/rtkSumOfSquaresImageFilter.h @@ -37,7 +37,11 @@ template class ITK_EXPORT SumOfSquaresImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(SumOfSquaresImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(SumOfSquaresImageFilter); +#endif /** Standard class type alias. */ using Self = SumOfSquaresImageFilter; diff --git a/include/rtkThreeDCircularProjectionGeometry.h b/include/rtkThreeDCircularProjectionGeometry.h index 636d93e8e..fc289acbb 100644 --- a/include/rtkThreeDCircularProjectionGeometry.h +++ b/include/rtkThreeDCircularProjectionGeometry.h @@ -50,7 +50,11 @@ namespace rtk class RTK_EXPORT ThreeDCircularProjectionGeometry : public ProjectionGeometry<3> { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ThreeDCircularProjectionGeometry); +#else + ITK_DISALLOW_COPY_AND_MOVE(ThreeDCircularProjectionGeometry); +#endif using Self = ThreeDCircularProjectionGeometry; using Superclass = ProjectionGeometry<3>; diff --git a/include/rtkThreeDCircularProjectionGeometryXMLFileReader.h b/include/rtkThreeDCircularProjectionGeometryXMLFileReader.h index e9435d082..2e9155380 100644 --- a/include/rtkThreeDCircularProjectionGeometryXMLFileReader.h +++ b/include/rtkThreeDCircularProjectionGeometryXMLFileReader.h @@ -44,7 +44,11 @@ namespace rtk class RTK_EXPORT ThreeDCircularProjectionGeometryXMLFileReader : public itk::XMLReader { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ThreeDCircularProjectionGeometryXMLFileReader); +#else + ITK_DISALLOW_COPY_AND_MOVE(ThreeDCircularProjectionGeometryXMLFileReader); +#endif /** Standard type alias */ using Self = ThreeDCircularProjectionGeometryXMLFileReader; diff --git a/include/rtkThreeDCircularProjectionGeometryXMLFileWriter.h b/include/rtkThreeDCircularProjectionGeometryXMLFileWriter.h index 8d19ecc65..e076ef7f2 100644 --- a/include/rtkThreeDCircularProjectionGeometryXMLFileWriter.h +++ b/include/rtkThreeDCircularProjectionGeometryXMLFileWriter.h @@ -42,7 +42,11 @@ class RTK_EXPORT ThreeDCircularProjectionGeometryXMLFileWriter : public itk::XMLWriterBase { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(ThreeDCircularProjectionGeometryXMLFileWriter); +#else + ITK_DISALLOW_COPY_AND_MOVE(ThreeDCircularProjectionGeometryXMLFileWriter); +#endif /** standard type alias */ using Superclass = itk::XMLWriterBase; diff --git a/include/rtkTotalNuclearVariationDenoisingBPDQImageFilter.h b/include/rtkTotalNuclearVariationDenoisingBPDQImageFilter.h index 85fca9232..52693478a 100644 --- a/include/rtkTotalNuclearVariationDenoisingBPDQImageFilter.h +++ b/include/rtkTotalNuclearVariationDenoisingBPDQImageFilter.h @@ -117,7 +117,11 @@ template { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(TotalNuclearVariationDenoisingBPDQImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(TotalNuclearVariationDenoisingBPDQImageFilter); +#endif /** Standard class type alias. */ using Self = TotalNuclearVariationDenoisingBPDQImageFilter; diff --git a/include/rtkTotalVariationDenoiseSequenceImageFilter.h b/include/rtkTotalVariationDenoiseSequenceImageFilter.h index 5c034fa1f..f3f901088 100644 --- a/include/rtkTotalVariationDenoiseSequenceImageFilter.h +++ b/include/rtkTotalVariationDenoiseSequenceImageFilter.h @@ -79,7 +79,11 @@ template class TotalVariationDenoiseSequenceImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(TotalVariationDenoiseSequenceImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(TotalVariationDenoiseSequenceImageFilter); +#endif /** Standard class type alias. */ using Self = TotalVariationDenoiseSequenceImageFilter; diff --git a/include/rtkTotalVariationDenoisingBPDQImageFilter.h b/include/rtkTotalVariationDenoisingBPDQImageFilter.h index a38c39c0f..85bef7afa 100644 --- a/include/rtkTotalVariationDenoisingBPDQImageFilter.h +++ b/include/rtkTotalVariationDenoisingBPDQImageFilter.h @@ -113,7 +113,11 @@ template { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(TotalVariationDenoisingBPDQImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(TotalVariationDenoisingBPDQImageFilter); +#endif /** Standard class type alias. */ using Self = TotalVariationDenoisingBPDQImageFilter; diff --git a/include/rtkTotalVariationImageFilter.h b/include/rtkTotalVariationImageFilter.h index 512a39fe9..ea71bd887 100644 --- a/include/rtkTotalVariationImageFilter.h +++ b/include/rtkTotalVariationImageFilter.h @@ -50,7 +50,11 @@ template class TotalVariationImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(TotalVariationImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(TotalVariationImageFilter); +#endif /** Standard Self type alias */ using Self = TotalVariationImageFilter; diff --git a/include/rtkUnwarpSequenceConjugateGradientOperator.h b/include/rtkUnwarpSequenceConjugateGradientOperator.h index cf5b6fcbc..df4399e14 100644 --- a/include/rtkUnwarpSequenceConjugateGradientOperator.h +++ b/include/rtkUnwarpSequenceConjugateGradientOperator.h @@ -67,7 +67,11 @@ template { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(UnwarpSequenceConjugateGradientOperator); +#else + ITK_DISALLOW_COPY_AND_MOVE(UnwarpSequenceConjugateGradientOperator); +#endif /** Standard class type alias. */ using Self = UnwarpSequenceConjugateGradientOperator; diff --git a/include/rtkUnwarpSequenceImageFilter.h b/include/rtkUnwarpSequenceImageFilter.h index 5419ed05c..c0e3feb3e 100644 --- a/include/rtkUnwarpSequenceImageFilter.h +++ b/include/rtkUnwarpSequenceImageFilter.h @@ -81,7 +81,11 @@ template { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(UnwarpSequenceImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(UnwarpSequenceImageFilter); +#endif /** Standard class type alias. */ using Self = UnwarpSequenceImageFilter; diff --git a/include/rtkUpsampleImageFilter.h b/include/rtkUpsampleImageFilter.h index 83cc21774..59f64f956 100644 --- a/include/rtkUpsampleImageFilter.h +++ b/include/rtkUpsampleImageFilter.h @@ -39,7 +39,11 @@ template class ITK_EXPORT UpsampleImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(UpsampleImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(UpsampleImageFilter); +#endif /** Standard class type alias. */ using Self = UpsampleImageFilter; diff --git a/include/rtkVarianObiGeometryReader.h b/include/rtkVarianObiGeometryReader.h index 2df247ac5..970095236 100644 --- a/include/rtkVarianObiGeometryReader.h +++ b/include/rtkVarianObiGeometryReader.h @@ -38,7 +38,11 @@ namespace rtk class RTK_EXPORT VarianObiGeometryReader : public itk::LightProcessObject { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(VarianObiGeometryReader); +#else + ITK_DISALLOW_COPY_AND_MOVE(VarianObiGeometryReader); +#endif /** Standard type alias */ using Self = VarianObiGeometryReader; diff --git a/include/rtkVarianObiRawImageFilter.h b/include/rtkVarianObiRawImageFilter.h index 406629ff7..bb0550a0e 100644 --- a/include/rtkVarianObiRawImageFilter.h +++ b/include/rtkVarianObiRawImageFilter.h @@ -96,7 +96,11 @@ class ITK_EXPORT VarianObiRawImageFilter Function::ObiAttenuation> { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(VarianObiRawImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(VarianObiRawImageFilter); +#endif /** Standard class type alias. */ using Self = VarianObiRawImageFilter; diff --git a/include/rtkVarianObiXMLFileReader.h b/include/rtkVarianObiXMLFileReader.h index e6d0bc2e1..9bd9af668 100644 --- a/include/rtkVarianObiXMLFileReader.h +++ b/include/rtkVarianObiXMLFileReader.h @@ -44,7 +44,11 @@ namespace rtk class VarianObiXMLFileReader : public itk::XMLReader { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(VarianObiXMLFileReader); +#else + ITK_DISALLOW_COPY_AND_MOVE(VarianObiXMLFileReader); +#endif /** Standard type alias */ using Self = VarianObiXMLFileReader; diff --git a/include/rtkVarianProBeamGeometryReader.h b/include/rtkVarianProBeamGeometryReader.h index 35ffb717c..15a8ac8af 100644 --- a/include/rtkVarianProBeamGeometryReader.h +++ b/include/rtkVarianProBeamGeometryReader.h @@ -38,7 +38,11 @@ namespace rtk class RTK_EXPORT VarianProBeamGeometryReader : public itk::LightProcessObject { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(VarianProBeamGeometryReader); +#else + ITK_DISALLOW_COPY_AND_MOVE(VarianProBeamGeometryReader); +#endif /** Standard type alias */ using Self = VarianProBeamGeometryReader; diff --git a/include/rtkVarianProBeamXMLFileReader.h b/include/rtkVarianProBeamXMLFileReader.h index 0d5a78fb0..a90ee3018 100644 --- a/include/rtkVarianProBeamXMLFileReader.h +++ b/include/rtkVarianProBeamXMLFileReader.h @@ -43,7 +43,11 @@ namespace rtk class VarianProBeamXMLFileReader : public itk::XMLReader { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(VarianProBeamXMLFileReader); +#else + ITK_DISALLOW_COPY_AND_MOVE(VarianProBeamXMLFileReader); +#endif /** Standard type alias */ using Self = VarianProBeamXMLFileReader; diff --git a/include/rtkVectorImageToImageFilter.h b/include/rtkVectorImageToImageFilter.h index d6d72dc9e..7da06af5b 100644 --- a/include/rtkVectorImageToImageFilter.h +++ b/include/rtkVectorImageToImageFilter.h @@ -47,7 +47,11 @@ template class VectorImageToImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(VectorImageToImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(VectorImageToImageFilter); +#endif /** Standard class type alias. */ using Self = VectorImageToImageFilter; diff --git a/include/rtkWarpFourDToProjectionStackImageFilter.h b/include/rtkWarpFourDToProjectionStackImageFilter.h index 77f5825b5..c04107543 100644 --- a/include/rtkWarpFourDToProjectionStackImageFilter.h +++ b/include/rtkWarpFourDToProjectionStackImageFilter.h @@ -89,7 +89,11 @@ class WarpFourDToProjectionStackImageFilter : public rtk::FourDToProjectionStackImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(WarpFourDToProjectionStackImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(WarpFourDToProjectionStackImageFilter); +#endif /** Standard class type alias. */ using Self = WarpFourDToProjectionStackImageFilter; diff --git a/include/rtkWarpProjectionStackToFourDImageFilter.h b/include/rtkWarpProjectionStackToFourDImageFilter.h index 68ba9465a..66899e3ba 100644 --- a/include/rtkWarpProjectionStackToFourDImageFilter.h +++ b/include/rtkWarpProjectionStackToFourDImageFilter.h @@ -86,7 +86,11 @@ class WarpProjectionStackToFourDImageFilter : public ProjectionStackToFourDImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(WarpProjectionStackToFourDImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(WarpProjectionStackToFourDImageFilter); +#endif /** Standard class type alias. */ using Self = WarpProjectionStackToFourDImageFilter; diff --git a/include/rtkWarpSequenceImageFilter.h b/include/rtkWarpSequenceImageFilter.h index 75c7eebbc..7cd2d0525 100644 --- a/include/rtkWarpSequenceImageFilter.h +++ b/include/rtkWarpSequenceImageFilter.h @@ -97,7 +97,11 @@ template { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(WarpSequenceImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(WarpSequenceImageFilter); +#endif /** Standard class type alias. */ using Self = WarpSequenceImageFilter; diff --git a/include/rtkWaterPrecorrectionImageFilter.h b/include/rtkWaterPrecorrectionImageFilter.h index 2cbd7edf5..38db1c3e8 100644 --- a/include/rtkWaterPrecorrectionImageFilter.h +++ b/include/rtkWaterPrecorrectionImageFilter.h @@ -40,7 +40,11 @@ template class ITK_EXPORT WaterPrecorrectionImageFilter : public itk::InPlaceImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(WaterPrecorrectionImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(WaterPrecorrectionImageFilter); +#endif /** Standard class type alias. */ using Self = WaterPrecorrectionImageFilter; diff --git a/include/rtkWeidingerForwardModelImageFilter.h b/include/rtkWeidingerForwardModelImageFilter.h index 3674aba90..6d0b35989 100644 --- a/include/rtkWeidingerForwardModelImageFilter.h +++ b/include/rtkWeidingerForwardModelImageFilter.h @@ -46,7 +46,11 @@ template { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(WeidingerForwardModelImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(WeidingerForwardModelImageFilter); +#endif /** Standard class type alias. */ using Self = WeidingerForwardModelImageFilter; diff --git a/include/rtkXRadGeometryReader.h b/include/rtkXRadGeometryReader.h index 48883be00..af9d9ee72 100644 --- a/include/rtkXRadGeometryReader.h +++ b/include/rtkXRadGeometryReader.h @@ -39,7 +39,11 @@ namespace rtk class RTK_EXPORT XRadGeometryReader : public itk::LightProcessObject { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(XRadGeometryReader); +#else + ITK_DISALLOW_COPY_AND_MOVE(XRadGeometryReader); +#endif /** Standard type alias */ using Self = XRadGeometryReader; diff --git a/include/rtkXRadImageIOFactory.h b/include/rtkXRadImageIOFactory.h index cd533d12b..496daac27 100644 --- a/include/rtkXRadImageIOFactory.h +++ b/include/rtkXRadImageIOFactory.h @@ -38,7 +38,11 @@ namespace rtk class RTK_EXPORT XRadImageIOFactory : public itk::ObjectFactoryBase { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(XRadImageIOFactory); +#else + ITK_DISALLOW_COPY_AND_MOVE(XRadImageIOFactory); +#endif /** Standard class type alias. */ using Self = XRadImageIOFactory; diff --git a/include/rtkXRadRawToAttenuationImageFilter.h b/include/rtkXRadRawToAttenuationImageFilter.h index 148f37dd9..1cd08d317 100644 --- a/include/rtkXRadRawToAttenuationImageFilter.h +++ b/include/rtkXRadRawToAttenuationImageFilter.h @@ -36,7 +36,11 @@ template class ITK_EXPORT XRadRawToAttenuationImageFilter : public itk::ImageToImageFilter { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(XRadRawToAttenuationImageFilter); +#else + ITK_DISALLOW_COPY_AND_MOVE(XRadRawToAttenuationImageFilter); +#endif /** Standard class type alias. */ using Self = XRadRawToAttenuationImageFilter; diff --git a/include/rtkXimImageIOFactory.h b/include/rtkXimImageIOFactory.h index 74d6bcf8a..0a67552bb 100644 --- a/include/rtkXimImageIOFactory.h +++ b/include/rtkXimImageIOFactory.h @@ -44,7 +44,11 @@ namespace rtk class RTK_EXPORT XimImageIOFactory : public itk::ObjectFactoryBase { public: +#if ITK_VERSION_MAJOR == 5 && ITK_VERSION_MINOR == 1 ITK_DISALLOW_COPY_AND_ASSIGN(XimImageIOFactory); +#else + ITK_DISALLOW_COPY_AND_MOVE(XimImageIOFactory); +#endif /** Standard class type alias. */ using Self = XimImageIOFactory;