From 1daf2182f8ee85e74c203da639dc8bb628e427b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Haitz=20Legarreta=20Gorro=C3=B1o?= Date: Tue, 12 Oct 2021 10:03:27 -0400 Subject: [PATCH 1/2] COMP: Mark class destructors with `override` Mark class destructors with `override`. Fixes: ``` In file included from /Users/builder/externalModules/Filtering/FFT/test/itkComplexToComplex1DFFTImageFilterTest.cxx:27: [CTest: warning matched] /Users/builder/externalModules/Filtering/FFT/include/itkComplexToComplex1DFFTImageFilter.h:95:11: warning: '~ComplexToComplex1DFFTImageFilter' overrides a destructor but is not marked 'override' [-Winconsistent-missing-destructor-override] virtual ~ComplexToComplex1DFFTImageFilter() {} ^ ``` and ``` In file included from /Users/builder/externalModules/Filtering/FFT/test/itkFFT1DImageFilterTest.cxx:25: [CTest: warning matched] /Users/builder/externalModules/Filtering/FFT/include/itkForward1DFFTImageFilter.h:78:11: warning: '~Forward1DFFTImageFilter' overrides a destructor but is not marked 'override' [-Winconsistent-missing-destructor-override] virtual ~Forward1DFFTImageFilter() {} ^ ``` and ``` In file included from /Users/builder/externalModules/Filtering/FFT/test/itkInverse1DFFTImageFilterTest.cxx:26: [CTest: warning matched] /Users/builder/externalModules/Filtering/FFT/include/itkInverse1DFFTImageFilter.h:79:11: warning: '~Inverse1DFFTImageFilter' overrides a destructor but is not marked 'override' [-Winconsistent-missing-destructor-override] virtual ~Inverse1DFFTImageFilter() {} ^ ``` and ``` In file included from /Users/builder/externalModules/Filtering/FFT/test/itkInverse1DFFTImageFilterTest.cxx:26: In file included from /Users/builder/externalModules/Filtering/FFT/include/itkInverse1DFFTImageFilter.h:102: In file included from /Users/builder/externalModules/Filtering/FFT/include/itkInverse1DFFTImageFilter.hxx:23: [CTest: warning matched] /Users/builder/externalModules/Filtering/FFT/include/itkVnlInverse1DFFTImageFilter.h:63:11: warning: '~VnlInverse1DFFTImageFilter' overrides a destructor but is not marked 'override' [-Winconsistent-missing-destructor-override] virtual ~VnlInverse1DFFTImageFilter() {} ^ ``` raised for example at: https://open.cdash.org/viewBuildError.php?onlydeltap&buildid=7507381 --- .../Filtering/FFT/include/itkComplexToComplex1DFFTImageFilter.h | 2 +- Modules/Filtering/FFT/include/itkForward1DFFTImageFilter.h | 2 +- Modules/Filtering/FFT/include/itkInverse1DFFTImageFilter.h | 2 +- Modules/Filtering/FFT/include/itkVnlInverse1DFFTImageFilter.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Modules/Filtering/FFT/include/itkComplexToComplex1DFFTImageFilter.h b/Modules/Filtering/FFT/include/itkComplexToComplex1DFFTImageFilter.h index c542969261c..3b341cc36e7 100644 --- a/Modules/Filtering/FFT/include/itkComplexToComplex1DFFTImageFilter.h +++ b/Modules/Filtering/FFT/include/itkComplexToComplex1DFFTImageFilter.h @@ -92,7 +92,7 @@ class ITK_TEMPLATE_EXPORT ComplexToComplex1DFFTImageFilter : public ImageToImage protected: ComplexToComplex1DFFTImageFilter(); - virtual ~ComplexToComplex1DFFTImageFilter() {} + ~ComplexToComplex1DFFTImageFilter() override{}; void PrintSelf(std::ostream & os, Indent indent) const override; diff --git a/Modules/Filtering/FFT/include/itkForward1DFFTImageFilter.h b/Modules/Filtering/FFT/include/itkForward1DFFTImageFilter.h index b7d44cbd9b9..2283845fe44 100644 --- a/Modules/Filtering/FFT/include/itkForward1DFFTImageFilter.h +++ b/Modules/Filtering/FFT/include/itkForward1DFFTImageFilter.h @@ -75,7 +75,7 @@ class ITK_TEMPLATE_EXPORT Forward1DFFTImageFilter : public ImageToImageFilter Date: Tue, 12 Oct 2021 10:22:04 -0400 Subject: [PATCH 2/2] STYLE: Prefer = default to explicitly trivial implementations This check replaces default bodies of special member functions with = default;. The explicitly defaulted function declarations enable more opportunities in optimization, because the compiler might treat explicitly defaulted functions as trivial. Additionally, the C++11 use of = default more clearly expreses the intent for the special member functions. --- .../FFT/include/itkComplexToComplex1DFFTImageFilter.h | 2 +- Modules/Filtering/FFT/include/itkForward1DFFTImageFilter.h | 2 +- Modules/Filtering/FFT/include/itkInverse1DFFTImageFilter.h | 2 +- Modules/Filtering/FFT/include/itkVnlInverse1DFFTImageFilter.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Modules/Filtering/FFT/include/itkComplexToComplex1DFFTImageFilter.h b/Modules/Filtering/FFT/include/itkComplexToComplex1DFFTImageFilter.h index 3b341cc36e7..4f2fb071782 100644 --- a/Modules/Filtering/FFT/include/itkComplexToComplex1DFFTImageFilter.h +++ b/Modules/Filtering/FFT/include/itkComplexToComplex1DFFTImageFilter.h @@ -92,7 +92,7 @@ class ITK_TEMPLATE_EXPORT ComplexToComplex1DFFTImageFilter : public ImageToImage protected: ComplexToComplex1DFFTImageFilter(); - ~ComplexToComplex1DFFTImageFilter() override{}; + ~ComplexToComplex1DFFTImageFilter() override = default; void PrintSelf(std::ostream & os, Indent indent) const override; diff --git a/Modules/Filtering/FFT/include/itkForward1DFFTImageFilter.h b/Modules/Filtering/FFT/include/itkForward1DFFTImageFilter.h index 2283845fe44..c2179317ee0 100644 --- a/Modules/Filtering/FFT/include/itkForward1DFFTImageFilter.h +++ b/Modules/Filtering/FFT/include/itkForward1DFFTImageFilter.h @@ -75,7 +75,7 @@ class ITK_TEMPLATE_EXPORT Forward1DFFTImageFilter : public ImageToImageFilter