X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/967a3b9f834126e8a07f185cdd660b12c487e9c3..629bbb0ea28eee8adebd687a0ed72ca9bf110a26:/src/kernel/resource/FactorSet.cpp diff --git a/src/kernel/resource/FactorSet.cpp b/src/kernel/resource/FactorSet.cpp index 47a129d43b..8e42bb90c5 100644 --- a/src/kernel/resource/FactorSet.cpp +++ b/src/kernel/resource/FactorSet.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2016-2023. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -16,8 +16,8 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_resource); -extern std::string surf_parsed_filename; -extern int surf_parse_lineno; +extern std::string simgrid_parsed_filename; +extern int simgrid_parse_lineno; namespace simgrid::kernel::resource { @@ -57,14 +57,14 @@ void FactorSet::parse(const std::string& values) try { fact.factor = std::stoi(*factor_iter); } catch (const std::invalid_argument&) { - throw std::invalid_argument(std::string("Invalid factor in chunk ") + std::to_string(factors_.size() + 1) + - ": " + *factor_iter + " for " + name_); + throw std::invalid_argument("Invalid factor in chunk " + std::to_string(factors_.size() + 1) + ": " + + *factor_iter + " for " + name_); } } else { try { - fact.values.push_back(xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, *factor_iter, "")); + fact.values.push_back(xbt_parse_get_time(simgrid_parsed_filename, simgrid_parse_lineno, *factor_iter, "")); } catch (const std::invalid_argument&) { - throw std::invalid_argument(std::string("Invalid factor value ") + std::to_string(iteration) + " in chunk " + + throw std::invalid_argument("Invalid factor value " + std::to_string(iteration) + " in chunk " + std::to_string(factors_.size() + 1) + ": " + *factor_iter + " for " + name_); } }