From c47889a50bc5e92d6712c9d9d4e8576993329602 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Tue, 20 Jun 2023 10:43:35 -0400 Subject: [PATCH] COMP: ITK_THREAD_RETURN_DEFAULT_VALUE with WASI toolchain To address: ``` In file included from /work/wasi-build/_deps/elx-src/Common/ImageSamplers/itkImageToVectorContainerFilter.h:197: /work/wasi-build/_deps/elx-src/Common/ImageSamplers/itkImageToVectorContainerFilter.hxx:284:46: error: expected unqualified-id return itk::ITK_THREAD_RETURN_DEFAULT_VALUE; ``` --- Common/CostFunctions/itkAdvancedImageToImageMetric.hxx | 6 +++--- .../itkParzenWindowHistogramImageToImageMetric.hxx | 2 +- Common/ImageSamplers/itkImageToVectorContainerFilter.hxx | 2 +- Common/Transforms/itkAdvancedImageMomentsCalculator.hxx | 2 +- Common/itkComputeDisplacementDistribution.hxx | 2 +- .../itkParzenWindowMutualInformationImageToImageMetric.hxx | 2 +- .../itkAdvancedNormalizedCorrelationImageToImageMetric.hxx | 2 +- .../Metrics/PCAMetric/itkPCAMetric_F_multithreaded.hxx | 4 ++-- ...itkStochasticVarianceReducedGradientDescentOptimizer.cxx | 2 +- .../itkStochasticGradientDescentOptimizer.cxx | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Common/CostFunctions/itkAdvancedImageToImageMetric.hxx b/Common/CostFunctions/itkAdvancedImageToImageMetric.hxx index c7ded3e55..b471b8e4e 100644 --- a/Common/CostFunctions/itkAdvancedImageToImageMetric.hxx +++ b/Common/CostFunctions/itkAdvancedImageToImageMetric.hxx @@ -781,7 +781,7 @@ AdvancedImageToImageMetric::GetValueThreaderCallback( temp->st_Metric->ThreadedGetValue(threadID); - return itk::ITK_THREAD_RETURN_DEFAULT_VALUE; + return ITK_THREAD_RETURN_DEFAULT_VALUE; } // end GetValueThreaderCallback() @@ -819,7 +819,7 @@ AdvancedImageToImageMetric::GetValueAndDerivativeThre temp->st_Metric->ThreadedGetValueAndDerivative(threadID); - return itk::ITK_THREAD_RETURN_DEFAULT_VALUE; + return ITK_THREAD_RETURN_DEFAULT_VALUE; } // end GetValueAndDerivativeThreaderCallback() @@ -881,7 +881,7 @@ AdvancedImageToImageMetric::AccumulateDerivativesThre temp->st_DerivativePointer[j] = tmp * normalization; } - return itk::ITK_THREAD_RETURN_DEFAULT_VALUE; + return ITK_THREAD_RETURN_DEFAULT_VALUE; } // end AccumulateDerivativesThreaderCallback() diff --git a/Common/CostFunctions/itkParzenWindowHistogramImageToImageMetric.hxx b/Common/CostFunctions/itkParzenWindowHistogramImageToImageMetric.hxx index edc268afc..a42b9ee93 100644 --- a/Common/CostFunctions/itkParzenWindowHistogramImageToImageMetric.hxx +++ b/Common/CostFunctions/itkParzenWindowHistogramImageToImageMetric.hxx @@ -1264,7 +1264,7 @@ ParzenWindowHistogramImageToImageMetric::ComputePDFsT temp->m_Metric->ThreadedComputePDFs(threadId); - return itk::ITK_THREAD_RETURN_DEFAULT_VALUE; + return ITK_THREAD_RETURN_DEFAULT_VALUE; } // end ComputePDFsThreaderCallback() diff --git a/Common/ImageSamplers/itkImageToVectorContainerFilter.hxx b/Common/ImageSamplers/itkImageToVectorContainerFilter.hxx index f62727058..d3d457427 100644 --- a/Common/ImageSamplers/itkImageToVectorContainerFilter.hxx +++ b/Common/ImageSamplers/itkImageToVectorContainerFilter.hxx @@ -281,7 +281,7 @@ ImageToVectorContainerFilter::ThreaderCallb // few threads idle. // } - return itk::ITK_THREAD_RETURN_DEFAULT_VALUE; + return ITK_THREAD_RETURN_DEFAULT_VALUE; } // end ThreaderCallback() diff --git a/Common/Transforms/itkAdvancedImageMomentsCalculator.hxx b/Common/Transforms/itkAdvancedImageMomentsCalculator.hxx index e55176659..9477a95ab 100644 --- a/Common/Transforms/itkAdvancedImageMomentsCalculator.hxx +++ b/Common/Transforms/itkAdvancedImageMomentsCalculator.hxx @@ -242,7 +242,7 @@ AdvancedImageMomentsCalculator::ComputeThreaderCallback(void * arg) /** Call the real implementation. */ temp->st_Self->ThreadedCompute(threadID); - return itk::ITK_THREAD_RETURN_DEFAULT_VALUE; + return ITK_THREAD_RETURN_DEFAULT_VALUE; } // end ComputeThreaderCallback() diff --git a/Common/itkComputeDisplacementDistribution.hxx b/Common/itkComputeDisplacementDistribution.hxx index a108bcbf8..0995d21fd 100644 --- a/Common/itkComputeDisplacementDistribution.hxx +++ b/Common/itkComputeDisplacementDistribution.hxx @@ -313,7 +313,7 @@ ComputeDisplacementDistribution::ComputeThreaderCallbac /** Call the real implementation. */ temp->st_Self->ThreadedCompute(threadID); - return itk::ITK_THREAD_RETURN_DEFAULT_VALUE; + return ITK_THREAD_RETURN_DEFAULT_VALUE; } // end ComputeThreaderCallback() diff --git a/Components/Metrics/AdvancedMattesMutualInformation/itkParzenWindowMutualInformationImageToImageMetric.hxx b/Components/Metrics/AdvancedMattesMutualInformation/itkParzenWindowMutualInformationImageToImageMetric.hxx index 005c4ec8d..0f99d9b10 100644 --- a/Components/Metrics/AdvancedMattesMutualInformation/itkParzenWindowMutualInformationImageToImageMetric.hxx +++ b/Components/Metrics/AdvancedMattesMutualInformation/itkParzenWindowMutualInformationImageToImageMetric.hxx @@ -626,7 +626,7 @@ ParzenWindowMutualInformationImageToImageMetric::Comp temp->m_Metric->ThreadedComputeDerivativeLowMemory(threadId); - return itk::ITK_THREAD_RETURN_DEFAULT_VALUE; + return ITK_THREAD_RETURN_DEFAULT_VALUE; } // end ComputeDerivativeLowMemoryThreaderCallback() diff --git a/Components/Metrics/AdvancedNormalizedCorrelation/itkAdvancedNormalizedCorrelationImageToImageMetric.hxx b/Components/Metrics/AdvancedNormalizedCorrelation/itkAdvancedNormalizedCorrelationImageToImageMetric.hxx index 83be05256..becfe489d 100644 --- a/Components/Metrics/AdvancedNormalizedCorrelation/itkAdvancedNormalizedCorrelationImageToImageMetric.hxx +++ b/Components/Metrics/AdvancedNormalizedCorrelation/itkAdvancedNormalizedCorrelationImageToImageMetric.hxx @@ -830,7 +830,7 @@ AdvancedNormalizedCorrelationImageToImageMetric::Accu temp->st_DerivativePointer[j] = (derivativeF - sfm_smm * derivativeM) * invertedDenominator; } - return itk::ITK_THREAD_RETURN_DEFAULT_VALUE; + return ITK_THREAD_RETURN_DEFAULT_VALUE; } // end AccumulateDerivativesThreaderCallback() diff --git a/Components/Metrics/PCAMetric/itkPCAMetric_F_multithreaded.hxx b/Components/Metrics/PCAMetric/itkPCAMetric_F_multithreaded.hxx index 54176fa3f..b8bff338f 100644 --- a/Components/Metrics/PCAMetric/itkPCAMetric_F_multithreaded.hxx +++ b/Components/Metrics/PCAMetric/itkPCAMetric_F_multithreaded.hxx @@ -886,7 +886,7 @@ PCAMetric::GetSamplesThreaderCallback(void * arg) temp->m_Metric->ThreadedGetSamples(threadId); - return itk::ITK_THREAD_RETURN_DEFAULT_VALUE; + return ITK_THREAD_RETURN_DEFAULT_VALUE; } // GetSamplesThreaderCallback() @@ -1088,7 +1088,7 @@ PCAMetric::ComputeDerivativeThreaderCallback(void * a temp->m_Metric->ThreadedComputeDerivative(threadId); - return itk::ITK_THREAD_RETURN_DEFAULT_VALUE; + return ITK_THREAD_RETURN_DEFAULT_VALUE; } // end omputeDerivativeThreaderCallback() diff --git a/Components/Optimizers/AdaptiveStochasticVarianceReducedGradient/itkStochasticVarianceReducedGradientDescentOptimizer.cxx b/Components/Optimizers/AdaptiveStochasticVarianceReducedGradient/itkStochasticVarianceReducedGradientDescentOptimizer.cxx index 113383385..e71ec9ad5 100644 --- a/Components/Optimizers/AdaptiveStochasticVarianceReducedGradient/itkStochasticVarianceReducedGradientDescentOptimizer.cxx +++ b/Components/Optimizers/AdaptiveStochasticVarianceReducedGradient/itkStochasticVarianceReducedGradientDescentOptimizer.cxx @@ -314,7 +314,7 @@ StochasticVarianceReducedGradientDescentOptimizer::AdvanceOneStepThreaderCallbac /** Call the real implementation. */ temp->t_Optimizer->ThreadedAdvanceOneStep(threadID, *(temp->t_NewPosition)); - return itk::ITK_THREAD_RETURN_DEFAULT_VALUE; + return ITK_THREAD_RETURN_DEFAULT_VALUE; } // end AdvanceOneStepThreaderCallback() diff --git a/Components/Optimizers/StandardStochasticGradientDescent/itkStochasticGradientDescentOptimizer.cxx b/Components/Optimizers/StandardStochasticGradientDescent/itkStochasticGradientDescentOptimizer.cxx index 69e7cd4d5..be1a87f22 100644 --- a/Components/Optimizers/StandardStochasticGradientDescent/itkStochasticGradientDescentOptimizer.cxx +++ b/Components/Optimizers/StandardStochasticGradientDescent/itkStochasticGradientDescentOptimizer.cxx @@ -311,7 +311,7 @@ StochasticGradientDescentOptimizer::AdvanceOneStepThreaderCallback(void * arg) /** Call the real implementation. */ temp->t_Optimizer->ThreadedAdvanceOneStep(threadID, *(temp->t_NewPosition)); - return itk::ITK_THREAD_RETURN_DEFAULT_VALUE; + return ITK_THREAD_RETURN_DEFAULT_VALUE; } // end AdvanceOneStepThreaderCallback()