From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Fri, 24 Jun 2016 15:26:25 +0000 (+0200)
Subject: COMP: itk v4.10 and c++11
X-Git-Tag: v1.4.0~16^2
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=12823551578fdb204bdbe789f5663d8acf1bf996;p=clitk.git

COMP: itk v4.10 and c++11
---

diff --git a/common/clitkFilterBase.h b/common/clitkFilterBase.h
index 7403f37..1019b7b 100644
--- a/common/clitkFilterBase.h
+++ b/common/clitkFilterBase.h
@@ -42,7 +42,10 @@ namespace clitk {
     typedef FilterBase  Self;
     
     // Run-time type information (and related methods)
-    itkTypeMacro(FilterBase, Object);
+    virtual const char *GetNameOfClass() const
+      {
+      return "FilterBase";
+      }
 
     // Needed by itkSetMacro (cannot inherit from itkObject because of
     // multiple inheritance)
diff --git a/common/clitkXdrImageIOWriter.cxx b/common/clitkXdrImageIOWriter.cxx
index d769b3d..6eae6a5 100644
--- a/common/clitkXdrImageIOWriter.cxx
+++ b/common/clitkXdrImageIOWriter.cxx
@@ -100,8 +100,8 @@ void clitk::XdrImageIO::Write(const void* buffer)
 #ifndef _WIN32
 #  include <unistd.h>
 #endif
-#if !defined(unix) && !defined(__APPLE__)
-#include <io.h>
+#ifdef _WIN32
+#  include <io.h>
 #endif
 #include <fcntl.h>
 #include <errno.h>
diff --git a/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx b/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx
index d1b5b4c..dec3acf 100644
--- a/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx
+++ b/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx
@@ -44,8 +44,8 @@ PURPOSE.  See the above copyright notices for more information.
 #include "vnl/vnl_math.h"
 #include "itkStatisticsImageFilter.h"
 
-#include "vnl/vnl_vector.txx"
-#include "vnl/vnl_c_vector.txx"
+#include "vnl/vnl_vector.h"
+#include "vnl/vnl_c_vector.h"
 
 namespace itk
 {