X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkLBFGSBOptimizer.h;h=8eec63a1f32046891728d3cfc7c29cad4e3666b7;hb=8d4aeabfafe155775a520eeb1aabf330e3a9d886;hp=cfc8007d54631528368865f2e2298bdef53fefea;hpb=657652a78c2e2717a6f77e027049173442ca29f0;p=clitk.git diff --git a/registration/clitkLBFGSBOptimizer.h b/registration/clitkLBFGSBOptimizer.h index cfc8007..8eec63a 100644 --- a/registration/clitkLBFGSBOptimizer.h +++ b/registration/clitkLBFGSBOptimizer.h @@ -3,7 +3,7 @@ Authors belong to: - University of LYON http://www.universite-lyon.fr/ - - Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr + - Léon Bérard cancer center http://www.centreleonberard.fr - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr This software is distributed WITHOUT ANY WARRANTY; without even @@ -14,7 +14,7 @@ - BSD See included LICENSE.txt file - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -======================================================================-====*/ +===========================================================================**/ #ifndef __clitkLBFGSBOptimizer_h #define __clitkLBFGSBOptimizer_h #include "itkSingleValuedNonLinearVnlOptimizer.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;