From cb25661a1287f4ccebd0230dbe8d2a9d2b80dbeb Mon Sep 17 00:00:00 2001 From: Tom Birdsong Date: Tue, 12 Oct 2021 11:16:55 -0400 Subject: [PATCH] COMP: Replace itkStaticConstMacro with constexpr in 1D FFT classes Resolves CTest compiler warnings at https://open.cdash.org/viewBuildError.php?buildid=7507611 --- .../FFT/include/itkComplexToComplex1DFFTImageFilter.h | 3 ++- Modules/Filtering/FFT/include/itkForward1DFFTImageFilter.h | 3 ++- Modules/Filtering/FFT/include/itkInverse1DFFTImageFilter.h | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Modules/Filtering/FFT/include/itkComplexToComplex1DFFTImageFilter.h b/Modules/Filtering/FFT/include/itkComplexToComplex1DFFTImageFilter.h index c542969261c..ec8540116b4 100644 --- a/Modules/Filtering/FFT/include/itkComplexToComplex1DFFTImageFilter.h +++ b/Modules/Filtering/FFT/include/itkComplexToComplex1DFFTImageFilter.h @@ -54,7 +54,8 @@ class ITK_TEMPLATE_EXPORT ComplexToComplex1DFFTImageFilter : public ImageToImage using Pointer = SmartPointer; using ConstPointer = SmartPointer; - itkStaticConstMacro(ImageDimension, unsigned int, InputImageType::ImageDimension); + /** Dimension of the underlying image. */ + static constexpr unsigned int ImageDimension = InputImageType::ImageDimension; itkTypeMacro(ComplexToComplex1DFFTImageFilter, ImageToImageFilter); diff --git a/Modules/Filtering/FFT/include/itkForward1DFFTImageFilter.h b/Modules/Filtering/FFT/include/itkForward1DFFTImageFilter.h index b7d44cbd9b9..7c78a911d0b 100644 --- a/Modules/Filtering/FFT/include/itkForward1DFFTImageFilter.h +++ b/Modules/Filtering/FFT/include/itkForward1DFFTImageFilter.h @@ -48,7 +48,8 @@ class ITK_TEMPLATE_EXPORT Forward1DFFTImageFilter : public ImageToImageFilter; using ConstPointer = SmartPointer; - itkStaticConstMacro(ImageDimension, unsigned int, InputImageType::ImageDimension); + /** Dimension of the underlying image. */ + static constexpr unsigned int ImageDimension = InputImageType::ImageDimension; itkTypeMacro(Forward1DFFTImageFilter, ImageToImageFilter); diff --git a/Modules/Filtering/FFT/include/itkInverse1DFFTImageFilter.h b/Modules/Filtering/FFT/include/itkInverse1DFFTImageFilter.h index 2791deb7ab5..87ac4ce025b 100644 --- a/Modules/Filtering/FFT/include/itkInverse1DFFTImageFilter.h +++ b/Modules/Filtering/FFT/include/itkInverse1DFFTImageFilter.h @@ -49,7 +49,8 @@ class ITK_TEMPLATE_EXPORT Inverse1DFFTImageFilter : public ImageToImageFilter; using ConstPointer = SmartPointer; - itkStaticConstMacro(ImageDimension, unsigned int, InputImageType::ImageDimension); + /** Dimension of the underlying image. */ + static constexpr unsigned int ImageDimension = InputImageType::ImageDimension; itkTypeMacro(Inverse1DFFTImageFilter, ImageToImageFilter);