X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/321102577020b194dfb7ba89e48687952816849e..30e0627bbfc12ce4ebeacfda720bc52e95feb22c:/src/instr/instr_paje_containers.cpp diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp index 8fcdfa0938..5ebe79a08a 100644 --- a/src/instr/instr_paje_containers.cpp +++ b/src/instr/instr_paje_containers.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-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. */ @@ -10,8 +10,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_containers, instr, "Paje tracing event system (containers)"); -namespace simgrid { -namespace instr { +namespace simgrid::instr { Container* Container::root_container_ = nullptr; /* the root container */ std::map> Container::all_containers_; /* all created containers indexed by name */ @@ -21,7 +20,7 @@ NetZoneContainer::NetZoneContainer(const std::string& name, unsigned int level, { xbt_assert(s4u::Engine::get_instance()->netpoint_by_name_or_null(get_name()), "Element '%s' not found", get_cname()); if (parent_) { - std::string type_name = std::string("L") + std::to_string(level); + std::string type_name = "L" + std::to_string(level); type_ = parent_->type_->by_name_or_create(type_name); parent_->children_.try_emplace(get_name(), this); on_creation(*this); @@ -74,7 +73,7 @@ Container::~Container() { XBT_DEBUG("destroy container %s", get_cname()); // Begin with destroying my own children - for (auto [_, child] : children_) + for (auto const& [_, child] : children_) delete child; // remove me from the all_containers_ data structure @@ -136,5 +135,4 @@ EntityValue::EntityValue(const std::string& name, const std::string& color, Type on_creation(*this); } -} // namespace instr -} // namespace simgrid +} // namespace simgrid::instr