itkv4 migration:

+ itk::OStringStream disappeared, use std::ostringstream instead.

diff --git a/registration/clitkLBFGSBOptimizer.h b/registration/clitkLBFGSBOptimizer.h
index cfc8007d54631528368865f2e2298bdef53fefea..b4e0faf2a9195725b7493cf8a6cb725ae8245b71 100644 (file)
--- 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 a23deb40e86924f05451f0f478cf4f47704fec3d..f9fef2a636e31ed33d94fc52e182c624933e8e7c 100644 (file)
--- 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();
 }