COMP: remove use of ITK_TYPENAME

Code/BasicFilters/otbImageAndVectorImageOperationFilter.h

@@ -120,10 +120,10 @@ class ITK_EXPORT ImageAndVectorImageOperationFilter :
   public itk::BinaryFunctorImageFilter<TInputImage,
       TVectorInputImage,
       TOutputImage,
-      Functor::ImageAndVectorImageOperationFunctor<ITK_TYPENAME TInputImage::PixelType,
-          ITK_TYPENAME TVectorInputImage::
+      Functor::ImageAndVectorImageOperationFunctor<typename TInputImage::PixelType,
+          typename TVectorInputImage::
           PixelType,
-          ITK_TYPENAME TOutputImage::
+          typename TOutputImage::
           PixelType> >
 //ImageToImageFilter< TVectorInputImage, TOutputImage >
 {
@@ -132,9 +132,9 @@ public:
   /** Standard class typedefs. */
   typedef ImageAndVectorImageOperationFilter Self;
   //typedef itk::ImageToImageFilter<TVectorInputImage, TOutputImage> Superclass;
-  typedef Functor::ImageAndVectorImageOperationFunctor<ITK_TYPENAME TInputImage::PixelType,
-      ITK_TYPENAME TVectorInputImage::PixelType,
-      ITK_TYPENAME TOutputImage::PixelType> FunctorType;
+  typedef Functor::ImageAndVectorImageOperationFunctor<typename TInputImage::PixelType,
+      typename TVectorInputImage::PixelType,
+      typename TOutputImage::PixelType> FunctorType;
   typedef itk::BinaryFunctorImageFilter<TInputImage, TVectorInputImage, TOutputImage, FunctorType> Superclass;
   typedef itk::SmartPointer<Self>                                                                  Pointer;
   typedef itk::SmartPointer<const Self>                                                            ConstPointer;

Code/BasicFilters/otbLog10ThresholdedImageFilter.h

@@ -76,12 +76,12 @@ private:
 
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT Log10ThresholdedImageFilter :
-    public itk::UnaryFunctorImageFilter<TInputImage, TOutputImage, Functor::Log10Thresholded<ITK_TYPENAME TInputImage::PixelType, ITK_TYPENAME TOutputImage::PixelType> >
+    public itk::UnaryFunctorImageFilter<TInputImage, TOutputImage, Functor::Log10Thresholded<typename TInputImage::PixelType, typename TOutputImage::PixelType> >
 {
 public:
   /** Standard class typedefs. */
   typedef Log10ThresholdedImageFilter                                Self;
-  typedef Functor::Log10Thresholded<  ITK_TYPENAME TInputImage::PixelType, ITK_TYPENAME TOutputImage::PixelType> FunctorType;
+  typedef Functor::Log10Thresholded<  typename TInputImage::PixelType, typename TOutputImage::PixelType> FunctorType;
   typedef itk::UnaryFunctorImageFilter<  TInputImage, TOutputImage, FunctorType>  Superclass;
   typedef itk::SmartPointer<Self>                              Pointer;
   typedef itk::SmartPointer<const Self>                        ConstPointer;

Code/BasicFilters/otbProlateInterpolateImageFunction.h

@@ -254,7 +254,7 @@ template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCond
       double, class TInputInterpolator = double, class TOutputInterpolator = double>
 class ITK_EXPORT ProlateInterpolateImageFunction :
   public GenericInterpolateImageFunction<TInputImage,
-      ITK_TYPENAME Function::ProlateFunction<TInputInterpolator, TOutputInterpolator>,
+      typename Function::ProlateFunction<TInputInterpolator, TOutputInterpolator>,
       TBoundaryCondition,
       TCoordRep>
 {

Code/BasicFilters/otbShiftScaleVectorImageFilter.h

@@ -146,14 +146,14 @@ private:
 template <class TInputImage, class TOutputImage = TInputImage>
 class ITK_EXPORT ShiftScaleVectorImageFilter :
     public itk::UnaryFunctorImageFilter<TInputImage, TOutputImage,
-                  Functor::VectorShiftScale<ITK_TYPENAME TInputImage::PixelType,
-                                            ITK_TYPENAME TOutputImage::PixelType> >
+                  Functor::VectorShiftScale<typename TInputImage::PixelType,
+                                            typename TOutputImage::PixelType> >
 {
 public:
   /** Standard class typedefs. */
   typedef ShiftScaleVectorImageFilter                                        Self;
-  typedef Functor::VectorShiftScale< ITK_TYPENAME TInputImage::PixelType,
-                                      ITK_TYPENAME TOutputImage::PixelType>
+  typedef Functor::VectorShiftScale< typename TInputImage::PixelType,
+                                      typename TOutputImage::PixelType>
                                                                              FunctorType;
   typedef itk::UnaryFunctorImageFilter<TInputImage, TOutputImage,
                                        FunctorType >                         Superclass;

Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h

@@ -90,7 +90,7 @@ template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCond
       double, class TInputInterpolator = double, class TOutputInterpolator = double>
 class ITK_EXPORT WindowedSincInterpolateImageBlackmanFunction :
   public WindowedSincInterpolateImageFunctionBase<TInputImage,
-      ITK_TYPENAME Function::BlackmanWindowFunction<TInputInterpolator,
+      typename Function::BlackmanWindowFunction<TInputInterpolator,
           TOutputInterpolator>,
       TBoundaryCondition,
       TCoordRep>
@@ -99,7 +99,7 @@ public:
   /** Standard class typedefs. */
   typedef WindowedSincInterpolateImageBlackmanFunction Self;
   typedef WindowedSincInterpolateImageFunctionBase<TInputImage,
-      ITK_TYPENAME Function::BlackmanWindowFunction<TInputInterpolator,
+      typename Function::BlackmanWindowFunction<TInputInterpolator,
           TOutputInterpolator>,
       TBoundaryCondition,
       TCoordRep>

Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h

@@ -83,7 +83,7 @@ template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCond
       double, class TInputInterpolator = double, class TOutputInterpolator = double>
 class ITK_EXPORT WindowedSincInterpolateImageCosineFunction :
   public WindowedSincInterpolateImageFunctionBase<TInputImage,
-      ITK_TYPENAME Function::CosineWindowFunction<TInputInterpolator,
+      typename Function::CosineWindowFunction<TInputInterpolator,
           TOutputInterpolator>,
       TBoundaryCondition,
       TCoordRep>
@@ -92,7 +92,7 @@ public:
   /** Standard class typedefs. */
   typedef WindowedSincInterpolateImageCosineFunction Self;
   typedef WindowedSincInterpolateImageFunctionBase<TInputImage,
-      ITK_TYPENAME Function::CosineWindowFunction<TInputInterpolator,
+      typename Function::CosineWindowFunction<TInputInterpolator,
           TOutputInterpolator>,
       TBoundaryCondition,
       TCoordRep>

Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h

@@ -83,7 +83,7 @@ template<class TInputImage, class TBoundaryCondition = itk::ZeroFluxNeumannBound
       double, class TInputInterpolator = double, class TOutputInterpolator = double>
 class ITK_EXPORT WindowedSincInterpolateImageGaussianFunction :
   public WindowedSincInterpolateImageFunctionBase<TInputImage,
-      ITK_TYPENAME Function::GaussianWindowFunction<TInputInterpolator,
+      typename Function::GaussianWindowFunction<TInputInterpolator,
           TOutputInterpolator>,
       TBoundaryCondition,
       TCoordRep>
@@ -92,7 +92,7 @@ public:
   /** Standard class typedefs. */
   typedef WindowedSincInterpolateImageGaussianFunction Self;
   typedef WindowedSincInterpolateImageFunctionBase<TInputImage,
-      ITK_TYPENAME Function::GaussianWindowFunction<TInputInterpolator,
+      typename Function::GaussianWindowFunction<TInputInterpolator,
           TOutputInterpolator>,
       TBoundaryCondition,
       TCoordRep>

Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h

@@ -84,7 +84,7 @@ template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCond
       double, class TInputInterpolator = double, class TOutputInterpolator = double>
 class ITK_EXPORT WindowedSincInterpolateImageHammingFunction :
   public WindowedSincInterpolateImageFunctionBase<TInputImage,
-      ITK_TYPENAME Function::HammingWindowFunction<TInputInterpolator,
+      typename Function::HammingWindowFunction<TInputInterpolator,
           TOutputInterpolator>,
       TBoundaryCondition,
       TCoordRep>
@@ -93,7 +93,7 @@ public:
   /** Standard class typedefs. */
   typedef WindowedSincInterpolateImageHammingFunction Self;
   typedef WindowedSincInterpolateImageFunctionBase<TInputImage,
-      ITK_TYPENAME Function::HammingWindowFunction<TInputInterpolator,
+      typename Function::HammingWindowFunction<TInputInterpolator,
           TOutputInterpolator>,
       TBoundaryCondition,
       TCoordRep>

Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h

@@ -94,7 +94,7 @@ template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCond
       double, class TInputInterpolator = double, class TOutputInterpolator = double>
 class ITK_EXPORT WindowedSincInterpolateImageLanczosFunction :
   public WindowedSincInterpolateImageFunctionBase<TInputImage,
-      ITK_TYPENAME Function::LanczosWindowFunction<TInputInterpolator,
+      typename Function::LanczosWindowFunction<TInputInterpolator,
           TOutputInterpolator>,
       TBoundaryCondition,
       TCoordRep>
@@ -103,7 +103,7 @@ public:
   /** Standard class typedefs. */
   typedef WindowedSincInterpolateImageLanczosFunction Self;
   typedef WindowedSincInterpolateImageFunctionBase<TInputImage,
-      ITK_TYPENAME Function::LanczosWindowFunction<TInputInterpolator,
+      typename Function::LanczosWindowFunction<TInputInterpolator,
           TOutputInterpolator>,
       TBoundaryCondition,
       TCoordRep>

Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h

@@ -83,7 +83,7 @@ template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCond
       double, class TInputInterpolator = double, class TOutputInterpolator = double>
 class ITK_EXPORT WindowedSincInterpolateImageWelchFunction :
   public WindowedSincInterpolateImageFunctionBase<TInputImage,
-      ITK_TYPENAME Function::WelchWindowFunction<TInputInterpolator,
+      typename Function::WelchWindowFunction<TInputInterpolator,
           TOutputInterpolator>,
       TBoundaryCondition,
       TCoordRep>
@@ -92,7 +92,7 @@ public:
   /** Standard class typedefs. */
   typedef WindowedSincInterpolateImageWelchFunction Self;
   typedef WindowedSincInterpolateImageFunctionBase<TInputImage,
-      ITK_TYPENAME Function::WelchWindowFunction<TInputInterpolator,
+      typename Function::WelchWindowFunction<TInputInterpolator,
           TOutputInterpolator>,
       TBoundaryCondition,
       TCoordRep>

Code/ChangeDetection/otbCBAMIChangeDetector.h

@@ -54,9 +54,9 @@ class ITK_EXPORT CBAMIChangeDetector :
   public BinaryFunctorNeighborhoodImageFilter<
       TInputImage1, TInputImage2, TOutputImage,
       Functor::CBAMI<
-          ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
-          ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
-          ITK_TYPENAME TOutputImage::PixelType> >
+          typename itk::ConstNeighborhoodIterator<TInputImage1>,
+          typename itk::ConstNeighborhoodIterator<TInputImage2>,
+          typename TOutputImage::PixelType> >
 {
 public:
   /** Standard class typedefs. */
@@ -64,9 +64,9 @@ public:
   typedef BinaryFunctorNeighborhoodImageFilter<
       TInputImage1, TInputImage2, TOutputImage,
       Functor::CBAMI<
-          ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
-          ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
-          ITK_TYPENAME TOutputImage::PixelType>
+          typename itk::ConstNeighborhoodIterator<TInputImage1>,
+          typename itk::ConstNeighborhoodIterator<TInputImage2>,
+          typename TOutputImage::PixelType>
       >  Superclass;
   typedef itk::SmartPointer<Self>       Pointer;
   typedef itk::SmartPointer<const Self> ConstPointer;

Code/ChangeDetection/otbCorrelationChangeDetector.h

@@ -53,9 +53,9 @@ class ITK_EXPORT CorrelationChangeDetector :
   public BinaryFunctorNeighborhoodImageFilter<
       TInputImage1, TInputImage2, TOutputImage,
       Functor::CrossCorrelation<
-          ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
-          ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
-          ITK_TYPENAME TOutputImage::PixelType> >
+          typename itk::ConstNeighborhoodIterator<TInputImage1>,
+          typename itk::ConstNeighborhoodIterator<TInputImage2>,
+          typename TOutputImage::PixelType> >
 {
 public:
   /** Standard class typedefs. */
@@ -63,9 +63,9 @@ public:
   typedef BinaryFunctorNeighborhoodImageFilter<
       TInputImage1, TInputImage2, TOutputImage,
       Functor::CrossCorrelation<
-          ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
-          ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
-          ITK_TYPENAME TOutputImage::PixelType>
+          typename itk::ConstNeighborhoodIterator<TInputImage1>,
+          typename itk::ConstNeighborhoodIterator<TInputImage2>,
+          typename TOutputImage::PixelType>
       >  Superclass;
   typedef itk::SmartPointer<Self>       Pointer;
   typedef itk::SmartPointer<const Self> ConstPointer;

Code/ChangeDetection/otbLHMIChangeDetector.h

@@ -54,9 +54,9 @@ class ITK_EXPORT LHMIChangeDetector :
   public BinaryFunctorNeighborhoodImageFilter<
       TInputImage1, TInputImage2, TOutputImage,
       Functor::LHMI<
-          ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
-          ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
-          ITK_TYPENAME TOutputImage::PixelType> >
+          typename itk::ConstNeighborhoodIterator<TInputImage1>,
+          typename itk::ConstNeighborhoodIterator<TInputImage2>,
+          typename TOutputImage::PixelType> >
 {
 public:
   /** Standard class typedefs. */
@@ -64,9 +64,9 @@ public:
   typedef BinaryFunctorNeighborhoodImageFilter<
       TInputImage1, TInputImage2, TOutputImage,
       Functor::LHMI<
-          ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
-          ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
-          ITK_TYPENAME TOutputImage::PixelType>
+          typename itk::ConstNeighborhoodIterator<TInputImage1>,
+          typename itk::ConstNeighborhoodIterator<TInputImage2>,
+          typename TOutputImage::PixelType>
       >  Superclass;
   typedef itk::SmartPointer<Self>       Pointer;
   typedef itk::SmartPointer<const Self> ConstPointer;

Code/ChangeDetection/otbMeanDifferenceImageFilter.h

@@ -52,9 +52,9 @@ class ITK_EXPORT MeanDifferenceImageFilter :
   public BinaryFunctorNeighborhoodImageFilter<
       TInputImage1, TInputImage2, TOutputImage,
       Functor::MeanDifference<
-          ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
-          ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
-          ITK_TYPENAME TOutputImage::PixelType> >
+          typename itk::ConstNeighborhoodIterator<TInputImage1>,
+          typename itk::ConstNeighborhoodIterator<TInputImage2>,
+          typename TOutputImage::PixelType> >
 {
 public:
   /** Standard class typedefs. */
@@ -62,9 +62,9 @@ public:
   typedef BinaryFunctorNeighborhoodImageFilter<
       TInputImage1, TInputImage2, TOutputImage,
       Functor::MeanDifference<
-          ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
-          ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
-          ITK_TYPENAME TOutputImage::PixelType>
+          typename itk::ConstNeighborhoodIterator<TInputImage1>,
+          typename itk::ConstNeighborhoodIterator<TInputImage2>,
+          typename TOutputImage::PixelType>
       >  Superclass;
   typedef itk::SmartPointer<Self>       Pointer;
   typedef itk::SmartPointer<const Self> ConstPointer;

Code/ChangeDetection/otbMeanRatioImageFilter.h

@@ -51,9 +51,9 @@ class ITK_EXPORT MeanRatioImageFilter :
   public BinaryFunctorNeighborhoodImageFilter<
       TInputImage1, TInputImage2, TOutputImage,
       Functor::MeanRatio<
-          ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
-          ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
-          ITK_TYPENAME TOutputImage::PixelType> >
+          typename itk::ConstNeighborhoodIterator<TInputImage1>,
+          typename itk::ConstNeighborhoodIterator<TInputImage2>,
+          typename TOutputImage::PixelType> >
 {
 public:
   /** Standard class typedefs. */
@@ -61,9 +61,9 @@ public:
   typedef BinaryFunctorNeighborhoodImageFilter<
       TInputImage1, TInputImage2, TOutputImage,
       Functor::MeanRatio<
-          ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
-          ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
-          ITK_TYPENAME TOutputImage::PixelType>
+          typename itk::ConstNeighborhoodIterator<TInputImage1>,
+          typename itk::ConstNeighborhoodIterator<TInputImage2>,
+          typename TOutputImage::PixelType>
       >  Superclass;
   typedef itk::SmartPointer<Self>       Pointer;
   typedef itk::SmartPointer<const Self> ConstPointer;

Code/FeatureExtraction/otbCloudDetectionFilter.h

@@ -27,7 +27,7 @@ namespace otb
  * \brief Applies cloud detection functor to an image.
  */
 template <class TInputImage, class TOutputImage, class TFunction = Functor::CloudDetectionFunctor<
-        ITK_TYPENAME TInputImage::PixelType, ITK_TYPENAME TOutputImage::PixelType> >
+        typename TInputImage::PixelType, typename TOutputImage::PixelType> >
 class ITK_EXPORT CloudDetectionFilter : public itk::UnaryFunctorImageFilter<TInputImage, TOutputImage, TFunction>
 {
 public:

Code/FeatureExtraction/otbCloudEstimatorFilter.h

@@ -33,7 +33,7 @@ namespace otb
  * \example FeatureExtraction/CloudDetectionExample.cxx
  */
 template <class TInputImage, class TOutputImage, class TFunction = Functor::SpectralAngleFunctor<
-        ITK_TYPENAME TInputImage::PixelType, ITK_TYPENAME TOutputImage::PixelType> >
+        typename TInputImage::PixelType, typename TOutputImage::PixelType> >
 class ITK_EXPORT CloudEstimatorFilter : public itk::UnaryFunctorImageFilter<TInputImage, TOutputImage, TFunction>
 {
 public:

Code/FeatureExtraction/otbFlusserMomentsImageFunction.h

@@ -65,7 +65,7 @@ template <class TInputImage, class TCoordRep = double >
 class ITK_EXPORT FlusserMomentsImageFunction :
   public itk::ImageFunction< TInputImage,
     itk::FixedArray<
-    ITK_TYPENAME itk::NumericTraits<typename TInputImage::PixelType>::RealType,
+    typename itk::NumericTraits<typename TInputImage::PixelType>::RealType,
     11 >,
     TCoordRep >
 {
@@ -74,7 +74,7 @@ public:
   typedef FlusserMomentsImageFunction                                     Self;
   typedef itk::ImageFunction< TInputImage,
                    itk::FixedArray<
-                   ITK_TYPENAME itk::NumericTraits<
+                   typename itk::NumericTraits<
                    typename TInputImage::PixelType>::RealType,
                    11 >,
                    TCoordRep >                                            Superclass;

Code/FeatureExtraction/otbFourierMellinDescriptorsImageFunction.h

@@ -57,7 +57,7 @@ template <class TInputImage, class TCoordRep = double>
 class ITK_EXPORT FourierMellinDescriptorsImageFunction :
     public itk::ImageFunction <TInputImage,
                                std::vector< std::vector<
-                               ITK_TYPENAME itk::NumericTraits<
+                               typename itk::NumericTraits<
                                typename TInputImage::PixelType>::RealType > >,
                                TCoordRep>
 {
@@ -66,7 +66,7 @@ public:
   typedef FourierMellinDescriptorsImageFunction                                Self;
   typedef itk::ImageFunction<TInputImage,
                              std::vector< std::vector<
-                             ITK_TYPENAME itk::NumericTraits<
+                             typename itk::NumericTraits<
                              typename TInputImage::PixelType>::RealType > >,
                              TCoordRep>                                        Superclass;
   typedef itk::SmartPointer<Self>                                              Pointer;

Code/FeatureExtraction/otbHaralickTexturesImageFunction.h

@@ -69,7 +69,7 @@ template <class TInputImage, class TCoordRep = double >
 class ITK_EXPORT HaralickTexturesImageFunction :
   public itk::ImageFunction< TInputImage,
     itk::FixedArray<
-    ITK_TYPENAME itk::NumericTraits<typename TInputImage::PixelType>::RealType,
+    typename itk::NumericTraits<typename TInputImage::PixelType>::RealType,
     8 >,
     TCoordRep >
 {
@@ -78,7 +78,7 @@ public:
   typedef HaralickTexturesImageFunction                                   Self;
   typedef itk::ImageFunction< TInputImage,
                    itk::FixedArray<
-                   ITK_TYPENAME itk::NumericTraits<
+                   typename itk::NumericTraits<
                    typename TInputImage::PixelType>::RealType,
                    8 >,
                    TCoordRep >                                            Superclass;

Code/FeatureExtraction/otbHarrisImageToPointSetFilter.h

@@ -30,7 +30,7 @@ namespace otb
  */
 
 template <class TInputImage,
-    class TOutputPointSet = itk::PointSet<ITK_TYPENAME TInputImage::PixelType, 2> >
+    class TOutputPointSet = itk::PointSet<typename TInputImage::PixelType, 2> >
 class ITK_EXPORT HarrisImageToPointSetFilter :
   public ImageToPointSetFilter<TInputImage, TOutputPointSet>
 {

Code/FeatureExtraction/otbHessianToScalarImageFilter.h

@@ -73,8 +73,8 @@ class ITK_EXPORT HessianToScalarImageFilter :
   public itk::UnaryFunctorImageFilter<
       TInputImage, TOutputImage,
       Functor::HessianToScalar<
-          ITK_TYPENAME TInputImage::PixelType,
-          ITK_TYPENAME TOutputImage::PixelType> >
+          typename TInputImage::PixelType,
+          typename TOutputImage::PixelType> >
 {
 public:
   /** Standard class typedefs. */
@@ -83,8 +83,8 @@ public:
       TInputImage,
       TOutputImage,
       Functor::HessianToScalar<
-          ITK_TYPENAME TInputImage::PixelType,
-          ITK_TYPENAME TOutputImage::PixelType> > Superclass;
+          typename TInputImage::PixelType,
+          typename TOutputImage::PixelType> > Superclass;
   typedef itk::SmartPointer<Self>       Pointer;
   typedef itk::SmartPointer<const Self> ConstPointer;
 

Code/FeatureExtraction/otbHuMomentsImageFunction.h

@@ -61,7 +61,7 @@ template <class TInputImage, class TCoordRep = double>
 class ITK_EXPORT HuMomentsImageFunction :
 public itk::ImageFunction< TInputImage,
     itk::FixedArray<
-    ITK_TYPENAME itk::NumericTraits<typename TInputImage::PixelType>::RealType,
+    typename itk::NumericTraits<typename TInputImage::PixelType>::RealType,
     7 >,
     TCoordRep >
 {
@@ -70,7 +70,7 @@ public:
   typedef HuMomentsImageFunction                                          Self;
   typedef itk::ImageFunction< TInputImage,
                    itk::FixedArray<
-                   ITK_TYPENAME itk::NumericTraits<
+                   typename itk::NumericTraits<
                    typename TInputImage::PixelType>::RealType,
                    7 >,
                    TCoordRep >                                            Superclass;

Code/FeatureExtraction/otbMultiplyByScalarImageFilter.h

@@ -67,8 +67,8 @@ class ITK_EXPORT MultiplyByScalarImageFilter :
   public itk::UnaryFunctorImageFilter<
       TInputImage, TOutputImage,
       Functor::MultiplyByScalar<
-          ITK_TYPENAME TInputImage::PixelType,
-          ITK_TYPENAME TOutputImage::PixelType> >
+          typename TInputImage::PixelType,
+          typename TOutputImage::PixelType> >
 {
 public:
   /** Standard class typedefs. */
@@ -77,8 +77,8 @@ public:
       TInputImage,
       TOutputImage,
       Functor::MultiplyByScalar<
-          ITK_TYPENAME TInputImage::PixelType,
-          ITK_TYPENAME TOutputImage::PixelType> > Superclass;
+          typename TInputImage::PixelType,
+          typename TOutputImage::PixelType> > Superclass;
   typedef itk::SmartPointer<Self>       Pointer;
   typedef itk::SmartPointer<const Self> ConstPointer;
 

Code/FeatureExtraction/otbRadiometricMomentsImageFunction.h

@@ -41,7 +41,7 @@ template <class TInputImage, class TCoordRep = double >
 class ITK_EXPORT RadiometricMomentsImageFunction :
   public itk::ImageFunction< TInputImage,
     itk::FixedArray<
-    ITK_TYPENAME itk::NumericTraits<typename TInputImage::PixelType>::RealType,
+    typename itk::NumericTraits<typename TInputImage::PixelType>::RealType,
     4 >,
     TCoordRep >
 {
@@ -50,7 +50,7 @@ public:
   typedef RadiometricMomentsImageFunction                                 Self;
   typedef itk::ImageFunction< TInputImage,
                    itk::FixedArray<
-                   ITK_TYPENAME itk::NumericTraits<
+                   typename itk::NumericTraits<
                    typename TInputImage::PixelType>::RealType,
                    4 >,
                    TCoordRep >                                            Superclass;

Code/FeatureExtraction/otbRealMomentsImageFunction.h

@@ -37,7 +37,7 @@ template <class TInputImage, class TCoordRep = double>
 class ITK_EXPORT RealMomentsImageFunction :
     public itk::ImageFunction<TInputImage,
                               std::vector< std::vector<
-                              ITK_TYPENAME itk::NumericTraits<
+                              typename itk::NumericTraits<
                               typename TInputImage::PixelType>::RealType > >,
                               TCoordRep>
 {
@@ -46,7 +46,7 @@ public:
   typedef RealMomentsImageFunction                                             Self;
   typedef itk::ImageFunction<TInputImage,
                              std::vector< std::vector<
-                             ITK_TYPENAME itk::NumericTraits<
+                             typename itk::NumericTraits<
                              typename TInputImage::PixelType>::RealType > >,
                              TCoordRep>                                        Superclass;
   typedef itk::SmartPointer<Self>                                              Pointer;

Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx

@@ -116,12 +116,12 @@ RegionImageToRectangularPathListFilter<TInputImage, TOutputPath>
   markerImage->SetBufferedRegion(markerRegion);
   markerImage->SetRequestedRegion(markerRegion);
   markerImage->Allocate();
-  unsigned char maxValue = itk::NumericTraits<ITK_TYPENAME MarkerImageType::PixelType>::max();
+  unsigned char maxValue = itk::NumericTraits<typename MarkerImageType::PixelType>::max();
   markerImage->FillBuffer(maxValue);
-  unsigned char zeroValue = itk::NumericTraits<ITK_TYPENAME MarkerImageType::PixelType>::Zero;
+  unsigned char zeroValue = itk::NumericTraits<typename MarkerImageType::PixelType>::Zero;
   unsigned char regionValue;
   int           neighbor;
-  //markerImage->FillBuffer(itk::NumericTraits<ITK_TYPENAME MarkerImageType::PixelType>::max());
+  //markerImage->FillBuffer(itk::NumericTraits<typename MarkerImageType::PixelType>::max());
 
   //typedef itk::ImageRegionIterator<MarkerImageType> MarkerIteratorType;
   typedef itk::ImageRegionIteratorWithIndex<MarkerImageType> MarkerIteratorType;

Code/FeatureExtraction/otbTextureImageFunction.h

@@ -38,13 +38,13 @@ namespace otb
  */
 template <class TInputImage, class TFunctor, class TCoordRep = float>
 class ITK_EXPORT TextureImageFunction :
-  public itk::ImageFunction<TInputImage, ITK_TYPENAME itk::NumericTraits<typename TInputImage::PixelType>::RealType,
+  public itk::ImageFunction<TInputImage, typename itk::NumericTraits<typename TInputImage::PixelType>::RealType,
       TCoordRep>
 {
 public:
   /** Standard class typedefs. */
   typedef TextureImageFunction Self;
-  typedef itk::ImageFunction<TInputImage, ITK_TYPENAME itk::NumericTraits<typename TInputImage::PixelType>::RealType,
+  typedef itk::ImageFunction<TInputImage, typename itk::NumericTraits<typename TInputImage::PixelType>::RealType,
       TCoordRep> Superclass;
   typedef itk::SmartPointer<Self>       Pointer;
   typedef itk::SmartPointer<const Self> ConstPointer;

Code/FeatureExtraction/otbThresholdImageToPointSetFilter.h

@@ -31,7 +31,7 @@ namespace otb
  */
 
 template <class TInputImage,
-    class TOutputPointSet = itk::PointSet<ITK_TYPENAME TInputImage::PixelType, 2> >
+    class TOutputPointSet = itk::PointSet<typename TInputImage::PixelType, 2> >
 class ITK_EXPORT ThresholdImageToPointSetFilter :
   public ImageToPointSetFilter<TInputImage, TOutputPointSet>
 {

Code/Fusion/otbBayesianFusionFilter.h

@@ -197,10 +197,10 @@ class ITK_EXPORT BayesianFusionFilter
       TInputMultiSpectralInterpImage,
       TInputPanchroImage,
       TOutputImage,
-      Functor::BayesianFunctor<ITK_TYPENAME TInputMultiSpectralImage::PixelType,
-          ITK_TYPENAME TInputMultiSpectralInterpImage::PixelType,
-          ITK_TYPENAME TInputPanchroImage::PixelType,
-          ITK_TYPENAME TOutputImage::PixelType> >
+      Functor::BayesianFunctor<typename TInputMultiSpectralImage::PixelType,
+          typename TInputMultiSpectralInterpImage::PixelType,
+          typename TInputPanchroImage::PixelType,
+          typename TOutputImage::PixelType> >
 {
 public:
   /**   Extract input and output images dimensions.*/
@@ -219,10 +219,10 @@ public:
       InputMultiSpectralInterpImageType,
       InputPanchroImageType,
       OutputImageType,
-      Functor::BayesianFunctor<ITK_TYPENAME InputMultiSpectralImageType::PixelType,
-          ITK_TYPENAME InputMultiSpectralInterpImageType::PixelType,
-          ITK_TYPENAME InputPanchroImageType::PixelType,
-          ITK_TYPENAME OutputImageType::PixelType> > Superclass;
+      Functor::BayesianFunctor<typename InputMultiSpectralImageType::PixelType,