From: delmon Date: Thu, 14 Apr 2011 08:23:40 +0000 (+0000) Subject: itkv4 migration: X-Git-Tag: v1.2.0~40 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0b62ce46bc2faf52102522ff93ba161f17fa25d0;p=clitk.git itkv4 migration: + itk::OStringStream disappeared, use std::ostringstream instead. --- diff --git a/registration/clitkLBFGSBOptimizer.h b/registration/clitkLBFGSBOptimizer.h index cfc8007..b4e0faf 100644 --- a/registration/clitkLBFGSBOptimizer.h +++ b/registration/clitkLBFGSBOptimizer.h @@ -179,7 +179,11 @@ private: bool m_OptimizerInitialized; InternalOptimizerType * m_VnlOptimizer; +#if ITK_VERSION_MAJOR > 3 + mutable std::ostringstream m_StopConditionDescription; +#else mutable itk::OStringStream m_StopConditionDescription; +#endif BoundValueType m_LowerBound; BoundValueType m_UpperBound; BoundSelectionType m_BoundSelection; diff --git a/segmentation/clitkAnatomicalFeatureDatabase.cxx b/segmentation/clitkAnatomicalFeatureDatabase.cxx index a23deb4..f9fef2a 100644 --- a/segmentation/clitkAnatomicalFeatureDatabase.cxx +++ b/segmentation/clitkAnatomicalFeatureDatabase.cxx @@ -94,7 +94,11 @@ void clitk::AnatomicalFeatureDatabase::Load() //-------------------------------------------------------------------- void clitk::AnatomicalFeatureDatabase::SetPoint3D(std::string tag, PointType3D & p) { +#if ITK_VERSION_MAJOR > 3 + std::ostringstream value; +#else ::itk::OStringStream value; +#endif value << p[0] << " " << p[1] << " " << p[2]; m_MapOfTag[tag] = value.str(); }