From 12823551578fdb204bdbe789f5663d8acf1bf996 Mon Sep 17 00:00:00 2001 From: Simon Rit Date: Fri, 24 Jun 2016 17:26:25 +0200 Subject: [PATCH] COMP: itk v4.10 and c++11 --- common/clitkFilterBase.h | 5 ++++- common/clitkXdrImageIOWriter.cxx | 4 ++-- ...MattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) 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 #endif -#if !defined(unix) && !defined(__APPLE__) -#include +#ifdef _WIN32 +# include #endif #include #include 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 { -- 2.45.1