Commit db304bdc authored by Victor Poughon's avatar Victor Poughon

Merge branch '1957-remove-except-spec' into 'develop'

Remove deprecated exception specifications

Closes #1957

See merge request !600
parents 30588d96 aff6efe8
Pipeline #2750 passed with stage
in 9 minutes and 39 seconds
......@@ -63,7 +63,7 @@ public:
* Update images in the list.
*/
void UpdateOutputInformation(void) override;
void PropagateRequestedRegion(void) throw(itk::InvalidRequestedRegionError) override;
void PropagateRequestedRegion(void) override;
void UpdateOutputData(void) override;
void SetRequestedRegion(const itk::DataObject* source) override;
......
......@@ -44,7 +44,7 @@ void ImageList<TImage>::UpdateOutputData()
}
template <class TImage>
void ImageList<TImage>::PropagateRequestedRegion() throw(itk::InvalidRequestedRegionError)
void ImageList<TImage>::PropagateRequestedRegion()
{
Superclass::PropagateRequestedRegion();
......
......@@ -124,7 +124,7 @@ public:
/** Get the numbero of drections for line detection. */
itkGetConstReferenceMacro(NumberOfDirections, unsigned int);
void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError) override;
void GenerateInputRequestedRegion() override;
protected:
LineDetectorImageFilterBase();
......
......@@ -57,8 +57,7 @@ LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, In
}
template <class TInputImage, class TOutputImage, class TOutputImageDirection, class InterpolatorType>
void LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, InterpolatorType>::GenerateInputRequestedRegion() throw(
itk::InvalidRequestedRegionError)
void LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, InterpolatorType>::GenerateInputRequestedRegion()
{
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
......
......@@ -98,7 +98,7 @@ public:
void SetInputImageDirection(const InputImageType* image);
const InputImageType* GetInputImageDirection(void);
void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError) override;
void GenerateInputRequestedRegion() override;
protected:
PixelSuppressionByDirectionImageFilter();
......
......@@ -84,7 +84,7 @@ PixelSuppressionByDirectionImageFilter<TInputImage, TOutputImage>::GetInputImage
}
template <class TInputImage, class TOutputImage>
void PixelSuppressionByDirectionImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError)
void PixelSuppressionByDirectionImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion()
{
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
......
......@@ -95,7 +95,7 @@ public:
* a treatment input area larger than the output one.
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError) override;
void GenerateInputRequestedRegion() override;
protected:
TouziEdgeDetectorImageFilter();
......
......@@ -45,7 +45,7 @@ TouziEdgeDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection>::
}
template <class TInputImage, class TOutputImage, class TOutputImageDirection>
void TouziEdgeDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection>::GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError)
void TouziEdgeDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection>::GenerateInputRequestedRegion()
{
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
......
......@@ -173,7 +173,7 @@ protected:
* in order to inform the pipeline execution model.
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError) override;
void GenerateInputRequestedRegion() override;
private:
ConvolutionImageFilter(const Self&) = delete;
......
......@@ -44,8 +44,7 @@ ConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition, TFilterPre
}
template <class TInputImage, class TOutputImage, class TBoundaryCondition, class TFilterPrecision>
void ConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition, TFilterPrecision>::GenerateInputRequestedRegion() throw(
itk::InvalidRequestedRegionError)
void ConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition, TFilterPrecision>::GenerateInputRequestedRegion()
{
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
......
......@@ -137,7 +137,7 @@ public:
/** Since this filter implements a neighborhood operation, it requests a largest input
* region than the output region.
*/
void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError) override;
void GenerateInputRequestedRegion() override;
#ifdef ITK_USE_CONCEPT_CHECKING
/** Begin concept checking */
......
......@@ -52,7 +52,7 @@ OverlapSaveConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition>
}
template <class TInputImage, class TOutputImage, class TBoundaryCondition>
void OverlapSaveConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition>::GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError)
void OverlapSaveConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition>::GenerateInputRequestedRegion()
{
#if defined ITK_USE_FFTWD
// call the superclass' implementation of this method
......
......@@ -94,7 +94,7 @@ public:
/** To be allowed to use the pipeline method FrostImageFilter needs
* an input processing area larger than the output one.
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError) override;
void GenerateInputRequestedRegion() override;
protected:
FrostImageFilter();
......
......@@ -45,7 +45,7 @@ FrostImageFilter<TInputImage, TOutputImage>::FrostImageFilter()
}
template <class TInputImage, class TOutputImage>
void FrostImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError)
void FrostImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion()
{
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
......
......@@ -86,7 +86,7 @@ public:
* in order to inform the pipeline execution model.
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError) override;
void GenerateInputRequestedRegion() override;
protected:
GammaMAPImageFilter();
......
......@@ -45,7 +45,7 @@ GammaMAPImageFilter<TInputImage, TOutputImage>::GammaMAPImageFilter()
}
template <class TInputImage, class TOutputImage>
void GammaMAPImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError)
void GammaMAPImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion()
{
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
......
......@@ -86,7 +86,7 @@ public:
* in order to inform the pipeline execution model.
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError) override;
void GenerateInputRequestedRegion() override;
protected:
KuanImageFilter();
......
......@@ -45,7 +45,7 @@ KuanImageFilter<TInputImage, TOutputImage>::KuanImageFilter()
}
template <class TInputImage, class TOutputImage>
void KuanImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError)
void KuanImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion()
{
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
......
......@@ -93,7 +93,7 @@ public:
* in order to inform the pipeline execution model.
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError) override;
void GenerateInputRequestedRegion() override;
protected:
LeeImageFilter();
......
......@@ -45,7 +45,7 @@ LeeImageFilter<TInputImage, TOutputImage>::LeeImageFilter()
}
template <class TInputImage, class TOutputImage>
void LeeImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError)
void LeeImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion()
{
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
......
......@@ -89,7 +89,7 @@ public:
* in order to inform the pipeline execution model.
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError) override;
void GenerateInputRequestedRegion() override;
#ifdef ITK_USE_CONCEPT_CHECKING
/** Begin concept checking */
......
......@@ -40,7 +40,7 @@ VarianceImageFilter<TInputImage, TOutputImage>::VarianceImageFilter()
}
template <class TInputImage, class TOutputImage>
void VarianceImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError)
void VarianceImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion()
{
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
......
......@@ -230,7 +230,7 @@ protected:
* pipeline execution model.
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError) override;
void GenerateInputRequestedRegion() override;
/** BeforeThreadedGenerateData.
* It allocates also internal images
......@@ -412,7 +412,7 @@ protected:
* pipeline execution model.
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError) override;
void GenerateInputRequestedRegion() override;
/** BeforeThreadedGenerateData
* If SubsampleImageFactor neq 1, it is necessary to up sample input images in the Wavelet::INVERSE mode
......
......@@ -78,7 +78,7 @@ void WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::FOR
}
template <class TInputImage, class TOutputImage, class TWaveletOperator>
void WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD>::GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError)
void WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD>::GenerateInputRequestedRegion()
{
Superclass::GenerateInputRequestedRegion();
......@@ -616,7 +616,7 @@ void WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INV
}
template <class TInputImage, class TOutputImage, class TWaveletOperator>
void WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE>::GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError)
void WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE>::GenerateInputRequestedRegion()
{
Superclass::GenerateInputRequestedRegion();
......
......@@ -309,7 +309,7 @@ protected:
/** Connect the pipeline and propagate the required parameters. This
* is automatically called in GenerateData().
*/
void Initialize() throw(itk::ExceptionObject);
void Initialize();
virtual void ApplyMarkovRandomFieldFilter();
......
......@@ -253,7 +253,7 @@ void MarkovRandomFieldFilter<TInputImage, TClassifiedImage>::Allocate()
* Initialize pipeline and values
*/
template <class TInputImage, class TClassifiedImage>
void MarkovRandomFieldFilter<TInputImage, TClassifiedImage>::Initialize() throw(itk::ExceptionObject)
void MarkovRandomFieldFilter<TInputImage, TClassifiedImage>::Initialize()
{
m_ImageDeltaEnergy = 0.0;
......
......@@ -157,7 +157,7 @@ protected:
* in order to inform the pipeline execution model.
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError) override;
void GenerateInputRequestedRegion() override;
/** Generate output information */
void GenerateOutputInformation(void) override;
......
......@@ -123,7 +123,7 @@ void DisparityMapMedianFilter<TInputImage, TOutputImage, TMask>::GenerateOutputI
template <class TInputImage, class TOutputImage, class TMask>
void DisparityMapMedianFilter<TInputImage, TOutputImage, TMask>::GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError)
void DisparityMapMedianFilter<TInputImage, TOutputImage, TMask>::GenerateInputRequestedRegion()
{
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
......
......@@ -44,8 +44,8 @@ struct siftfast_exception : std::exception
{
siftfast_exception() : std::exception(), _s("unknown exception") {}
siftfast_exception(const string& s) : std::exception() { _s = "siftfast: " + s; }
virtual ~siftfast_exception() throw() {}
char const* what() const throw() { return _s.c_str(); }
virtual ~siftfast_exception() noexcept {}
char const* what() noexcept const { return _s.c_str(); }
string _s;
};
......
......@@ -102,7 +102,7 @@ public slots:
/**
* \brief Call the implemented do job/task routine.
*/
void Do() throw();
void Do() noexcept;
/*-[ SIGNALS SECTION ]-----------------------------------------------------*/
......
......@@ -86,7 +86,7 @@ public:
SystemError(const std::string& message = std::string()) : std::runtime_error(itksys::SystemTools::GetLastSystemError() + ": " + message){};
/** \brief Destructor. */
~SystemError() throw() override{};
~SystemError() noexcept override{};
/*-[ PROTECTED SECTION ]---------------------------------------------------*/
......
......@@ -77,7 +77,7 @@ AbstractWorker::~AbstractWorker()
}
/*****************************************************************************/
void AbstractWorker::Do() throw()
void AbstractWorker::Do() noexcept
{
QObject* result = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment