X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkLBFGSBOptimizer.h;h=7b4052eab10708bc38d6cd7c65f7d330b2f0cd3a;hb=185f4e4c61631a8e5e256d8999e2d27ba934dcbf;hp=b4e0faf2a9195725b7493cf8a6cb725ae8245b71;hpb=0b62ce46bc2faf52102522ff93ba161f17fa25d0;p=clitk.git diff --git a/registration/clitkLBFGSBOptimizer.h b/registration/clitkLBFGSBOptimizer.h index b4e0faf..7b4052e 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,11 +179,7 @@ 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;