X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FitkFlexibleBinaryFunctorImageFilter.h;h=f8736d7e1cf04e43c3002c4dc86789378544c24a;hb=ae51e9bb80bdcd9468718a9473c1e9316cef2fd5;hp=18062a2296302fbebc2f922cbc65e920e652d1bc;hpb=5312281fb385245fff3d64693e1549ffc27206e4;p=clitk.git

diff --git a/itk/itkFlexibleBinaryFunctorImageFilter.h b/itk/itkFlexibleBinaryFunctorImageFilter.h
index 18062a2..f8736d7 100644
--- a/itk/itkFlexibleBinaryFunctorImageFilter.h
+++ b/itk/itkFlexibleBinaryFunctorImageFilter.h
@@ -20,6 +20,8 @@
 #include "itkInPlaceImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
 
+#include "clitkCommon.h"
+
 namespace itk
 {
   
@@ -109,8 +111,8 @@ public:
       }
     }
 
-  virtual void GenerateOutputInformation();
-  virtual void GenerateInputRequestedRegion();
+  virtual void GenerateOutputInformation() ITK_OVERRIDE;
+  virtual void GenerateInputRequestedRegion() ITK_OVERRIDE;
 
   /** ImageDimension constants */
   itkStaticConstMacro(
@@ -145,13 +147,8 @@ protected:
    *
    * \sa ImageToImageFilter::ThreadedGenerateData(),
    *     ImageToImageFilter::GenerateData()  */
-#if ITK_VERSION_MAJOR >= 4  
-  void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
-                            itk::ThreadIdType threadId );
-#else
   void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
-                            int threadId );
-#endif
+                            itk::ThreadIdType threadId ) ITK_OVERRIDE;
 
 private:
   FlexibleBinaryFunctorImageFilter(const Self&); //purposely not implemented