X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/b4d90a50ce65a5efb75c0a28b269120ea51d57cf..75ce3cba194ed6afe0cf65799876b457da5bdb2b:/options.cpp?ds=sidebyside diff --git a/options.cpp b/options.cpp index 25d7642..b31888f 100644 --- a/options.cpp +++ b/options.cpp @@ -80,7 +80,7 @@ namespace opt { unsigned lb_maxiter = 0; unsigned comp_maxiter = 0; double time_limit = 0; - int exit_on_convergence = 0; + unsigned exit_on_convergence = 0; bool exit_on_close = true; // Named parameters lists @@ -166,25 +166,24 @@ const char* opt_helper::on_off(bool b) const char* opt_helper::descr(const char* str) { - std::string& res = descr_str; - res = str; - res.resize(DATA_DESCR_WIDTH, '.'); - return res.c_str(); + descr_str = str; + descr_str.push_back(' '); + descr_str.resize(DATA_DESCR_WIDTH, '.'); + return descr_str.c_str(); } template const char* opt_helper::val_or_string(const T& val, const char* str, const T& deflt) { - std::string& res = val_or_string_str; if (val != deflt) { std::ostringstream oss; oss << val; - res = oss.str(); + val_or_string_str = oss.str(); } else { - res = str; + val_or_string_str = str; } - return res.c_str(); + return val_or_string_str.c_str(); } template