From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Wed, 24 Jun 2015 08:50:44 +0000 (+0200)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~97^2
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=784796d8d6a038d3afd29cea1bf4e73323852186;hp=89cd2d45284065ca0a7e5918fd9553dbca3c60a5;p=clitk.git

Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
---

diff --git a/registration/clitkBSplineDeformableTransform.h b/registration/clitkBSplineDeformableTransform.h
index f5b2698..392247f 100644
--- a/registration/clitkBSplineDeformableTransform.h
+++ b/registration/clitkBSplineDeformableTransform.h
@@ -387,7 +387,7 @@ namespace clitk
 
 }  // namespace itk
 
-#if ITK_TEMPLATE_TXX
+#ifndef ITK_MANUAL_INSTANTIATION
 # include "clitkBSplineDeformableTransform.txx"
 #endif
 
diff --git a/registration/clitkMultipleBSplineDeformableTransform.h b/registration/clitkMultipleBSplineDeformableTransform.h
index 5b2ee9e..1b7909a 100644
--- a/registration/clitkMultipleBSplineDeformableTransform.h
+++ b/registration/clitkMultipleBSplineDeformableTransform.h
@@ -289,7 +289,7 @@ namespace clitk
 
 }  // namespace clitk
 
-#if ITK_TEMPLATE_TXX
+#ifndef ITK_MANUAL_INSTANTIATION
 # include "clitkMultipleBSplineDeformableTransform.txx"
 #endif
 
diff --git a/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h b/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h
index c9fb588..b192458 100644
--- a/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h
+++ b/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h
@@ -454,7 +454,7 @@ namespace clitk
 
 }  // namespace itk
 
-#if ITK_TEMPLATE_TXX
+#ifndef ITK_MANUAL_INSTANTIATION
 # include "clitkShapedBLUTSpatioTemporalDeformableTransform.txx"
 #endif