Merge pull request InsightSoftwareConsortium#4603 from N-Dekker/Rever…

…t-C++14-SupportSize-workaround STYLE: Revert C++14 workaround when using the constexpr `SupportSize`
N-Dekker · May 20, 2024 · ea7b1ab · ea7b1ab
2 parents 311b706 + 4fba8e7
commit ea7b1ab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/Modules/Core/Common/include/itkBSplineInterpolationWeightFunction.h b/Modules/Core/Common/include/itkBSplineInterpolationWeightFunction.h
@@ -123,11 +123,7 @@ class ITK_TEMPLATE_EXPORT BSplineInterpolationWeightFunction
   /** Table mapping linear offset to indices. */
   const TableType m_OffsetToIndexTable{ [] {
     TableType     table;
-    // Note: Copied the constexpr value `SupportSize` to a local variable, to prevent a GCC
-    // (Ubuntu 7.5.0-3ubuntu1~18.04) link error, "undefined reference to `SupportSize`", and Clang
-    // (Mac10.13-AppleClang-dbg-x86_64-static) "Undefined symbols for architecture x86_64".
-    const auto    supportSize = SupportSize;
-    std::copy_n(ZeroBasedIndexRange<SpaceDimension>(supportSize).cbegin(), NumberOfWeights, table.begin());
+    std::copy_n(ZeroBasedIndexRange<SpaceDimension>(SupportSize).cbegin(), NumberOfWeights, table.begin());
     return table;
   }() };
 };

diff --git a/Modules/Core/Transform/include/itkBSplineDeformableTransform.hxx b/Modules/Core/Transform/include/itkBSplineDeformableTransform.hxx
@@ -500,8 +500,7 @@ BSplineDeformableTransform<TParametersValueType, VDimension, VSplineOrder>::Tran
   this->m_WeightsFunction->Evaluate(index, weights, supportIndex);
 
   // For each dimension, correlate coefficient with weights
-  constexpr SizeType supportSize = WeightsFunctionType::SupportSize;
-  const RegionType   supportRegion(supportIndex, supportSize);
+  const RegionType supportRegion(supportIndex, WeightsFunctionType::SupportSize);
 
   outputPoint.Fill(ScalarType{});