Skip to content

Commit ee3f831

Browse files
committed
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 aec9519 "ENH: Update compiler macros (#810)", maekclena, 7 May 2019. 'itkGetStaticConstMacro(name)' became unconditionally identical to '(Self::name)' with ITK commit 84e490b "Removing some outdated compiler conditionals", Hans Johnson, 31 July 2010. Most 'itkStaticConstMacro' calls were removed by ITK commit 5c14741
1 parent 86442f6 commit ee3f831

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

Modules/Filtering/TextureFeatures/include/itkCoocurrenceTextureFeaturesImageFilter.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace Statistics
3030
{
3131
template <typename TInputImage, typename TOutputImage, typename TMaskImage>
3232
CoocurrenceTextureFeaturesImageFilter<TInputImage, TOutputImage, TMaskImage>::CoocurrenceTextureFeaturesImageFilter()
33-
: m_NumberOfBinsPerAxis(itkGetStaticConstMacro(DefaultBinsPerAxis))
33+
: m_NumberOfBinsPerAxis(Self::DefaultBinsPerAxis)
3434
, m_HistogramMinimum(NumericTraits<PixelType>::NonpositiveMin())
3535
, m_HistogramMaximum(NumericTraits<PixelType>::max())
3636
, m_InsidePixelValue(NumericTraits<MaskPixelType>::OneValue())

Modules/Filtering/TextureFeatures/include/itkRunLengthTextureFeaturesImageFilter.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace Statistics
3030
{
3131
template <typename TInputImage, typename TOutputImage, typename TMaskImage>
3232
RunLengthTextureFeaturesImageFilter<TInputImage, TOutputImage, TMaskImage>::RunLengthTextureFeaturesImageFilter()
33-
: m_NumberOfBinsPerAxis(itkGetStaticConstMacro(DefaultBinsPerAxis))
33+
: m_NumberOfBinsPerAxis(Self::DefaultBinsPerAxis)
3434
, m_HistogramValueMinimum(NumericTraits<PixelType>::NonpositiveMin())
3535
, m_HistogramValueMaximum(NumericTraits<PixelType>::max())
3636
, m_HistogramDistanceMinimum(NumericTraits<RealType>::ZeroValue())

0 commit comments

Comments
 (0)