X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/093b834960aa7457d220feacad9542c4606ed8a0..19cd5a52131b50275fa26e0e53c4a8bd333f2937:/src/surf/network_interface.cpp diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 2944bc3e04..6e2569a32d 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -20,7 +20,7 @@ namespace simgrid { /* List of links */ std::unordered_map* LinkImpl::links = new std::unordered_map(); - LinkImpl* LinkImpl::byName(const char* name) + LinkImpl* LinkImpl::byName(std::string name) { auto link = links->find(name); return link == links->end() ? nullptr : link->second; @@ -35,7 +35,7 @@ namespace simgrid { { LinkImpl** res = xbt_new(LinkImpl*, (int)links->size()); int i = 0; - for (auto kv : *links) { + for (auto const& kv : *links) { res[i] = kv.second; i++; } @@ -44,7 +44,7 @@ namespace simgrid { /** @brief destructor of the static data */ void LinkImpl::linksExit() { - for (auto kv : *links) + for (auto const& kv : *links) (kv.second)->destroy(); delete links; } @@ -98,19 +98,18 @@ namespace simgrid { * Resource * ************/ - LinkImpl::LinkImpl(simgrid::surf::NetworkModel* model, const char* name, lmm_constraint_t constraint) + LinkImpl::LinkImpl(simgrid::surf::NetworkModel* model, const std::string& name, lmm_constraint_t constraint) : Resource(model, name, constraint), piface_(this) { - if (strcmp(name,"__loopback__")) - xbt_assert(not LinkImpl::byName(name), "Link '%s' declared several times in the platform.", name); + if (name != "__loopback__") + xbt_assert(not LinkImpl::byName(name), "Link '%s' declared several times in the platform.", name.c_str()); latency_.scale = 1; bandwidth_.scale = 1; links->insert({name, this}); - XBT_DEBUG("Create link '%s'",name); - + XBT_DEBUG("Create link '%s'", name.c_str()); } /** @brief use destroy() instead of this destructor */