X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8bc85164acb335cf909052b966b2ee4932e06cd7..d8cfc4c2e6eec35703dc7f3158188eaa6e2d24a5:/src/surf/HostImpl.cpp diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index ff17a48e31..7b33f5dbfe 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2021. 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. */ @@ -36,7 +36,7 @@ HostImpl::~HostImpl() { /* All actors should be gone when the host is turned off (by the end of the simulation). */ if (not actor_list_.empty()) { - std::string msg = std::string("Shutting down host, but it's not empty:"); + std::string msg = "Shutting down host, but it's not empty:"; for (auto const& actor : actor_list_) msg += "\n\t" + std::string(actor.get_name()); @@ -95,7 +95,7 @@ std::vector HostImpl::get_all_actors() { std::vector res; for (auto& actor : actor_list_) - res.push_back(actor.ciface()); + res.emplace_back(actor.get_ciface()); return res; } size_t HostImpl::get_actor_count() const @@ -113,7 +113,7 @@ std::vector HostImpl::get_disks() const void HostImpl::set_disks(const std::vector& disks, s4u::Host* host) { - disks_ = std::move(disks); + disks_ = disks; for (auto d : disks_) d->set_host(host); } @@ -145,7 +145,7 @@ std::vector HostImpl::get_attached_storages() } std::unordered_map* HostImpl::get_mounted_storages() { - std::unordered_map* mounts = new std::unordered_map(); + auto* mounts = new std::unordered_map(); for (auto const& m : storage_) { mounts->insert({m.first, m.second->get_iface()}); }