STYLE: Replace itkStaticConstMacro with static constexpr

Use static constexpr directly now that C++11 conformance is required by all compilers. :%s/itkStaticConstMacro *( *\([^,]*\),[ \_s]*\([^,]*\),\_s*\([^)]*\)) */static constexpr \2 \1 = \3/ge 'itkStaticConstMacro(name, type, value)' became unconditionally identical to 'static constexpr type name = value' with ITK commit aec95193ab00e1322039911e1032da00f3a103b6 "ENH: Update compiler macros (#810)", maekclena, 7 May 2019. 'itkGetStaticConstMacro(name)' became unconditionally identical to '(Self::name)' with ITK commit 84e490b81e3f3c2b0edb89ae7b9de53bfc52f2b2 "Removing some outdated compiler conditionals", Hans Johnson, 31 July 2010. Most 'itkStaticConstMacro' calls were removed by ITK commit 5c14741e1e063a132ea7e7ee69c5bd0a4e49af74
KitwareMedical · Jan 27, 2025 · 251192b · 251192b
1 parent 345452b
commit 251192b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/include/itkButterworthFilterFreqImageSource.h b/include/itkButterworthFilterFreqImageSource.h
@@ -46,7 +46,7 @@ class ButterworthFilterFreqImageSource : public GenerateImageSource<TOutputImage
   itkNewMacro(Self);
 
   /** Dimensionality of the output image. */
-  itkStaticConstMacro(ImageDimension, unsigned int, TOutputImage::ImageDimension);
+  static constexpr unsigned int ImageDimension = TOutputImage::ImageDimension;
 
   using OutputImageType = TOutputImage;
   using SpacingType = typename TOutputImage::SpacingType;

diff --git a/include/itkLogGaborFreqImageSource.h b/include/itkLogGaborFreqImageSource.h
@@ -40,7 +40,7 @@ class LogGaborFreqImageSource : public GenerateImageSource<TOutputImage>
   using ConstPointer = SmartPointer<const Self>;
 
   /** Dimensionality of the output image */
-  itkStaticConstMacro(ImageDimension, unsigned int, TOutputImage::ImageDimension);
+  static constexpr unsigned int ImageDimension = TOutputImage::ImageDimension;
 
   using OutputImageType = TOutputImage;
   using OutputImageRegionType = typename TOutputImage::RegionType;

diff --git a/include/itkPhaseSymmetryImageFilter.h b/include/itkPhaseSymmetryImageFilter.h
@@ -80,8 +80,8 @@ class PhaseSymmetryImageFilter : public ImageToImageFilter<TInputImage, TOutputI
   /** Run-time type information (and related methods). */
   itkOverrideGetNameOfClassMacro(PhaseSymmetryImageFilter);
 
-  itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
-  itkStaticConstMacro(OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
+  static constexpr unsigned int InputImageDimension = TInputImage::ImageDimension;
+  static constexpr unsigned int OutputImageDimension = TOutputImage::ImageDimension;
 
   /** Some convenient type alias. */
   using InputImageType = TInputImage;

diff --git a/include/itkSinusoidImageSource.h b/include/itkSinusoidImageSource.h
@@ -53,7 +53,7 @@ class SinusoidImageSource : public ParametricImageSource<TOutputImage>
   using OutputImageType = TOutputImage;
 
   /** Dimensionality of the output image */
-  itkStaticConstMacro(ImageDimension, unsigned int, TOutputImage::ImageDimension);
+  static constexpr unsigned int ImageDimension = TOutputImage::ImageDimension;
 
   /** Type used to store Sinusoid parameters. */
   using ArrayType = FixedArray<double, ImageDimension>;

diff --git a/include/itkSteerableFilterFreqImageSource.h b/include/itkSteerableFilterFreqImageSource.h
@@ -63,7 +63,7 @@ class SteerableFilterFreqImageSource : public ImageSource<TOutputImage>
   using RangeType = std::vector<std::vector<double>>;
 
   /** Dimensionality of the output image */
-  itkStaticConstMacro(NDimensions, unsigned int, TOutputImage::ImageDimension);
+  static constexpr unsigned int NDimensions = TOutputImage::ImageDimension;
 
   /** Type used to store gaussian parameters. */