Bug#984047: elastix: ftbfs with GCC-11

[Adrian Bunk]

Control: tags -1 patch fixed-upstream
Control: forwarded -1 
https://github.com/SuperElastix/elastix/commit/2962fb17f18273e533355ed625e43364e1c537a7

On Wed, Mar 03, 2021 at 04:11:52PM +0000, Matthias Klose wrote:
>...
> /<<PKGBUILDDIR>>/Common/Transforms/itkAdvancedCombinationTransform.h:350:52: 
> error: ISO C++17 does not allow dynamic exception specifications
>   350 |   virtual void NoCurrentTransformSet( void ) const throw ( 
> ExceptionObject );
>       |                                                    ^~~~~
>...

This is fixed with the upstream commit linked above,
attached is a rebase to 4.9.0.

git already contains a new upstream version, which does not build due to 
requiring ITK 5 (see #909280).

cu
Adrian

>From a0e4c488d37a5afe267626a0b369ef245f911238 Mon Sep 17 00:00:00 2001
From: Kasper Marstal <kaspermars...@gmail.com>
Date: Thu, 17 Jan 2019 07:35:46 +0100
Subject: ENH: Remove dynamic exception specifications which are deprecated in
 C++11

---
 Common/CostFunctions/itkAdvancedImageToImageMetric.h        | 4 ++--
 Common/CostFunctions/itkAdvancedImageToImageMetric.hxx      | 4 ++--
 Common/CostFunctions/itkExponentialLimiterFunction.h        | 2 +-
 Common/CostFunctions/itkExponentialLimiterFunction.hxx      | 2 +-
 Common/CostFunctions/itkImageToImageMetricWithFeatures.h    | 2 +-
 Common/CostFunctions/itkImageToImageMetricWithFeatures.hxx  | 2 +-
 Common/CostFunctions/itkLimiterFunctionBase.h               | 2 +-
 Common/CostFunctions/itkMultiInputImageToImageMetricBase.h  | 4 ++--
 .../CostFunctions/itkMultiInputImageToImageMetricBase.hxx   | 4 ++--
 .../itkParzenWindowHistogramImageToImageMetric.h            | 2 +-
 .../itkParzenWindowHistogramImageToImageMetric.hxx          | 2 +-
 .../CostFunctions/itkSingleValuedPointSetToPointSetMetric.h | 2 +-
 .../itkSingleValuedPointSetToPointSetMetric.hxx             | 2 +-
 Common/Transforms/itkAdvancedCombinationTransform.h         | 2 +-
 Common/Transforms/itkAdvancedCombinationTransform.hxx       | 2 +-
 Common/itkMultiResolutionImageRegistrationMethod2.h         | 2 +-
 Common/itkMultiResolutionImageRegistrationMethod2.hxx       | 2 +-
 .../elxAdvancedKappaStatisticMetric.h                       | 2 +-
 .../elxAdvancedKappaStatisticMetric.hxx                     | 2 +-
 .../elxAdvancedMattesMutualInformationMetric.h              | 2 +-
 .../elxAdvancedMattesMutualInformationMetric.hxx            | 2 +-
 .../AdvancedMeanSquares/elxAdvancedMeanSquaresMetric.h      | 2 +-
 .../AdvancedMeanSquares/elxAdvancedMeanSquaresMetric.hxx    | 2 +-
 .../itkAdvancedMeanSquaresImageToImageMetric.h              | 2 +-
 .../itkAdvancedMeanSquaresImageToImageMetric.hxx            | 2 +-
 .../elxAdvancedNormalizedCorrelationMetric.h                | 2 +-
 .../elxAdvancedNormalizedCorrelationMetric.hxx              | 2 +-
 .../elxTransformBendingEnergyPenaltyTerm.h                  | 2 +-
 .../elxTransformBendingEnergyPenaltyTerm.hxx                | 2 +-
 .../elxCorrespondingPointsEuclideanDistanceMetric.h         | 2 +-
 .../elxCorrespondingPointsEuclideanDistanceMetric.hxx       | 2 +-
 .../elxDisplacementMagnitudePenalty.h                       | 2 +-
 .../elxDisplacementMagnitudePenalty.hxx                     | 2 +-
 .../elxDistancePreservingRigidityPenaltyTerm.h              | 2 +-
 .../elxDistancePreservingRigidityPenaltyTerm.hxx            | 2 +-
 .../itkDistancePreservingRigidityPenaltyTerm.h              | 2 +-
 .../itkDistancePreservingRigidityPenaltyTerm.hxx            | 2 +-
 .../GradientDifference/elxGradientDifferenceMetric.h        | 2 +-
 .../GradientDifference/elxGradientDifferenceMetric.hxx      | 2 +-
 .../itkGradientDifferenceImageToImageMetric2.h              | 2 +-
 .../itkGradientDifferenceImageToImageMetric2.hxx            | 2 +-
 .../elxKNNGraphAlphaMutualInformationMetric.h               | 2 +-
 .../elxKNNGraphAlphaMutualInformationMetric.hxx             | 2 +-
 .../itkKNNGraphAlphaMutualInformationImageToImageMetric.h   | 2 +-
 .../itkKNNGraphAlphaMutualInformationImageToImageMetric.hxx | 2 +-
 .../MissingStructurePenalty/elxMissingStructurePenalty.h    | 2 +-
 .../MissingStructurePenalty/elxMissingStructurePenalty.hxx  | 2 +-
 .../MissingStructurePenalty/itkMissingStructurePenalty.h    | 2 +-
 .../MissingStructurePenalty/itkMissingStructurePenalty.hxx  | 2 +-
 .../elxMutualInformationHistogramMetric.h                   | 2 +-
 .../elxMutualInformationHistogramMetric.hxx                 | 2 +-
 .../elxNormalizedGradientCorrelationMetric.h                | 2 +-
 .../elxNormalizedGradientCorrelationMetric.hxx              | 2 +-
 .../itkNormalizedGradientCorrelationImageToImageMetric.h    | 2 +-
 .../itkNormalizedGradientCorrelationImageToImageMetric.hxx  | 2 +-
 .../elxNormalizedMutualInformationMetric.h                  | 2 +-
 .../elxNormalizedMutualInformationMetric.hxx                | 2 +-
 Components/Metrics/PCAMetric/elxPCAMetric.h                 | 2 +-
 Components/Metrics/PCAMetric/elxPCAMetric.hxx               | 2 +-
 Components/Metrics/PCAMetric/itkPCAMetric.h                 | 2 +-
 Components/Metrics/PCAMetric/itkPCAMetric.hxx               | 2 +-
 Components/Metrics/PCAMetric/itkPCAMetric_F_multithreaded.h | 2 +-
 .../Metrics/PCAMetric/itkPCAMetric_F_multithreaded.hxx      | 2 +-
 Components/Metrics/PCAMetric2/elxPCAMetric2.h               | 2 +-
 Components/Metrics/PCAMetric2/elxPCAMetric2.hxx             | 2 +-
 Components/Metrics/PCAMetric2/itkPCAMetric2.h               | 2 +-
 Components/Metrics/PCAMetric2/itkPCAMetric2.hxx             | 2 +-
 .../Metrics/PatternIntensity/elxPatternIntensityMetric.h    | 2 +-
 .../Metrics/PatternIntensity/elxPatternIntensityMetric.hxx  | 2 +-
 .../itkPatternIntensityImageToImageMetric.h                 | 2 +-
 .../itkPatternIntensityImageToImageMetric.hxx               | 2 +-
 .../Metrics/PolydataDummyPenalty/elxPolydataDummyPenalty.h  | 2 +-
 .../PolydataDummyPenalty/elxPolydataDummyPenalty.hxx        | 2 +-
 .../Metrics/PolydataDummyPenalty/itkPolydataDummyPenalty.h  | 2 +-
 .../PolydataDummyPenalty/itkPolydataDummyPenalty.hxx        | 2 +-
 .../RigidityPenalty/elxTransformRigidityPenaltyTerm.h       | 2 +-
 .../RigidityPenalty/elxTransformRigidityPenaltyTerm.hxx     | 2 +-
 .../RigidityPenalty/itkTransformRigidityPenaltyTerm.h       | 2 +-
 .../RigidityPenalty/itkTransformRigidityPenaltyTerm.hxx     | 2 +-
 .../StatisticalShapePenalty/elxStatisticalShapePenalty.h    | 2 +-
 .../StatisticalShapePenalty/elxStatisticalShapePenalty.hxx  | 2 +-
 .../itkStatisticalShapePointPenalty.h                       | 2 +-
 .../itkStatisticalShapePointPenalty.hxx                     | 2 +-
 .../elxSumOfPairwiseCorrelationCoefficientsMetric.h         | 2 +-
 .../elxSumOfPairwiseCorrelationCoefficientsMetric.hxx       | 2 +-
 .../itkSumOfPairwiseCorrelationCoefficientsMetric.h         | 2 +-
 .../itkSumOfPairwiseCorrelationCoefficientsMetric.hxx       | 2 +-
 .../elxSumSquaredTissueVolumeDifferenceMetric.h             | 2 +-
 .../elxSumSquaredTissueVolumeDifferenceMetric.hxx           | 2 +-
 .../elxVarianceOverLastDimensionMetric.h                    | 2 +-
 .../elxVarianceOverLastDimensionMetric.hxx                  | 2 +-
 .../itkVarianceOverLastDimensionImageMetric.h               | 2 +-
 .../itkVarianceOverLastDimensionImageMetric.hxx             | 2 +-
 .../elxViolaWellsMutualInformationMetric.h                  | 2 +-
 .../elxViolaWellsMutualInformationMetric.hxx                | 2 +-
 .../itkCombinationImageToImageMetric.h                      | 2 +-
 .../itkCombinationImageToImageMetric.hxx                    | 2 +-
 .../itkMultiMetricMultiResolutionImageRegistrationMethod.h  | 6 +++---
 ...itkMultiMetricMultiResolutionImageRegistrationMethod.hxx | 6 +++---
 ...tkMultiInputMultiResolutionImageRegistrationMethodBase.h | 6 +++---
 ...MultiInputMultiResolutionImageRegistrationMethodBase.hxx | 6 +++---
 .../itkMultiResolutionImageRegistrationMethodWithFeatures.h | 2 +-
 ...tkMultiResolutionImageRegistrationMethodWithFeatures.hxx | 2 +-
 103 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/Common/CostFunctions/itkAdvancedImageToImageMetric.h b/Common/CostFunctions/itkAdvancedImageToImageMetric.h
index a050b983..b6806454 100644
--- a/Common/CostFunctions/itkAdvancedImageToImageMetric.h
+++ b/Common/CostFunctions/itkAdvancedImageToImageMetric.h
@@ -257,7 +257,7 @@ public:
    * \li Check if a B-spline interpolator has been set
    * \li Check if an AdvancedTransform has been set
    */
-  virtual void Initialize( void ) throw ( ExceptionObject ) ITK_OVERRIDE;
+  virtual void Initialize( void ) ITK_OVERRIDE;
 
   /** Experimental feature: compute SelfHessian.
    * This base class just returns an identity matrix of the right size.
@@ -458,7 +458,7 @@ protected:
   /** Methods for image sampler support **********/
 
   /** Initialize variables related to the image sampler; called by Initialize. */
-  virtual void InitializeImageSampler( void ) throw ( ExceptionObject );
+  virtual void InitializeImageSampler( void );
 
   /** Inheriting classes can specify whether they use the image sampler functionality
    * Make sure to set it before calling Initialize; default: false. */
diff --git a/Common/CostFunctions/itkAdvancedImageToImageMetric.hxx b/Common/CostFunctions/itkAdvancedImageToImageMetric.hxx
index 8a2834d8..be1cbce7 100644
--- a/Common/CostFunctions/itkAdvancedImageToImageMetric.hxx
+++ b/Common/CostFunctions/itkAdvancedImageToImageMetric.hxx
@@ -149,7 +149,7 @@ AdvancedImageToImageMetric< TFixedImage, TMovingImage >
 template< class TFixedImage, class TMovingImage >
 void
 AdvancedImageToImageMetric< TFixedImage, TMovingImage >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   /** Initialize transform, interpolator, etc. */
   Superclass::Initialize();
@@ -418,7 +418,7 @@ AdvancedImageToImageMetric< TFixedImage, TMovingImage >
 template< class TFixedImage, class TMovingImage >
 void
 AdvancedImageToImageMetric< TFixedImage, TMovingImage >
-::InitializeImageSampler( void ) throw ( ExceptionObject )
+::InitializeImageSampler( void )
 {
   if( this->GetUseImageSampler() )
   {
diff --git a/Common/CostFunctions/itkExponentialLimiterFunction.h b/Common/CostFunctions/itkExponentialLimiterFunction.h
index 714614fd..f7e76cd2 100644
--- a/Common/CostFunctions/itkExponentialLimiterFunction.h
+++ b/Common/CostFunctions/itkExponentialLimiterFunction.h
@@ -73,7 +73,7 @@ public:
   virtual OutputType Evaluate( const InputType & input, DerivativeType & derivative ) const;
 
   /** Initialize the limiter; calls the ComputeLimiterSettings() function */
-  virtual void Initialize( void ) throw ( ExceptionObject );
+  virtual void Initialize( void );
 
 protected:
 
diff --git a/Common/CostFunctions/itkExponentialLimiterFunction.hxx b/Common/CostFunctions/itkExponentialLimiterFunction.hxx
index 6ed1db23..a657a37b 100644
--- a/Common/CostFunctions/itkExponentialLimiterFunction.hxx
+++ b/Common/CostFunctions/itkExponentialLimiterFunction.hxx
@@ -43,7 +43,7 @@ ExponentialLimiterFunction< TInput, NDimension >
 template< class TInput, unsigned int NDimension >
 void
 ExponentialLimiterFunction< TInput, NDimension >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   this->ComputeLimiterSettings();
 }   // end Initialize()
diff --git a/Common/CostFunctions/itkImageToImageMetricWithFeatures.h b/Common/CostFunctions/itkImageToImageMetricWithFeatures.h
index 367f17ee..c4d41c91 100644
--- a/Common/CostFunctions/itkImageToImageMetricWithFeatures.h
+++ b/Common/CostFunctions/itkImageToImageMetricWithFeatures.h
@@ -202,7 +202,7 @@ public:
 
 
   /** Initialize the metric. */
-  virtual void Initialize( void ) throw ( ExceptionObject );
+  virtual void Initialize( void );
 
 protected:
 
diff --git a/Common/CostFunctions/itkImageToImageMetricWithFeatures.hxx b/Common/CostFunctions/itkImageToImageMetricWithFeatures.hxx
index 5f949b91..d361c866 100644
--- a/Common/CostFunctions/itkImageToImageMetricWithFeatures.hxx
+++ b/Common/CostFunctions/itkImageToImageMetricWithFeatures.hxx
@@ -44,7 +44,7 @@ ImageToImageMetricWithFeatures< TFixedImage, TMovingImage, TFixedFeatureImage, T
 template< class TFixedImage, class TMovingImage, class TFixedFeatureImage, class TMovingFeatureImage >
 void
 ImageToImageMetricWithFeatures< TFixedImage, TMovingImage, TFixedFeatureImage, TMovingFeatureImage >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   /** Call the superclass. */
   this->Superclass::Initialize();
diff --git a/Common/CostFunctions/itkLimiterFunctionBase.h b/Common/CostFunctions/itkLimiterFunctionBase.h
index e75fc222..275b2014 100644
--- a/Common/CostFunctions/itkLimiterFunctionBase.h
+++ b/Common/CostFunctions/itkLimiterFunctionBase.h
@@ -99,7 +99,7 @@ public:
   itkGetConstMacro( LowerThreshold, InputType );
 
   /** Initialize the limiter */
-  virtual void Initialize( void ) throw ( ExceptionObject ) {}
+  virtual void Initialize( void ) {}
 
 protected:
 
diff --git a/Common/CostFunctions/itkMultiInputImageToImageMetricBase.h b/Common/CostFunctions/itkMultiInputImageToImageMetricBase.h
index 7c42c0a3..433197cf 100644
--- a/Common/CostFunctions/itkMultiInputImageToImageMetricBase.h
+++ b/Common/CostFunctions/itkMultiInputImageToImageMetricBase.h
@@ -315,7 +315,7 @@ public:
   /** ******************** Other public functions ******************** */
 
   /** Initialisation. */
-  virtual void Initialize( void ) throw ( ExceptionObject );
+  virtual void Initialize( void );
 
 protected:
 
@@ -337,7 +337,7 @@ protected:
   typedef std::vector< BSplineInterpolatorPointer >    BSplineInterpolatorVectorType;
 
   /** Initialize variables related to the image sampler; called by Initialize. */
-  virtual void InitializeImageSampler( void ) throw ( ExceptionObject );
+  virtual void InitializeImageSampler( void );
 
   /** Check if all interpolators (for the moving image) are of type
    * BSplineInterpolateImageFunction.
diff --git a/Common/CostFunctions/itkMultiInputImageToImageMetricBase.hxx b/Common/CostFunctions/itkMultiInputImageToImageMetricBase.hxx
index 1abdf931..8e9106b3 100644
--- a/Common/CostFunctions/itkMultiInputImageToImageMetricBase.hxx
+++ b/Common/CostFunctions/itkMultiInputImageToImageMetricBase.hxx
@@ -229,7 +229,7 @@ MultiInputImageToImageMetricBase< TFixedImage, TMovingImage >
 template< class TFixedImage, class TMovingImage >
 void
 MultiInputImageToImageMetricBase< TFixedImage, TMovingImage >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   /** Connect the interpolators. */
   for( unsigned int i = 0; i < this->GetNumberOfInterpolators(); ++i )
@@ -259,7 +259,7 @@ MultiInputImageToImageMetricBase< TFixedImage, TMovingImage >
 template< class TFixedImage, class TMovingImage >
 void
 MultiInputImageToImageMetricBase< TFixedImage, TMovingImage >
-::InitializeImageSampler( void ) throw ( ExceptionObject )
+::InitializeImageSampler( void )
 {
   if( this->GetUseImageSampler() )
   {
diff --git a/Common/CostFunctions/itkParzenWindowHistogramImageToImageMetric.h b/Common/CostFunctions/itkParzenWindowHistogramImageToImageMetric.h
index b80352d3..8d4f882a 100644
--- a/Common/CostFunctions/itkParzenWindowHistogramImageToImageMetric.h
+++ b/Common/CostFunctions/itkParzenWindowHistogramImageToImageMetric.h
@@ -143,7 +143,7 @@ public:
    * (3) InitializeKernels()
    * (4) Resize AlphaDerivatives
    */
-  void Initialize( void ) throw ( ExceptionObject );
+  void Initialize( void );
 
   /** Get the derivatives of the match measure. This method simply calls the
    * the GetValueAndDerivative, since this will be mostly almost as fast
diff --git a/Common/CostFunctions/itkParzenWindowHistogramImageToImageMetric.hxx b/Common/CostFunctions/itkParzenWindowHistogramImageToImageMetric.hxx
index cb5a60fb..f294c12c 100644
--- a/Common/CostFunctions/itkParzenWindowHistogramImageToImageMetric.hxx
+++ b/Common/CostFunctions/itkParzenWindowHistogramImageToImageMetric.hxx
@@ -136,7 +136,7 @@ ParzenWindowHistogramImageToImageMetric< TFixedImage, TMovingImage >
 template< class TFixedImage, class TMovingImage >
 void
 ParzenWindowHistogramImageToImageMetric< TFixedImage, TMovingImage >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   /** Call the superclass to check that standard components are available. */
   this->Superclass::Initialize();
diff --git a/Common/CostFunctions/itkSingleValuedPointSetToPointSetMetric.h b/Common/CostFunctions/itkSingleValuedPointSetToPointSetMetric.h
index f2f818ea..c5d10570 100644
--- a/Common/CostFunctions/itkSingleValuedPointSetToPointSetMetric.h
+++ b/Common/CostFunctions/itkSingleValuedPointSetToPointSetMetric.h
@@ -148,7 +148,7 @@ public:
   /** Initialize the Metric by making sure that all the components are
    *  present and plugged together correctly.
    */
-  virtual void Initialize( void ) throw ( ExceptionObject );
+  virtual void Initialize( void );
 
   /** Set the fixed mask. */
   // \todo: currently not used
diff --git a/Common/CostFunctions/itkSingleValuedPointSetToPointSetMetric.hxx b/Common/CostFunctions/itkSingleValuedPointSetToPointSetMetric.hxx
index 920a5a98..632f7052 100644
--- a/Common/CostFunctions/itkSingleValuedPointSetToPointSetMetric.hxx
+++ b/Common/CostFunctions/itkSingleValuedPointSetToPointSetMetric.hxx
@@ -85,7 +85,7 @@ SingleValuedPointSetToPointSetMetric< TFixedPointSet, TMovingPointSet >
 template< class TFixedPointSet, class TMovingPointSet >
 void
 SingleValuedPointSetToPointSetMetric< TFixedPointSet, TMovingPointSet >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   if( !this->m_Transform )
   {
diff --git a/Common/Transforms/itkAdvancedCombinationTransform.h b/Common/Transforms/itkAdvancedCombinationTransform.h
index 43c0bc0d..e98deb5d 100644
--- a/Common/Transforms/itkAdvancedCombinationTransform.h
+++ b/Common/Transforms/itkAdvancedCombinationTransform.h
@@ -347,7 +347,7 @@ protected:
   virtual void UpdateCombinationMethod( void );
 
   /** Throw an exception. */
-  virtual void NoCurrentTransformSet( void ) const throw ( ExceptionObject );
+  virtual void NoCurrentTransformSet( void ) const;
 
   /**  A pointer to one of the following functions:
    * - TransformPointUseAddition,
diff --git a/Common/Transforms/itkAdvancedCombinationTransform.hxx b/Common/Transforms/itkAdvancedCombinationTransform.hxx
index 1e32c8a5..67d3a731 100644
--- a/Common/Transforms/itkAdvancedCombinationTransform.hxx
+++ b/Common/Transforms/itkAdvancedCombinationTransform.hxx
@@ -732,7 +732,7 @@ AdvancedCombinationTransform< TScalarType, NDimensions >
 template< typename TScalarType, unsigned int NDimensions >
 void
 AdvancedCombinationTransform< TScalarType, NDimensions >
-::NoCurrentTransformSet( void ) const throw ( ExceptionObject )
+::NoCurrentTransformSet( void ) const
 {
   itkExceptionMacro( << "No current transform set in the AdvancedCombinationTransform" );
 
diff --git a/Common/itkMultiResolutionImageRegistrationMethod2.h b/Common/itkMultiResolutionImageRegistrationMethod2.h
index 654de5b9..853c6773 100644
--- a/Common/itkMultiResolutionImageRegistrationMethod2.h
+++ b/Common/itkMultiResolutionImageRegistrationMethod2.h
@@ -261,7 +261,7 @@ protected:
       This method is executed at every level of the pyramid with the
       values corresponding to this resolution
    */
-  virtual void Initialize() throw ( ExceptionObject );
+  virtual void Initialize();
 
   /** Compute the size of the fixed region for each level of the pyramid. */
   virtual void PreparePyramids( void );
diff --git a/Common/itkMultiResolutionImageRegistrationMethod2.hxx b/Common/itkMultiResolutionImageRegistrationMethod2.hxx
index b4c008c9..906bbd49 100644
--- a/Common/itkMultiResolutionImageRegistrationMethod2.hxx
+++ b/Common/itkMultiResolutionImageRegistrationMethod2.hxx
@@ -96,7 +96,7 @@ MultiResolutionImageRegistrationMethod2< TFixedImage, TMovingImage >
 template< typename TFixedImage, typename TMovingImage >
 void
 MultiResolutionImageRegistrationMethod2< TFixedImage, TMovingImage >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
 
   // Sanity checks
diff --git a/Components/Metrics/AdvancedKappaStatistic/elxAdvancedKappaStatisticMetric.h b/Components/Metrics/AdvancedKappaStatistic/elxAdvancedKappaStatisticMetric.h
index 8ca12b9e..0d1c8d88 100644
--- a/Components/Metrics/AdvancedKappaStatistic/elxAdvancedKappaStatisticMetric.h
+++ b/Components/Metrics/AdvancedKappaStatistic/elxAdvancedKappaStatisticMetric.h
@@ -142,7 +142,7 @@ public:
   /** Sets up a timer to measure the initialization time and
    * calls the Superclass' implementation.
    */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
   /**
    * Do some things before registration:
diff --git a/Components/Metrics/AdvancedKappaStatistic/elxAdvancedKappaStatisticMetric.hxx b/Components/Metrics/AdvancedKappaStatistic/elxAdvancedKappaStatisticMetric.hxx
index 68bbc971..7616c9fb 100644
--- a/Components/Metrics/AdvancedKappaStatistic/elxAdvancedKappaStatisticMetric.hxx
+++ b/Components/Metrics/AdvancedKappaStatistic/elxAdvancedKappaStatisticMetric.hxx
@@ -32,7 +32,7 @@ namespace elastix
 template< class TElastix >
 void
 AdvancedKappaStatisticMetric< TElastix >
-::Initialize( void ) throw ( itk::ExceptionObject )
+::Initialize( void )
 {
   itk::TimeProbe timer;
   timer.Start();
diff --git a/Components/Metrics/AdvancedMattesMutualInformation/elxAdvancedMattesMutualInformationMetric.h b/Components/Metrics/AdvancedMattesMutualInformation/elxAdvancedMattesMutualInformationMetric.h
index 21369ab1..bd8b85e3 100644
--- a/Components/Metrics/AdvancedMattesMutualInformation/elxAdvancedMattesMutualInformationMetric.h
+++ b/Components/Metrics/AdvancedMattesMutualInformation/elxAdvancedMattesMutualInformationMetric.h
@@ -205,7 +205,7 @@ public:
 
   /** Set up a timer to measure the initialization time and
    * call the Superclass' implementation. */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
   /** Set/Get c. For finite difference derivative estimation */
   itkSetMacro( Param_c, double );
diff --git a/Components/Metrics/AdvancedMattesMutualInformation/elxAdvancedMattesMutualInformationMetric.hxx b/Components/Metrics/AdvancedMattesMutualInformation/elxAdvancedMattesMutualInformationMetric.hxx
index cc2d379d..f8a148ba 100644
--- a/Components/Metrics/AdvancedMattesMutualInformation/elxAdvancedMattesMutualInformationMetric.hxx
+++ b/Components/Metrics/AdvancedMattesMutualInformation/elxAdvancedMattesMutualInformationMetric.hxx
@@ -52,7 +52,7 @@ AdvancedMattesMutualInformationMetric< TElastix >
 template< class TElastix >
 void
 AdvancedMattesMutualInformationMetric< TElastix >
-::Initialize( void ) throw ( itk::ExceptionObject )
+::Initialize( void )
 {
   itk::TimeProbe timer;
   timer.Start();
diff --git a/Components/Metrics/AdvancedMeanSquares/elxAdvancedMeanSquaresMetric.h b/Components/Metrics/AdvancedMeanSquares/elxAdvancedMeanSquaresMetric.h
index e998ee66..cbca3c81 100644
--- a/Components/Metrics/AdvancedMeanSquares/elxAdvancedMeanSquaresMetric.h
+++ b/Components/Metrics/AdvancedMeanSquares/elxAdvancedMeanSquaresMetric.h
@@ -138,7 +138,7 @@ public:
   /** Sets up a timer to measure the initialization time and
    * calls the Superclass' implementation.
    */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
   /**
    * Do some things before each resolution:
diff --git a/Components/Metrics/AdvancedMeanSquares/elxAdvancedMeanSquaresMetric.hxx b/Components/Metrics/AdvancedMeanSquares/elxAdvancedMeanSquaresMetric.hxx
index be134693..15dcd929 100644
--- a/Components/Metrics/AdvancedMeanSquares/elxAdvancedMeanSquaresMetric.hxx
+++ b/Components/Metrics/AdvancedMeanSquares/elxAdvancedMeanSquaresMetric.hxx
@@ -31,7 +31,7 @@ namespace elastix
 template< class TElastix >
 void
 AdvancedMeanSquaresMetric< TElastix >
-::Initialize( void ) throw ( itk::ExceptionObject )
+::Initialize( void )
 {
   itk::TimeProbe timer;
   timer.Start();
diff --git a/Components/Metrics/AdvancedMeanSquares/itkAdvancedMeanSquaresImageToImageMetric.h b/Components/Metrics/AdvancedMeanSquares/itkAdvancedMeanSquaresImageToImageMetric.h
index 272a2e90..b34411ed 100644
--- a/Components/Metrics/AdvancedMeanSquares/itkAdvancedMeanSquaresImageToImageMetric.h
+++ b/Components/Metrics/AdvancedMeanSquares/itkAdvancedMeanSquaresImageToImageMetric.h
@@ -166,7 +166,7 @@ public:
    *  are present and plugged together correctly.
    * \li Call the superclass' implementation
    * \li Estimate the normalization factor, if asked for.  */
-  virtual void Initialize( void ) throw ( ExceptionObject );
+  virtual void Initialize( void );
 
   /** Set/Get whether to normalize the mean squares measure.
    * This divides the MeanSquares by a factor (range/10)^2,
diff --git a/Components/Metrics/AdvancedMeanSquares/itkAdvancedMeanSquaresImageToImageMetric.hxx b/Components/Metrics/AdvancedMeanSquares/itkAdvancedMeanSquaresImageToImageMetric.hxx
index 0abfc84e..17d556c9 100644
--- a/Components/Metrics/AdvancedMeanSquares/itkAdvancedMeanSquaresImageToImageMetric.hxx
+++ b/Components/Metrics/AdvancedMeanSquares/itkAdvancedMeanSquaresImageToImageMetric.hxx
@@ -61,7 +61,7 @@ AdvancedMeanSquaresImageToImageMetric< TFixedImage, TMovingImage >
 template< class TFixedImage, class TMovingImage >
 void
 AdvancedMeanSquaresImageToImageMetric< TFixedImage, TMovingImage >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   /** Initialize transform, interpolator, etc. */
   Superclass::Initialize();
diff --git a/Components/Metrics/AdvancedNormalizedCorrelation/elxAdvancedNormalizedCorrelationMetric.h b/Components/Metrics/AdvancedNormalizedCorrelation/elxAdvancedNormalizedCorrelationMetric.h
index a4d450e4..ab250d0b 100644
--- a/Components/Metrics/AdvancedNormalizedCorrelation/elxAdvancedNormalizedCorrelationMetric.h
+++ b/Components/Metrics/AdvancedNormalizedCorrelation/elxAdvancedNormalizedCorrelationMetric.h
@@ -143,7 +143,7 @@ public:
   /** Sets up a timer to measure the initialization time and
    * calls the Superclass' implementation.
    */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
 protected:
 
diff --git a/Components/Metrics/AdvancedNormalizedCorrelation/elxAdvancedNormalizedCorrelationMetric.hxx b/Components/Metrics/AdvancedNormalizedCorrelation/elxAdvancedNormalizedCorrelationMetric.hxx
index 965c8536..b0d25233 100644
--- a/Components/Metrics/AdvancedNormalizedCorrelation/elxAdvancedNormalizedCorrelationMetric.hxx
+++ b/Components/Metrics/AdvancedNormalizedCorrelation/elxAdvancedNormalizedCorrelationMetric.hxx
@@ -53,7 +53,7 @@ AdvancedNormalizedCorrelationMetric< TElastix >
 template< class TElastix >
 void
 AdvancedNormalizedCorrelationMetric< TElastix >
-::Initialize( void ) throw ( itk::ExceptionObject )
+::Initialize( void )
 {
   itk::TimeProbe timer;
   timer.Start();
diff --git a/Components/Metrics/BendingEnergyPenalty/elxTransformBendingEnergyPenaltyTerm.h b/Components/Metrics/BendingEnergyPenalty/elxTransformBendingEnergyPenaltyTerm.h
index 2e6c3cc8..b9b98ee2 100644
--- a/Components/Metrics/BendingEnergyPenalty/elxTransformBendingEnergyPenaltyTerm.h
+++ b/Components/Metrics/BendingEnergyPenalty/elxTransformBendingEnergyPenaltyTerm.h
@@ -139,7 +139,7 @@ public:
   /** Sets up a timer to measure the initialization time and
    * calls the Superclass' implementation.
    */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
   /**
    * Do some things before each resolution:
diff --git a/Components/Metrics/BendingEnergyPenalty/elxTransformBendingEnergyPenaltyTerm.hxx b/Components/Metrics/BendingEnergyPenalty/elxTransformBendingEnergyPenaltyTerm.hxx
index 823d416e..7625af9e 100644
--- a/Components/Metrics/BendingEnergyPenalty/elxTransformBendingEnergyPenaltyTerm.hxx
+++ b/Components/Metrics/BendingEnergyPenalty/elxTransformBendingEnergyPenaltyTerm.hxx
@@ -31,7 +31,7 @@ namespace elastix
 template< class TElastix >
 void
 TransformBendingEnergyPenalty< TElastix >
-::Initialize( void ) throw ( itk::ExceptionObject )
+::Initialize( void )
 {
   itk::TimeProbe timer;
   timer.Start();
diff --git a/Components/Metrics/CorrespondingPointsEuclideanDistanceMetric/elxCorrespondingPointsEuclideanDistanceMetric.h b/Components/Metrics/CorrespondingPointsEuclideanDistanceMetric/elxCorrespondingPointsEuclideanDistanceMetric.h
index 3cb59566..0197c0e8 100644
--- a/Components/Metrics/CorrespondingPointsEuclideanDistanceMetric/elxCorrespondingPointsEuclideanDistanceMetric.h
+++ b/Components/Metrics/CorrespondingPointsEuclideanDistanceMetric/elxCorrespondingPointsEuclideanDistanceMetric.h
@@ -119,7 +119,7 @@ public:
   /** Sets up a timer to measure the initialization time and calls the
    * Superclass' implementation.
    */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
   /**
    * Do some things before all:
diff --git a/Components/Metrics/CorrespondingPointsEuclideanDistanceMetric/elxCorrespondingPointsEuclideanDistanceMetric.hxx b/Components/Metrics/CorrespondingPointsEuclideanDistanceMetric/elxCorrespondingPointsEuclideanDistanceMetric.hxx
index 84e4ad51..68f43d8a 100644
--- a/Components/Metrics/CorrespondingPointsEuclideanDistanceMetric/elxCorrespondingPointsEuclideanDistanceMetric.hxx
+++ b/Components/Metrics/CorrespondingPointsEuclideanDistanceMetric/elxCorrespondingPointsEuclideanDistanceMetric.hxx
@@ -32,7 +32,7 @@ namespace elastix
 template< class TElastix >
 void
 CorrespondingPointsEuclideanDistanceMetric< TElastix >
-::Initialize( void ) throw ( itk::ExceptionObject )
+::Initialize( void )
 {
   itk::TimeProbe timer;
   timer.Start();
diff --git a/Components/Metrics/DisplacementMagnitudePenalty/elxDisplacementMagnitudePenalty.h b/Components/Metrics/DisplacementMagnitudePenalty/elxDisplacementMagnitudePenalty.h
index 166747cd..2b9b1221 100644
--- a/Components/Metrics/DisplacementMagnitudePenalty/elxDisplacementMagnitudePenalty.h
+++ b/Components/Metrics/DisplacementMagnitudePenalty/elxDisplacementMagnitudePenalty.h
@@ -136,7 +136,7 @@ public:
   /** Sets up a timer to measure the initialization time and
    * calls the Superclass' implementation.
    */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
 protected:
 
diff --git a/Components/Metrics/DisplacementMagnitudePenalty/elxDisplacementMagnitudePenalty.hxx b/Components/Metrics/DisplacementMagnitudePenalty/elxDisplacementMagnitudePenalty.hxx
index 150a1976..0e102425 100644
--- a/Components/Metrics/DisplacementMagnitudePenalty/elxDisplacementMagnitudePenalty.hxx
+++ b/Components/Metrics/DisplacementMagnitudePenalty/elxDisplacementMagnitudePenalty.hxx
@@ -31,7 +31,7 @@ namespace elastix
 template< class TElastix >
 void
 DisplacementMagnitudePenalty< TElastix >
-::Initialize( void ) throw ( itk::ExceptionObject )
+::Initialize( void )
 {
   itk::TimeProbe timer;
   timer.Start();
diff --git a/Components/Metrics/DistancePreservingRigidityPenalty/elxDistancePreservingRigidityPenaltyTerm.h b/Components/Metrics/DistancePreservingRigidityPenalty/elxDistancePreservingRigidityPenaltyTerm.h
index b325b2db..369567a2 100644
--- a/Components/Metrics/DistancePreservingRigidityPenalty/elxDistancePreservingRigidityPenaltyTerm.h
+++ b/Components/Metrics/DistancePreservingRigidityPenalty/elxDistancePreservingRigidityPenaltyTerm.h
@@ -152,7 +152,7 @@ public:
   /** Sets up a timer to measure the initialization time and
    * calls the Superclass' implementation.
    */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
   /**
    * Do some things before registration:
diff --git a/Components/Metrics/DistancePreservingRigidityPenalty/elxDistancePreservingRigidityPenaltyTerm.hxx b/Components/Metrics/DistancePreservingRigidityPenalty/elxDistancePreservingRigidityPenaltyTerm.hxx
index 5938b421..00b50063 100644
--- a/Components/Metrics/DistancePreservingRigidityPenalty/elxDistancePreservingRigidityPenaltyTerm.hxx
+++ b/Components/Metrics/DistancePreservingRigidityPenalty/elxDistancePreservingRigidityPenaltyTerm.hxx
@@ -135,7 +135,7 @@ DistancePreservingRigidityPenalty< TElastix >
 template< class TElastix >
 void
 DistancePreservingRigidityPenalty< TElastix >
-::Initialize( void ) throw ( itk::ExceptionObject )
+::Initialize( void )
 {
   /** Initialize this class with the Superclass initializer. */
   itk::TimeProbe timer;
diff --git a/Components/Metrics/DistancePreservingRigidityPenalty/itkDistancePreservingRigidityPenaltyTerm.h b/Components/Metrics/DistancePreservingRigidityPenalty/itkDistancePreservingRigidityPenaltyTerm.h
index 58f9638f..e58f7cbe 100644
--- a/Components/Metrics/DistancePreservingRigidityPenalty/itkDistancePreservingRigidityPenaltyTerm.h
+++ b/Components/Metrics/DistancePreservingRigidityPenalty/itkDistancePreservingRigidityPenaltyTerm.h
@@ -140,7 +140,7 @@ public:
   itkStaticConstMacro( ImageDimension, unsigned int, FixedImageType::ImageDimension );
 
   /** Initialize the penalty term. */
-  virtual void Initialize( void ) throw ( ExceptionObject );
+  virtual void Initialize( void );
 
   /** Typedef's for B-spline transform. */
   typedef AdvancedBSplineDeformableTransform< ScalarType, FixedImageDimension, 3 > BSplineTransformType;
diff --git a/Components/Metrics/DistancePreservingRigidityPenalty/itkDistancePreservingRigidityPenaltyTerm.hxx b/Components/Metrics/DistancePreservingRigidityPenalty/itkDistancePreservingRigidityPenaltyTerm.hxx
index 9528e921..62984f88 100644
--- a/Components/Metrics/DistancePreservingRigidityPenalty/itkDistancePreservingRigidityPenaltyTerm.hxx
+++ b/Components/Metrics/DistancePreservingRigidityPenalty/itkDistancePreservingRigidityPenaltyTerm.hxx
@@ -58,7 +58,7 @@ DistancePreservingRigidityPenaltyTerm< TFixedImage, TScalarType >
 template< class TFixedImage, class TScalarType >
 void
 DistancePreservingRigidityPenaltyTerm< TFixedImage, TScalarType >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   /** Call the initialize of the superclass. */
   this->Superclass::Initialize();
diff --git a/Components/Metrics/GradientDifference/elxGradientDifferenceMetric.h b/Components/Metrics/GradientDifference/elxGradientDifferenceMetric.h
index 2623f7c1..a2824bc1 100644
--- a/Components/Metrics/GradientDifference/elxGradientDifferenceMetric.h
+++ b/Components/Metrics/GradientDifference/elxGradientDifferenceMetric.h
@@ -129,7 +129,7 @@ public:
   /** Sets up a timer to measure the initialization time and
    * calls the Superclass' implementation.
    */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
   /**
    * Do some things before each resolution:
diff --git a/Components/Metrics/GradientDifference/elxGradientDifferenceMetric.hxx b/Components/Metrics/GradientDifference/elxGradientDifferenceMetric.hxx
index 6136e641..f011d67c 100644
--- a/Components/Metrics/GradientDifference/elxGradientDifferenceMetric.hxx
+++ b/Components/Metrics/GradientDifference/elxGradientDifferenceMetric.hxx
@@ -31,7 +31,7 @@ namespace elastix
 template< class TElastix >
 void
 GradientDifferenceMetric< TElastix >
-::Initialize( void ) throw ( itk::ExceptionObject )
+::Initialize( void )
 {
   itk::TimeProbe timer;
   timer.Start();
diff --git a/Components/Metrics/GradientDifference/itkGradientDifferenceImageToImageMetric2.h b/Components/Metrics/GradientDifference/itkGradientDifferenceImageToImageMetric2.h
index 5cbe342a..3e296314 100644
--- a/Components/Metrics/GradientDifference/itkGradientDifferenceImageToImageMetric2.h
+++ b/Components/Metrics/GradientDifference/itkGradientDifferenceImageToImageMetric2.h
@@ -156,7 +156,7 @@ public:
   void GetValueAndDerivative( const TransformParametersType & parameters,
     MeasureType & Value, DerivativeType & derivative ) const;
 
-  virtual void Initialize( void ) throw ( ExceptionObject );
+  virtual void Initialize( void );
 
   /** Write gradient images to a files for debugging purposes. */
   void WriteGradientImagesToFiles( void ) const;
diff --git a/Components/Metrics/GradientDifference/itkGradientDifferenceImageToImageMetric2.hxx b/Components/Metrics/GradientDifference/itkGradientDifferenceImageToImageMetric2.hxx
index 57d9e242..7e04ce95 100644
--- a/Components/Metrics/GradientDifference/itkGradientDifferenceImageToImageMetric2.hxx
+++ b/Components/Metrics/GradientDifference/itkGradientDifferenceImageToImageMetric2.hxx
@@ -88,7 +88,7 @@ GradientDifferenceImageToImageMetric< TFixedImage, TMovingImage >
 template< class TFixedImage, class TMovingImage >
 void
 GradientDifferenceImageToImageMetric< TFixedImage, TMovingImage >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   /** Initialise the base class */
   Superclass::Initialize();
diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/elxKNNGraphAlphaMutualInformationMetric.h b/Components/Metrics/KNNGraphAlphaMutualInformation/elxKNNGraphAlphaMutualInformationMetric.h
index cc5ed408..fab83ec3 100644
--- a/Components/Metrics/KNNGraphAlphaMutualInformation/elxKNNGraphAlphaMutualInformationMetric.h
+++ b/Components/Metrics/KNNGraphAlphaMutualInformation/elxKNNGraphAlphaMutualInformationMetric.h
@@ -169,7 +169,7 @@ public:
   /** Sets up a timer to measure the initialization time and
    * calls the Superclass' implementation.
    */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
 protected:
 
diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/elxKNNGraphAlphaMutualInformationMetric.hxx b/Components/Metrics/KNNGraphAlphaMutualInformation/elxKNNGraphAlphaMutualInformationMetric.hxx
index 298eee30..9e3ad18f 100644
--- a/Components/Metrics/KNNGraphAlphaMutualInformation/elxKNNGraphAlphaMutualInformationMetric.hxx
+++ b/Components/Metrics/KNNGraphAlphaMutualInformation/elxKNNGraphAlphaMutualInformationMetric.hxx
@@ -34,7 +34,7 @@ namespace elastix
 template< class TElastix >
 void
 KNNGraphAlphaMutualInformationMetric< TElastix >
-::Initialize( void ) throw ( itk::ExceptionObject )
+::Initialize( void )
 {
   itk::TimeProbe timer;
   timer.Start();
diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/itkKNNGraphAlphaMutualInformationImageToImageMetric.h b/Components/Metrics/KNNGraphAlphaMutualInformation/itkKNNGraphAlphaMutualInformationImageToImageMetric.h
index 2a22219d..d3d81a63 100644
--- a/Components/Metrics/KNNGraphAlphaMutualInformation/itkKNNGraphAlphaMutualInformationImageToImageMetric.h
+++ b/Components/Metrics/KNNGraphAlphaMutualInformation/itkKNNGraphAlphaMutualInformationImageToImageMetric.h
@@ -222,7 +222,7 @@ public:
    */
 
   /** Initialize the metric. */
-  virtual void Initialize( void ) throw ( ExceptionObject );
+  virtual void Initialize( void );
 
   /** Get the derivatives of the match measure. */
   void GetDerivative( const TransformParametersType & parameters,
diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/itkKNNGraphAlphaMutualInformationImageToImageMetric.hxx b/Components/Metrics/KNNGraphAlphaMutualInformation/itkKNNGraphAlphaMutualInformationImageToImageMetric.hxx
index 7d00bfa9..7c4dbb07 100644
--- a/Components/Metrics/KNNGraphAlphaMutualInformation/itkKNNGraphAlphaMutualInformationImageToImageMetric.hxx
+++ b/Components/Metrics/KNNGraphAlphaMutualInformation/itkKNNGraphAlphaMutualInformationImageToImageMetric.hxx
@@ -272,7 +272,7 @@ KNNGraphAlphaMutualInformationImageToImageMetric< TFixedImage, TMovingImage >
 template< class TFixedImage, class TMovingImage >
 void
 KNNGraphAlphaMutualInformationImageToImageMetric< TFixedImage, TMovingImage >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   /** Call the superclass. */
   this->Superclass::Initialize();
diff --git a/Components/Metrics/MissingStructurePenalty/elxMissingStructurePenalty.h b/Components/Metrics/MissingStructurePenalty/elxMissingStructurePenalty.h
index 9ee7da40..395894d6 100644
--- a/Components/Metrics/MissingStructurePenalty/elxMissingStructurePenalty.h
+++ b/Components/Metrics/MissingStructurePenalty/elxMissingStructurePenalty.h
@@ -152,7 +152,7 @@ public:
   /** Sets up a timer to measure the initialization time and calls the
   * Superclass' implementation.
   */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
   /**
   * Do some things before registration:
diff --git a/Components/Metrics/MissingStructurePenalty/elxMissingStructurePenalty.hxx b/Components/Metrics/MissingStructurePenalty/elxMissingStructurePenalty.hxx
index 11b5b542..62ff8026 100644
--- a/Components/Metrics/MissingStructurePenalty/elxMissingStructurePenalty.hxx
+++ b/Components/Metrics/MissingStructurePenalty/elxMissingStructurePenalty.hxx
@@ -43,7 +43,7 @@ MissingStructurePenalty< TElastix >
 template< class TElastix >
 void
 MissingStructurePenalty< TElastix >
-::Initialize( void ) throw ( itk::ExceptionObject )
+::Initialize( void )
 {
   itk::TimeProbe timer;
   timer.Start();
diff --git a/Components/Metrics/MissingStructurePenalty/itkMissingStructurePenalty.h b/Components/Metrics/MissingStructurePenalty/itkMissingStructurePenalty.h
index d2238a05..9d642d97 100644
--- a/Components/Metrics/MissingStructurePenalty/itkMissingStructurePenalty.h
+++ b/Components/Metrics/MissingStructurePenalty/itkMissingStructurePenalty.h
@@ -137,7 +137,7 @@ public:
   /** Initialize the Metric by making sure that all the components are
   *  present and plugged together correctly.
   */
-  virtual void Initialize( void ) throw ( ExceptionObject );
+  virtual void Initialize( void );
 
   /** Set the fixed mask. */
   // \todo: currently not used
diff --git a/Components/Metrics/MissingStructurePenalty/itkMissingStructurePenalty.hxx b/Components/Metrics/MissingStructurePenalty/itkMissingStructurePenalty.hxx
index a01ef281..7af42563 100644
--- a/Components/Metrics/MissingStructurePenalty/itkMissingStructurePenalty.hxx
+++ b/Components/Metrics/MissingStructurePenalty/itkMissingStructurePenalty.hxx
@@ -52,7 +52,7 @@ MissingVolumeMeshPenalty< TFixedPointSet, TMovingPointSet  >
 template< class TFixedPointSet, class TMovingPointSet  >
 void
 MissingVolumeMeshPenalty< TFixedPointSet, TMovingPointSet >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   /** Call the initialize of the superclass. */
   //this->Superclass::Initialize();
diff --git a/Components/Metrics/MutualInformationHistogram/elxMutualInformationHistogramMetric.h b/Components/Metrics/MutualInformationHistogram/elxMutualInformationHistogramMetric.h
index 76ff6f9a..56f74982 100644
--- a/Components/Metrics/MutualInformationHistogram/elxMutualInformationHistogramMetric.h
+++ b/Components/Metrics/MutualInformationHistogram/elxMutualInformationHistogramMetric.h
@@ -114,7 +114,7 @@ public:
   /** Sets up a timer to measure the initialization time and
    * calls the Superclass' implementation.
    */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
 protected:
 
diff --git a/Components/Metrics/MutualInformationHistogram/elxMutualInformationHistogramMetric.hxx b/Components/Metrics/MutualInformationHistogram/elxMutualInformationHistogramMetric.hxx
index 8f7c6463..84258051 100644
--- a/Components/Metrics/MutualInformationHistogram/elxMutualInformationHistogramMetric.hxx
+++ b/Components/Metrics/MutualInformationHistogram/elxMutualInformationHistogramMetric.hxx
@@ -41,7 +41,7 @@ MutualInformationHistogramMetric< TElastix >
 template< class TElastix >
 void
 MutualInformationHistogramMetric< TElastix >
-::Initialize( void ) throw ( itk::ExceptionObject )
+::Initialize( void )
 {
   itk::TimeProbe timer;
   timer.Start();
diff --git a/Components/Metrics/NormalizedGradientCorrelation/elxNormalizedGradientCorrelationMetric.h b/Components/Metrics/NormalizedGradientCorrelation/elxNormalizedGradientCorrelationMetric.h
index d98c6391..7540ba14 100644
--- a/Components/Metrics/NormalizedGradientCorrelation/elxNormalizedGradientCorrelationMetric.h
+++ b/Components/Metrics/NormalizedGradientCorrelation/elxNormalizedGradientCorrelationMetric.h
@@ -130,7 +130,7 @@ public:
   /** Sets up a timer to measure the initialization time and
    * calls the Superclass' implementation.
    */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
   /**
    * Do some things before each resolution:
diff --git a/Components/Metrics/NormalizedGradientCorrelation/elxNormalizedGradientCorrelationMetric.hxx b/Components/Metrics/NormalizedGradientCorrelation/elxNormalizedGradientCorrelationMetric.hxx
index 433979ac..048189ce 100644
--- a/Components/Metrics/NormalizedGradientCorrelation/elxNormalizedGradientCorrelationMetric.hxx
+++ b/Components/Metrics/NormalizedGradientCorrelation/elxNormalizedGradientCorrelationMetric.hxx
@@ -31,7 +31,7 @@ namespace elastix
 template< class TElastix >
 void
 NormalizedGradientCorrelationMetric< TElastix >
-::Initialize( void ) throw ( itk::ExceptionObject )
+::Initialize( void )
 {
   itk::TimeProbe timer;
   timer.Start();
diff --git a/Components/Metrics/NormalizedGradientCorrelation/itkNormalizedGradientCorrelationImageToImageMetric.h b/Components/Metrics/NormalizedGradientCorrelation/itkNormalizedGradientCorrelationImageToImageMetric.h
index a11de009..0af13058 100644
--- a/Components/Metrics/NormalizedGradientCorrelation/itkNormalizedGradientCorrelationImageToImageMetric.h
+++ b/Components/Metrics/NormalizedGradientCorrelation/itkNormalizedGradientCorrelationImageToImageMetric.h
@@ -137,7 +137,7 @@ public:
   /** Initialize the Metric by making sure that all the components
    *  are present and plugged together correctly.
    */
-  virtual void Initialize( void ) throw ( ExceptionObject );
+  virtual void Initialize( void );
 
   /** Write gradient images to a files for debugging purposes. */
   void WriteGradientImagesToFiles( void ) const;
diff --git a/Components/Metrics/NormalizedGradientCorrelation/itkNormalizedGradientCorrelationImageToImageMetric.hxx b/Components/Metrics/NormalizedGradientCorrelation/itkNormalizedGradientCorrelationImageToImageMetric.hxx
index b4495f62..a063e656 100644
--- a/Components/Metrics/NormalizedGradientCorrelation/itkNormalizedGradientCorrelationImageToImageMetric.hxx
+++ b/Components/Metrics/NormalizedGradientCorrelation/itkNormalizedGradientCorrelationImageToImageMetric.hxx
@@ -60,7 +60,7 @@ NormalizedGradientCorrelationImageToImageMetric< TFixedImage, TMovingImage >
 template< class TFixedImage, class TMovingImage >
 void
 NormalizedGradientCorrelationImageToImageMetric< TFixedImage, TMovingImage >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   /** Initialize the base class */
   Superclass::Initialize();
diff --git a/Components/Metrics/NormalizedMutualInformation/elxNormalizedMutualInformationMetric.h b/Components/Metrics/NormalizedMutualInformation/elxNormalizedMutualInformationMetric.h
index 547f8b97..89248465 100644
--- a/Components/Metrics/NormalizedMutualInformation/elxNormalizedMutualInformationMetric.h
+++ b/Components/Metrics/NormalizedMutualInformation/elxNormalizedMutualInformationMetric.h
@@ -173,7 +173,7 @@ public:
 
   /** Set up a timer to measure the initialization time and
    * call the Superclass' implementation. */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
 protected:
 
diff --git a/Components/Metrics/NormalizedMutualInformation/elxNormalizedMutualInformationMetric.hxx b/Components/Metrics/NormalizedMutualInformation/elxNormalizedMutualInformationMetric.hxx
index 5b4f9524..5bcddd5e 100644
--- a/Components/Metrics/NormalizedMutualInformation/elxNormalizedMutualInformationMetric.hxx
+++ b/Components/Metrics/NormalizedMutualInformation/elxNormalizedMutualInformationMetric.hxx
@@ -35,7 +35,7 @@ namespace elastix
 template< class TElastix >
 void
 NormalizedMutualInformationMetric< TElastix >
-::Initialize( void ) throw ( itk::ExceptionObject )
+::Initialize( void )
 {
   itk::TimeProbe timer;
   timer.Start();
diff --git a/Components/Metrics/PCAMetric/elxPCAMetric.h b/Components/Metrics/PCAMetric/elxPCAMetric.h
index 30e1fbbf..77adcb79 100644
--- a/Components/Metrics/PCAMetric/elxPCAMetric.h
+++ b/Components/Metrics/PCAMetric/elxPCAMetric.h
@@ -167,7 +167,7 @@ public:
   /** Sets up a timer to measure the initialization time and
    * calls the Superclass' implementation.
    */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
   /**
    * Do some things before each resolution:
diff --git a/Components/Metrics/PCAMetric/elxPCAMetric.hxx b/Components/Metrics/PCAMetric/elxPCAMetric.hxx
index 7960b34d..9965cd92 100644
--- a/Components/Metrics/PCAMetric/elxPCAMetric.hxx
+++ b/Components/Metrics/PCAMetric/elxPCAMetric.hxx
@@ -31,7 +31,7 @@ namespace elastix
 template< class TElastix >
 void
 PCAMetric< TElastix >
-::Initialize( void ) throw ( itk::ExceptionObject )
+::Initialize( void )
 {
   itk::TimeProbe timer;
   timer.Start();
diff --git a/Components/Metrics/PCAMetric/itkPCAMetric.h b/Components/Metrics/PCAMetric/itkPCAMetric.h
index 95c6e045..90d4fd6a 100644
--- a/Components/Metrics/PCAMetric/itkPCAMetric.h
+++ b/Components/Metrics/PCAMetric/itkPCAMetric.h
@@ -136,7 +136,7 @@ public:
    *  are present and plugged together correctly.
    * \li Call the superclass' implementation.   */
 
-  virtual void Initialize( void ) throw ( ExceptionObject );
+  virtual void Initialize( void );
 
 protected:
 
diff --git a/Components/Metrics/PCAMetric/itkPCAMetric.hxx b/Components/Metrics/PCAMetric/itkPCAMetric.hxx
index 1a555fcc..862fac46 100644
--- a/Components/Metrics/PCAMetric/itkPCAMetric.hxx
+++ b/Components/Metrics/PCAMetric/itkPCAMetric.hxx
@@ -58,7 +58,7 @@ PCAMetric< TFixedImage, TMovingImage >
 template< class TFixedImage, class TMovingImage >
 void
 PCAMetric< TFixedImage, TMovingImage >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   /** Initialize transform, interpolator, etc. */
   Superclass::Initialize();
diff --git a/Components/Metrics/PCAMetric/itkPCAMetric_F_multithreaded.h b/Components/Metrics/PCAMetric/itkPCAMetric_F_multithreaded.h
index 0f71449c..4a923419 100644
--- a/Components/Metrics/PCAMetric/itkPCAMetric_F_multithreaded.h
+++ b/Components/Metrics/PCAMetric/itkPCAMetric_F_multithreaded.h
@@ -135,7 +135,7 @@ public:
    *  are present and plugged together correctly.
    * \li Call the superclass' implementation.   */
 
-  virtual void Initialize( void ) throw ( ExceptionObject );
+  virtual void Initialize( void );
 
 protected:
 
diff --git a/Components/Metrics/PCAMetric/itkPCAMetric_F_multithreaded.hxx b/Components/Metrics/PCAMetric/itkPCAMetric_F_multithreaded.hxx
index 4db16bc5..4ae2d409 100644
--- a/Components/Metrics/PCAMetric/itkPCAMetric_F_multithreaded.hxx
+++ b/Components/Metrics/PCAMetric/itkPCAMetric_F_multithreaded.hxx
@@ -78,7 +78,7 @@ PCAMetric< TFixedImage, TMovingImage >
 template< class TFixedImage, class TMovingImage >
 void
 PCAMetric< TFixedImage, TMovingImage >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   /** Initialize transform, interpolator, etc. */
   Superclass::Initialize();
diff --git a/Components/Metrics/PCAMetric2/elxPCAMetric2.h b/Components/Metrics/PCAMetric2/elxPCAMetric2.h
index 73d506e5..45ea6382 100644
--- a/Components/Metrics/PCAMetric2/elxPCAMetric2.h
+++ b/Components/Metrics/PCAMetric2/elxPCAMetric2.h
@@ -167,7 +167,7 @@ public:
   /** Sets up a timer to measure the initialization time and
    * calls the Superclass' implementation.
    */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
   /**
    * Do some things before each resolution:
diff --git a/Components/Metrics/PCAMetric2/elxPCAMetric2.hxx b/Components/Metrics/PCAMetric2/elxPCAMetric2.hxx
index 8d3dc7fe..01236ae0 100644
--- a/Components/Metrics/PCAMetric2/elxPCAMetric2.hxx
+++ b/Components/Metrics/PCAMetric2/elxPCAMetric2.hxx
@@ -31,7 +31,7 @@ namespace elastix
 template< class TElastix >
 void
 PCAMetric2< TElastix >
-::Initialize( void ) throw ( itk::ExceptionObject )
+::Initialize( void )
 {
   itk::TimeProbe timer;
   timer.Start();
diff --git a/Components/Metrics/PCAMetric2/itkPCAMetric2.h b/Components/Metrics/PCAMetric2/itkPCAMetric2.h
index 9a0975e5..743cae09 100644
--- a/Components/Metrics/PCAMetric2/itkPCAMetric2.h
+++ b/Components/Metrics/PCAMetric2/itkPCAMetric2.h
@@ -124,7 +124,7 @@ public:
    *  are present and plugged together correctly.
    * \li Call the superclass' implementation.
    */
-  virtual void Initialize( void ) throw ( ExceptionObject );
+  virtual void Initialize( void );
 
 protected:
 
diff --git a/Components/Metrics/PCAMetric2/itkPCAMetric2.hxx b/Components/Metrics/PCAMetric2/itkPCAMetric2.hxx
index 139a6dd2..dc03ea2f 100644
--- a/Components/Metrics/PCAMetric2/itkPCAMetric2.hxx
+++ b/Components/Metrics/PCAMetric2/itkPCAMetric2.hxx
@@ -54,7 +54,7 @@ PCAMetric2< TFixedImage, TMovingImage >
 template< class TFixedImage, class TMovingImage >
 void
 PCAMetric2< TFixedImage, TMovingImage >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   /** Initialize transform, interpolator, etc. */
   Superclass::Initialize();
diff --git a/Components/Metrics/PatternIntensity/elxPatternIntensityMetric.h b/Components/Metrics/PatternIntensity/elxPatternIntensityMetric.h
index fd66c4ce..c6a8f3e5 100644
--- a/Components/Metrics/PatternIntensity/elxPatternIntensityMetric.h
+++ b/Components/Metrics/PatternIntensity/elxPatternIntensityMetric.h
@@ -130,7 +130,7 @@ public:
   /** Sets up a timer to measure the initialization time and
    * calls the Superclass' implementation.
    */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
   /**
    * Do some things before each resolution:
diff --git a/Components/Metrics/PatternIntensity/elxPatternIntensityMetric.hxx b/Components/Metrics/PatternIntensity/elxPatternIntensityMetric.hxx
index 9fe339a7..4d079693 100644
--- a/Components/Metrics/PatternIntensity/elxPatternIntensityMetric.hxx
+++ b/Components/Metrics/PatternIntensity/elxPatternIntensityMetric.hxx
@@ -31,7 +31,7 @@ namespace elastix
 template< class TElastix >
 void
 PatternIntensityMetric< TElastix >
-::Initialize( void ) throw ( itk::ExceptionObject )
+::Initialize( void )
 {
   itk::TimeProbe timer;
   timer.Start();
diff --git a/Components/Metrics/PatternIntensity/itkPatternIntensityImageToImageMetric.h b/Components/Metrics/PatternIntensity/itkPatternIntensityImageToImageMetric.h
index a5444f75..645788ee 100644
--- a/Components/Metrics/PatternIntensity/itkPatternIntensityImageToImageMetric.h
+++ b/Components/Metrics/PatternIntensity/itkPatternIntensityImageToImageMetric.h
@@ -160,7 +160,7 @@ public:
    * \li Call the superclass' implementation
    * \li Estimate the normalization factor, if asked for.
    */
-  virtual void Initialize( void ) throw ( ExceptionObject );
+  virtual void Initialize( void );
 
   /** Set/Get Scales  */
   itkSetMacro( Scales, ScalesType );
diff --git a/Components/Metrics/PatternIntensity/itkPatternIntensityImageToImageMetric.hxx b/Components/Metrics/PatternIntensity/itkPatternIntensityImageToImageMetric.hxx
index 18081a80..2e4770ba 100644
--- a/Components/Metrics/PatternIntensity/itkPatternIntensityImageToImageMetric.hxx
+++ b/Components/Metrics/PatternIntensity/itkPatternIntensityImageToImageMetric.hxx
@@ -61,7 +61,7 @@ PatternIntensityImageToImageMetric< TFixedImage, TMovingImage >
 template< class TFixedImage, class TMovingImage >
 void
 PatternIntensityImageToImageMetric< TFixedImage, TMovingImage >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   Superclass::Initialize();
 
diff --git a/Components/Metrics/PolydataDummyPenalty/elxPolydataDummyPenalty.h b/Components/Metrics/PolydataDummyPenalty/elxPolydataDummyPenalty.h
index ffc10805..052bc73b 100644
--- a/Components/Metrics/PolydataDummyPenalty/elxPolydataDummyPenalty.h
+++ b/Components/Metrics/PolydataDummyPenalty/elxPolydataDummyPenalty.h
@@ -168,7 +168,7 @@ public:
   /** Sets up a timer to measure the initialization time and calls the
    * Superclass' implementation.
    */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
   /**
    * Do some things before registration:
diff --git a/Components/Metrics/PolydataDummyPenalty/elxPolydataDummyPenalty.hxx b/Components/Metrics/PolydataDummyPenalty/elxPolydataDummyPenalty.hxx
index 8ebb6926..5c7c578a 100644
--- a/Components/Metrics/PolydataDummyPenalty/elxPolydataDummyPenalty.hxx
+++ b/Components/Metrics/PolydataDummyPenalty/elxPolydataDummyPenalty.hxx
@@ -42,7 +42,7 @@ PolydataDummyPenalty< TElastix >
 template< class TElastix >
 void
 PolydataDummyPenalty< TElastix >
-::Initialize( void ) throw ( itk::ExceptionObject )
+::Initialize( void )
 {
   itk::TimeProbe timer;
   timer.Start();
diff --git a/Components/Metrics/PolydataDummyPenalty/itkPolydataDummyPenalty.h b/Components/Metrics/PolydataDummyPenalty/itkPolydataDummyPenalty.h
index 35850789..0ff20e16 100644
--- a/Components/Metrics/PolydataDummyPenalty/itkPolydataDummyPenalty.h
+++ b/Components/Metrics/PolydataDummyPenalty/itkPolydataDummyPenalty.h
@@ -153,7 +153,7 @@ public:
   /** Initialize the Metric by making sure that all the components are
   *  present and plugged together correctly.
   */
-  virtual void Initialize( void ) throw ( ExceptionObject );
+  virtual void Initialize( void );
 
   /** Set the fixed mask. */
   // \todo: currently not used
diff --git a/Components/Metrics/PolydataDummyPenalty/itkPolydataDummyPenalty.hxx b/Components/Metrics/PolydataDummyPenalty/itkPolydataDummyPenalty.hxx
index 248ebaae..324faee3 100644
--- a/Components/Metrics/PolydataDummyPenalty/itkPolydataDummyPenalty.hxx
+++ b/Components/Metrics/PolydataDummyPenalty/itkPolydataDummyPenalty.hxx
@@ -51,7 +51,7 @@ MeshPenalty< TFixedPointSet, TMovingPointSet  >
 template< class TFixedPointSet, class TMovingPointSet  >
 void
 MeshPenalty< TFixedPointSet, TMovingPointSet >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   /** Call the initialize of the superclass. */
   //this->Superclass::Initialize();
diff --git a/Components/Metrics/RigidityPenalty/elxTransformRigidityPenaltyTerm.h b/Components/Metrics/RigidityPenalty/elxTransformRigidityPenaltyTerm.h
index 40bc48f1..862a27c7 100644
--- a/Components/Metrics/RigidityPenalty/elxTransformRigidityPenaltyTerm.h
+++ b/Components/Metrics/RigidityPenalty/elxTransformRigidityPenaltyTerm.h
@@ -198,7 +198,7 @@ public:
   /** Sets up a timer to measure the initialization time and
    * calls the Superclass' implementation.
    */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
   /**
    * Do some things before each resolution:
diff --git a/Components/Metrics/RigidityPenalty/elxTransformRigidityPenaltyTerm.hxx b/Components/Metrics/RigidityPenalty/elxTransformRigidityPenaltyTerm.hxx
index df2fc0be..737a22d0 100644
--- a/Components/Metrics/RigidityPenalty/elxTransformRigidityPenaltyTerm.hxx
+++ b/Components/Metrics/RigidityPenalty/elxTransformRigidityPenaltyTerm.hxx
@@ -176,7 +176,7 @@ TransformRigidityPenalty< TElastix >
 template< class TElastix >
 void
 TransformRigidityPenalty< TElastix >
-::Initialize( void ) throw ( itk::ExceptionObject )
+::Initialize( void )
 {
   itk::TimeProbe timer;
   timer.Start();
diff --git a/Components/Metrics/RigidityPenalty/itkTransformRigidityPenaltyTerm.h b/Components/Metrics/RigidityPenalty/itkTransformRigidityPenaltyTerm.h
index 24144a37..81fb996e 100644
--- a/Components/Metrics/RigidityPenalty/itkTransformRigidityPenaltyTerm.h
+++ b/Components/Metrics/RigidityPenalty/itkTransformRigidityPenaltyTerm.h
@@ -145,7 +145,7 @@ public:
   itkStaticConstMacro( ImageDimension, unsigned int, FixedImageType::ImageDimension );
 
   /** Initialize the penalty term. */
-  virtual void Initialize( void ) throw ( ExceptionObject );
+  virtual void Initialize( void );
 
   /** Typedef's for B-spline transform. */
   typedef BSplineOrder3TransformType                 BSplineTransformType;
diff --git a/Components/Metrics/RigidityPenalty/itkTransformRigidityPenaltyTerm.hxx b/Components/Metrics/RigidityPenalty/itkTransformRigidityPenaltyTerm.hxx
index 84838ed6..d03ebde3 100644
--- a/Components/Metrics/RigidityPenalty/itkTransformRigidityPenaltyTerm.hxx
+++ b/Components/Metrics/RigidityPenalty/itkTransformRigidityPenaltyTerm.hxx
@@ -122,7 +122,7 @@ TransformRigidityPenaltyTerm< TFixedImage, TScalarType >
 template< class TFixedImage, class TScalarType >
 void
 TransformRigidityPenaltyTerm< TFixedImage, TScalarType >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   /** Call the initialize of the superclass. */
   this->Superclass::Initialize();
diff --git a/Components/Metrics/StatisticalShapePenalty/elxStatisticalShapePenalty.h b/Components/Metrics/StatisticalShapePenalty/elxStatisticalShapePenalty.h
index 4068da09..7dce6e79 100644
--- a/Components/Metrics/StatisticalShapePenalty/elxStatisticalShapePenalty.h
+++ b/Components/Metrics/StatisticalShapePenalty/elxStatisticalShapePenalty.h
@@ -152,7 +152,7 @@ public:
   /** Sets up a timer to measure the initialization time and calls the
    * Superclass' implementation.
    */
-  virtual void Initialize( void ) throw ( ExceptionObject );
+  virtual void Initialize( void );
 
   /**
    * Do some things before registration:
diff --git a/Components/Metrics/StatisticalShapePenalty/elxStatisticalShapePenalty.hxx b/Components/Metrics/StatisticalShapePenalty/elxStatisticalShapePenalty.hxx
index c31dd887..faf90f85 100644
--- a/Components/Metrics/StatisticalShapePenalty/elxStatisticalShapePenalty.hxx
+++ b/Components/Metrics/StatisticalShapePenalty/elxStatisticalShapePenalty.hxx
@@ -39,7 +39,7 @@ namespace elastix
 template< class TElastix >
 void
 StatisticalShapePenalty< TElastix >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   itk::TimeProbe timer;
   timer.Start();
diff --git a/Components/Metrics/StatisticalShapePenalty/itkStatisticalShapePointPenalty.h b/Components/Metrics/StatisticalShapePenalty/itkStatisticalShapePointPenalty.h
index 3c014302..3946a924 100644
--- a/Components/Metrics/StatisticalShapePenalty/itkStatisticalShapePointPenalty.h
+++ b/Components/Metrics/StatisticalShapePenalty/itkStatisticalShapePointPenalty.h
@@ -103,7 +103,7 @@ public:
   typedef vnl_svd_economy< CoordRepType > PCACovarianceType;
 
   /** Initialization. */
-  void Initialize( void ) throw ( ExceptionObject );
+  void Initialize( void );
 
   /**  Get the value for single valued optimizers. */
   MeasureType GetValue( const TransformParametersType & parameters ) const;
diff --git a/Components/Metrics/StatisticalShapePenalty/itkStatisticalShapePointPenalty.hxx b/Components/Metrics/StatisticalShapePenalty/itkStatisticalShapePointPenalty.hxx
index 77517d06..a2da9d5d 100644
--- a/Components/Metrics/StatisticalShapePenalty/itkStatisticalShapePointPenalty.hxx
+++ b/Components/Metrics/StatisticalShapePenalty/itkStatisticalShapePointPenalty.hxx
@@ -98,7 +98,7 @@ StatisticalShapePointPenalty< TFixedPointSet, TMovingPointSet >
 template< class TFixedPointSet, class TMovingPointSet >
 void
 StatisticalShapePointPenalty< TFixedPointSet, TMovingPointSet >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   /** Call the initialize of the superclass. */
   this->Superclass::Initialize();
diff --git a/Components/Metrics/SumOfPairwiseCorrelationsMetric/elxSumOfPairwiseCorrelationCoefficientsMetric.h b/Components/Metrics/SumOfPairwiseCorrelationsMetric/elxSumOfPairwiseCorrelationCoefficientsMetric.h
index 97b1b053..e6a3dbc3 100644
--- a/Components/Metrics/SumOfPairwiseCorrelationsMetric/elxSumOfPairwiseCorrelationCoefficientsMetric.h
+++ b/Components/Metrics/SumOfPairwiseCorrelationsMetric/elxSumOfPairwiseCorrelationCoefficientsMetric.h
@@ -167,7 +167,7 @@ public:
   /** Sets up a timer to measure the initialization time and
    * calls the Superclass' implementation.
    */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
   /**
    * Do some things before each resolution:
diff --git a/Components/Metrics/SumOfPairwiseCorrelationsMetric/elxSumOfPairwiseCorrelationCoefficientsMetric.hxx b/Components/Metrics/SumOfPairwiseCorrelationsMetric/elxSumOfPairwiseCorrelationCoefficientsMetric.hxx
index a490766e..16e73318 100644
--- a/Components/Metrics/SumOfPairwiseCorrelationsMetric/elxSumOfPairwiseCorrelationCoefficientsMetric.hxx
+++ b/Components/Metrics/SumOfPairwiseCorrelationsMetric/elxSumOfPairwiseCorrelationCoefficientsMetric.hxx
@@ -31,7 +31,7 @@ namespace elastix
 template< class TElastix >
 void
 SumOfPairwiseCorrelationCoefficientsMetric< TElastix >
-::Initialize( void ) throw ( itk::ExceptionObject )
+::Initialize( void )
 {
 
   itk::TimeProbe timer;
diff --git a/Components/Metrics/SumOfPairwiseCorrelationsMetric/itkSumOfPairwiseCorrelationCoefficientsMetric.h b/Components/Metrics/SumOfPairwiseCorrelationsMetric/itkSumOfPairwiseCorrelationCoefficientsMetric.h
index f02a4a10..7b203900 100644
--- a/Components/Metrics/SumOfPairwiseCorrelationsMetric/itkSumOfPairwiseCorrelationCoefficientsMetric.h
+++ b/Components/Metrics/SumOfPairwiseCorrelationsMetric/itkSumOfPairwiseCorrelationCoefficientsMetric.h
@@ -126,7 +126,7 @@ public:
    *  are present and plugged together correctly.
    * \li Call the superclass' implementation.   */
 
-  virtual void Initialize( void ) throw ( ExceptionObject );
+  virtual void Initialize( void );
 
 protected:
 
diff --git a/Components/Metrics/SumOfPairwiseCorrelationsMetric/itkSumOfPairwiseCorrelationCoefficientsMetric.hxx b/Components/Metrics/SumOfPairwiseCorrelationsMetric/itkSumOfPairwiseCorrelationCoefficientsMetric.hxx
index c62d62ec..69f4c023 100644
--- a/Components/Metrics/SumOfPairwiseCorrelationsMetric/itkSumOfPairwiseCorrelationCoefficientsMetric.hxx
+++ b/Components/Metrics/SumOfPairwiseCorrelationsMetric/itkSumOfPairwiseCorrelationCoefficientsMetric.hxx
@@ -50,7 +50,7 @@ SumOfPairwiseCorrelationCoefficientsMetric< TFixedImage, TMovingImage >
 template< class TFixedImage, class TMovingImage >
 void
 SumOfPairwiseCorrelationCoefficientsMetric< TFixedImage, TMovingImage >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   /** Initialize transform, interpolator, etc. */
   Superclass::Initialize();
diff --git a/Components/Metrics/SumSquaredTissueVolumeDifferenceMetric/elxSumSquaredTissueVolumeDifferenceMetric.h b/Components/Metrics/SumSquaredTissueVolumeDifferenceMetric/elxSumSquaredTissueVolumeDifferenceMetric.h
index 5ac3d592..d64fa3e5 100644
--- a/Components/Metrics/SumSquaredTissueVolumeDifferenceMetric/elxSumSquaredTissueVolumeDifferenceMetric.h
+++ b/Components/Metrics/SumSquaredTissueVolumeDifferenceMetric/elxSumSquaredTissueVolumeDifferenceMetric.h
@@ -143,7 +143,7 @@ public:
   /** Sets up a timer to measure the initialization time and
    * calls the Superclass' implementation.
    */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
   /**
    * Do some things before each resolution:
diff --git a/Components/Metrics/SumSquaredTissueVolumeDifferenceMetric/elxSumSquaredTissueVolumeDifferenceMetric.hxx b/Components/Metrics/SumSquaredTissueVolumeDifferenceMetric/elxSumSquaredTissueVolumeDifferenceMetric.hxx
index 78b49bec..3061b4ca 100644
--- a/Components/Metrics/SumSquaredTissueVolumeDifferenceMetric/elxSumSquaredTissueVolumeDifferenceMetric.hxx
+++ b/Components/Metrics/SumSquaredTissueVolumeDifferenceMetric/elxSumSquaredTissueVolumeDifferenceMetric.hxx
@@ -30,7 +30,7 @@ namespace elastix
 
 template <class TElastix>
 void SumSquaredTissueVolumeDifferenceMetric<TElastix>
-::Initialize(void) throw (itk::ExceptionObject)
+::Initialize(void)
 {
   itk::TimeProbe timer;
   timer.Start();
diff --git a/Components/Metrics/VarianceOverLastDimension/elxVarianceOverLastDimensionMetric.h b/Components/Metrics/VarianceOverLastDimension/elxVarianceOverLastDimensionMetric.h
index 7a6eba8d..cb780780 100644
--- a/Components/Metrics/VarianceOverLastDimension/elxVarianceOverLastDimensionMetric.h
+++ b/Components/Metrics/VarianceOverLastDimension/elxVarianceOverLastDimensionMetric.h
@@ -172,7 +172,7 @@ public:
   /** Sets up a timer to measure the initialization time and
    * calls the Superclass' implementation.
    */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
   /**
    * Do some things before registration:
diff --git a/Components/Metrics/VarianceOverLastDimension/elxVarianceOverLastDimensionMetric.hxx b/Components/Metrics/VarianceOverLastDimension/elxVarianceOverLastDimensionMetric.hxx
index 4fdb4f42..6096e326 100644
--- a/Components/Metrics/VarianceOverLastDimension/elxVarianceOverLastDimensionMetric.hxx
+++ b/Components/Metrics/VarianceOverLastDimension/elxVarianceOverLastDimensionMetric.hxx
@@ -31,7 +31,7 @@ namespace elastix
 template< class TElastix >
 void
 VarianceOverLastDimensionMetric< TElastix >
-::Initialize( void ) throw ( itk::ExceptionObject )
+::Initialize( void )
 {
   itk::TimeProbe timer;
   timer.Start();
diff --git a/Components/Metrics/VarianceOverLastDimension/itkVarianceOverLastDimensionImageMetric.h b/Components/Metrics/VarianceOverLastDimension/itkVarianceOverLastDimensionImageMetric.h
index 2a765a52..245ed34c 100644
--- a/Components/Metrics/VarianceOverLastDimension/itkVarianceOverLastDimensionImageMetric.h
+++ b/Components/Metrics/VarianceOverLastDimension/itkVarianceOverLastDimensionImageMetric.h
@@ -150,7 +150,7 @@ public:
   /** Initialize the Metric by making sure that all the components
    *  are present and plugged together correctly.
    * \li Call the superclass' implementation.   */
-  virtual void Initialize( void ) throw ( ExceptionObject );
+  virtual void Initialize( void );
 
 protected:
 
diff --git a/Components/Metrics/VarianceOverLastDimension/itkVarianceOverLastDimensionImageMetric.hxx b/Components/Metrics/VarianceOverLastDimension/itkVarianceOverLastDimensionImageMetric.hxx
index 0725a63e..4e463d63 100644
--- a/Components/Metrics/VarianceOverLastDimension/itkVarianceOverLastDimensionImageMetric.hxx
+++ b/Components/Metrics/VarianceOverLastDimension/itkVarianceOverLastDimensionImageMetric.hxx
@@ -52,7 +52,7 @@ VarianceOverLastDimensionImageMetric< TFixedImage, TMovingImage >
 template< class TFixedImage, class TMovingImage >
 void
 VarianceOverLastDimensionImageMetric< TFixedImage, TMovingImage >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   /** Initialize transform, interpolator, etc. */
   Superclass::Initialize();
diff --git a/Components/Metrics/ViolaWellsMutualInformation/elxViolaWellsMutualInformationMetric.h b/Components/Metrics/ViolaWellsMutualInformation/elxViolaWellsMutualInformationMetric.h
index aa581a51..31f916f7 100644
--- a/Components/Metrics/ViolaWellsMutualInformation/elxViolaWellsMutualInformationMetric.h
+++ b/Components/Metrics/ViolaWellsMutualInformation/elxViolaWellsMutualInformationMetric.h
@@ -129,7 +129,7 @@ public:
   /** Sets up a timer to measure the initialization time and
    * calls the Superclass' implementation.
    */
-  virtual void Initialize( void ) throw ( itk::ExceptionObject );
+  virtual void Initialize( void );
 
 protected:
 
diff --git a/Components/Metrics/ViolaWellsMutualInformation/elxViolaWellsMutualInformationMetric.hxx b/Components/Metrics/ViolaWellsMutualInformation/elxViolaWellsMutualInformationMetric.hxx
index f005d24c..06868683 100644
--- a/Components/Metrics/ViolaWellsMutualInformation/elxViolaWellsMutualInformationMetric.hxx
+++ b/Components/Metrics/ViolaWellsMutualInformation/elxViolaWellsMutualInformationMetric.hxx
@@ -40,7 +40,7 @@ ViolaWellsMutualInformationMetric< TElastix >
 template< class TElastix >
 void
 ViolaWellsMutualInformationMetric< TElastix >
-::Initialize( void ) throw ( itk::ExceptionObject )
+::Initialize( void )
 {
   itk::TimeProbe timer;
   timer.Start();
diff --git a/Components/Registrations/MultiMetricMultiResolutionRegistration/itkCombinationImageToImageMetric.h b/Components/Registrations/MultiMetricMultiResolutionRegistration/itkCombinationImageToImageMetric.h
index 3182cb63..dad49fe4 100644
--- a/Components/Registrations/MultiMetricMultiResolutionRegistration/itkCombinationImageToImageMetric.h
+++ b/Components/Registrations/MultiMetricMultiResolutionRegistration/itkCombinationImageToImageMetric.h
@@ -373,7 +373,7 @@ public:
   virtual const SizeValueType & GetNumberOfPixelsCounted( void ) const;
 
   /** Pass initialization to all sub metrics. */
-  virtual void Initialize( void ) throw ( ExceptionObject );
+  virtual void Initialize( void );
 
   /**
    * Combine all sub metrics by adding them.
diff --git a/Components/Registrations/MultiMetricMultiResolutionRegistration/itkCombinationImageToImageMetric.hxx b/Components/Registrations/MultiMetricMultiResolutionRegistration/itkCombinationImageToImageMetric.hxx
index fa6e979d..04372e3c 100644
--- a/Components/Registrations/MultiMetricMultiResolutionRegistration/itkCombinationImageToImageMetric.hxx
+++ b/Components/Registrations/MultiMetricMultiResolutionRegistration/itkCombinationImageToImageMetric.hxx
@@ -602,7 +602,7 @@ CombinationImageToImageMetric< TFixedImage, TMovingImage >
 template< class TFixedImage, class TMovingImage >
 void
 CombinationImageToImageMetric< TFixedImage, TMovingImage >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   /** Check if transform, interpolator have been set. Effectively this
    * method checks if the first sub metric is set up completely.
diff --git a/Components/Registrations/MultiMetricMultiResolutionRegistration/itkMultiMetricMultiResolutionImageRegistrationMethod.h b/Components/Registrations/MultiMetricMultiResolutionRegistration/itkMultiMetricMultiResolutionImageRegistrationMethod.h
index d1f41996..bdb5bd6f 100644
--- a/Components/Registrations/MultiMetricMultiResolutionRegistration/itkMultiMetricMultiResolutionImageRegistrationMethod.h
+++ b/Components/Registrations/MultiMetricMultiResolutionRegistration/itkMultiMetricMultiResolutionImageRegistrationMethod.h
@@ -270,7 +270,7 @@ protected:
    * This method is executed at every level of the pyramid with the
    * values corresponding to this resolution.
    */
-  virtual void Initialize( void ) throw ( ExceptionObject );
+  virtual void Initialize( void );
 
   /** Compute the size of the fixed region for each level of the pyramid.
    * Actually we would like to override PreparePyramids, but this function
@@ -281,12 +281,12 @@ protected:
   /** Function called by PrepareAllPyramids, which checks if the user input
    * regarding the image pyramids is ok.
    */
-  virtual void CheckPyramids( void ) throw ( ExceptionObject );
+  virtual void CheckPyramids( void );
 
   /** Function called by Initialize, which checks if the user input
    * is ok. Called by Initialize().
    */
-  virtual void CheckOnInitialize( void ) throw ( ExceptionObject );
+  virtual void CheckOnInitialize( void );
 
   /** Variables already defined in the superclass, but as private...  */
   bool           m_Stop;
diff --git a/Components/Registrations/MultiMetricMultiResolutionRegistration/itkMultiMetricMultiResolutionImageRegistrationMethod.hxx b/Components/Registrations/MultiMetricMultiResolutionRegistration/itkMultiMetricMultiResolutionImageRegistrationMethod.hxx
index fdf7f332..286909fd 100644
--- a/Components/Registrations/MultiMetricMultiResolutionRegistration/itkMultiMetricMultiResolutionImageRegistrationMethod.hxx
+++ b/Components/Registrations/MultiMetricMultiResolutionRegistration/itkMultiMetricMultiResolutionImageRegistrationMethod.hxx
@@ -156,7 +156,7 @@ MultiMetricMultiResolutionImageRegistrationMethod< TFixedImage, TMovingImage >
 template< typename TFixedImage, typename TMovingImage >
 void
 MultiMetricMultiResolutionImageRegistrationMethod< TFixedImage, TMovingImage >
-::Initialize( void ) throw ( ExceptionObject )
+::Initialize( void )
 {
   this->CheckOnInitialize();
 
@@ -522,7 +522,7 @@ MultiMetricMultiResolutionImageRegistrationMethod< TFixedImage, TMovingImage >
 template< typename TFixedImage, typename TMovingImage >
 void
 MultiMetricMultiResolutionImageRegistrationMethod< TFixedImage, TMovingImage >
-::CheckPyramids( void ) throw ( ExceptionObject )
+::CheckPyramids( void )
 {
   /** Check if at least one of the following are provided. */
   if( this->GetFixedImage() == 0 )
@@ -571,7 +571,7 @@ MultiMetricMultiResolutionImageRegistrationMethod< TFixedImage, TMovingImage >
 template< typename TFixedImage, typename TMovingImage >
 void
 MultiMetricMultiResolutionImageRegistrationMethod< TFixedImage, TMovingImage >
-::CheckOnInitialize( void ) throw ( ExceptionObject )
+::CheckOnInitialize( void )
 {
   /** Check if at least one of the following is present. */
   if( this->GetMetric() == 0 )
diff --git a/Components/Registrations/MultiResolutionRegistrationWithFeatures/itkMultiInputMultiResolutionImageRegistrationMethodBase.h b/Components/Registrations/MultiResolutionRegistrationWithFeatures/itkMultiInputMultiResolutionImageRegistrationMethodBase.h
index 7c5ccb70..95b8a4f4 100644
--- a/Components/Registrations/MultiResolutionRegistrationWithFeatures/itkMultiInputMultiResolutionImageRegistrationMethodBase.h
+++ b/Components/Registrations/MultiResolutionRegistrationWithFeatures/itkMultiInputMultiResolutionImageRegistrationMethodBase.h
@@ -258,7 +258,7 @@ protected:
    * This method is executed at every level of the pyramid with the
    * values corresponding to this resolution .
    */
-  virtual void Initialize() throw ( ExceptionObject );
+  virtual void Initialize();
 
   /** Compute the size of the fixed region for each level of the pyramid. */
   virtual void PreparePyramids( void );
@@ -266,10 +266,10 @@ protected:
   /** Function called by PreparePyramids, which checks if the user input
    * regarding the image pyramids is ok.
    */
-  virtual void CheckPyramids( void ) throw ( ExceptionObject );
+  virtual void CheckPyramids( void );
 
   /** Function called by Initialize, which checks if the user input is ok. */
-  virtual void CheckOnInitialize( void ) throw ( ExceptionObject );
+  virtual void CheckOnInitialize( void );
 
   /** Containers for the pointers supplied by the user */
   FixedImageVectorType             m_FixedImages;
diff --git a/Components/Registrations/MultiResolutionRegistrationWithFeatures/itkMultiInputMultiResolutionImageRegistrationMethodBase.hxx b/Components/Registrations/MultiResolutionRegistrationWithFeatures/itkMultiInputMultiResolutionImageRegistrationMethodBase.hxx
index 96bc10e7..49b9532a 100644
--- a/Components/Registrations/MultiResolutionRegistrationWithFeatures/itkMultiInputMultiResolutionImageRegistrationMethodBase.hxx
+++ b/Components/Registrations/MultiResolutionRegistrationWithFeatures/itkMultiInputMultiResolutionImageRegistrationMethodBase.hxx
@@ -267,7 +267,7 @@ MultiInputMultiResolutionImageRegistrationMethodBase< TFixedImage, TMovingImage
 template< typename TFixedImage, typename TMovingImage >
 void
 MultiInputMultiResolutionImageRegistrationMethodBase< TFixedImage, TMovingImage >
-::Initialize() throw ( ExceptionObject )
+::Initialize()
 {
   /** Sanity checks. */
   this->CheckOnInitialize();
@@ -622,7 +622,7 @@ MultiInputMultiResolutionImageRegistrationMethodBase< TFixedImage, TMovingImage
 template< typename TFixedImage, typename TMovingImage >
 void
 MultiInputMultiResolutionImageRegistrationMethodBase< TFixedImage, TMovingImage >
-::CheckPyramids( void ) throw ( ExceptionObject )
+::CheckPyramids( void )
 {
   /** Check if at least one of the following are provided. */
   if( this->GetFixedImage() == 0 )
@@ -668,7 +668,7 @@ MultiInputMultiResolutionImageRegistrationMethodBase< TFixedImage, TMovingImage
 template< typename TFixedImage, typename TMovingImage >
 void
 MultiInputMultiResolutionImageRegistrationMethodBase< TFixedImage, TMovingImage >
-::CheckOnInitialize( void ) throw ( ExceptionObject )
+::CheckOnInitialize( void )
 {
   /** check if at least one of the following is present. */
   if( this->GetMetric() == 0 )
diff --git a/Components/Registrations/MultiResolutionRegistrationWithFeatures/itkMultiResolutionImageRegistrationMethodWithFeatures.h b/Components/Registrations/MultiResolutionRegistrationWithFeatures/itkMultiResolutionImageRegistrationMethodWithFeatures.h
index 2635d911..d551f5c8 100644
--- a/Components/Registrations/MultiResolutionRegistrationWithFeatures/itkMultiResolutionImageRegistrationMethodWithFeatures.h
+++ b/Components/Registrations/MultiResolutionRegistrationWithFeatures/itkMultiResolutionImageRegistrationMethodWithFeatures.h
@@ -112,7 +112,7 @@ protected:
   /** Function called by PreparePyramids, which checks if the user input
    * regarding the image pyramids is ok.
    */
-  virtual void CheckPyramids( void ) throw ( ExceptionObject );
+  virtual void CheckPyramids( void );
 
 private:
 
diff --git a/Components/Registrations/MultiResolutionRegistrationWithFeatures/itkMultiResolutionImageRegistrationMethodWithFeatures.hxx b/Components/Registrations/MultiResolutionRegistrationWithFeatures/itkMultiResolutionImageRegistrationMethodWithFeatures.hxx
index 6bca8ed8..eef1de58 100644
--- a/Components/Registrations/MultiResolutionRegistrationWithFeatures/itkMultiResolutionImageRegistrationMethodWithFeatures.hxx
+++ b/Components/Registrations/MultiResolutionRegistrationWithFeatures/itkMultiResolutionImageRegistrationMethodWithFeatures.hxx
@@ -33,7 +33,7 @@ namespace itk
 template< typename TFixedImage, typename TMovingImage >
 void
 MultiResolutionImageRegistrationMethodWithFeatures< TFixedImage, TMovingImage >
-::CheckPyramids( void ) throw ( ExceptionObject )
+::CheckPyramids( void )
 {
   /** Check if at least one of the following are provided. */
   if( this->GetFixedImage() == 0 )
-- 
2.20.1