X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c1b3e440de2150420b08c0bc55a125a0c9eb86bc..84637d5a56f373e75eb6619d1afb54b7da3f5e36:/src/kernel/routing/FloydZone.cpp diff --git a/src/kernel/routing/FloydZone.cpp b/src/kernel/routing/FloydZone.cpp index c3d32b32ae..c7bb065442 100644 --- a/src/kernel/routing/FloydZone.cpp +++ b/src/kernel/routing/FloydZone.cpp @@ -8,6 +8,7 @@ #include "src/surf/network_interface.hpp" #include "src/surf/xml/platf_private.hpp" #include "surf/surf.hpp" +#include "xbt/string.hpp" #include #include @@ -22,8 +23,8 @@ namespace simgrid { namespace kernel { namespace routing { -FloydZone::FloydZone(NetZoneImpl* father, std::string name, resource::NetworkModel* netmodel) - : RoutedZone(father, std::move(name), netmodel) +FloydZone::FloydZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel) + : RoutedZone(father, name, netmodel) { predecessor_table_ = nullptr; cost_table_ = nullptr; @@ -57,7 +58,7 @@ void FloydZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* do { int pred = TO_FLOYD_PRED(src->id(), cur); if (pred == -1) - THROWF(arg_error, 0, "No route from '%s' to '%s'", src->get_cname(), dst->get_cname()); + throw std::invalid_argument(xbt::string_printf("No route from '%s' to '%s'", src->get_cname(), dst->get_cname())); route_stack.push_back(TO_FLOYD_LINK(pred, cur)); cur = pred; } while (cur != src->id());