From ea7044eeb38a594054ef2587be34906600a5c915 Mon Sep 17 00:00:00 2001 From: Pascal Date: Mon, 15 Dec 2025 20:00:33 +0100 Subject: [PATCH] common: optimize duplicate detection with insert().second Co-authored-by: personalmountains <46615898+personalmountains@users.noreply.github.com> --- common/arg.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/common/arg.cpp b/common/arg.cpp index e76465fbc4..90ba98339c 100644 --- a/common/arg.cpp +++ b/common/arg.cpp @@ -432,10 +432,9 @@ static bool common_params_parse_ex(int argc, char ** argv, common_params_context if (arg_to_options.find(arg) == arg_to_options.end()) { throw std::invalid_argument(string_format("error: invalid argument: %s", arg.c_str())); } - if (seen_args.count(arg) > 0) { + if (!seen_args.insert(arg).second) { LOG_WRN("DEPRECATED: argument '%s' specified multiple times, use comma-separated values instead (only last value will be used)\n", arg.c_str()); } - seen_args.insert(arg); auto & tmp = arg_to_options[arg]; auto opt = *tmp.first; bool is_positive = tmp.second; @@ -768,10 +767,9 @@ bool common_params_to_map(int argc, char ** argv, llama_example ex, std::map 0) { + if (!seen_args.insert(arg).second) { LOG_WRN("DEPRECATED: argument '%s' specified multiple times, use comma-separated values instead (only last value will be used)\n", arg.c_str()); } - seen_args.insert(arg); auto opt = *arg_to_options[arg]; std::string val; if (opt.value_hint != nullptr) {