COMP: itk v4.10 and c++11

diff --git a/common/clitkFilterBase.h b/common/clitkFilterBase.h
index 7403f37fe0a041fa6a1b0ea85c696b65e1a302f7..1019b7b76aa49f9b28e8796151a2e60c7c89672b 100644 (file)
--- 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 d769b3df2b4bcf2d00bf7716ae7cce76f44d0303..6eae6a595f529f45a76286370010b25710a30a61 100644 (file)
--- 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 d1b5b4c8a8c4b656168e203ebee886ce75d16537..dec3acff0b59f079ae9922cd8828cdd057eb0941 100644 (file)
--- 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
 {