X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84be3f75362940d156a2fc815a6ba8411777714f..39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f:/examples/s4u/replay-io/s4u-replay-io.cpp?ds=sidebyside diff --git a/examples/s4u/replay-io/s4u-replay-io.cpp b/examples/s4u/replay-io/s4u-replay-io.cpp index 335d4311e2..52f18b84cf 100644 --- a/examples/s4u/replay-io/s4u-replay-io.cpp +++ b/examples/s4u/replay-io/s4u-replay-io.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2017-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2017-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. */ @@ -20,7 +20,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(replay_io, "Messages specific for this example"); ((void)0) class Replayer { - static std::unordered_map> opened_files; + static std::unordered_map opened_files; static void log_action(const simgrid::xbt::ReplayAction& action, double date) { @@ -33,7 +33,7 @@ class Replayer { static simgrid::s4u::File* get_file_descriptor(const std::string& file_name) { std::string full_name = simgrid::s4u::this_actor::get_name() + ":" + file_name; - return opened_files.at(full_name).get(); + return &opened_files.at(full_name); } public: @@ -56,9 +56,8 @@ public: std::string full_name = simgrid::s4u::this_actor::get_name() + ":" + file_name; ACT_DEBUG("Entering Open: %s (filename: %s)", NAME.c_str(), file_name.c_str()); - auto file = std::make_unique(file_name, nullptr); - - opened_files.insert({full_name, std::move(file)}); + opened_files.emplace(std::piecewise_construct, std::forward_as_tuple(full_name), + std::forward_as_tuple(file_name, nullptr)); log_action(action, simgrid::s4u::Engine::get_clock() - clock); } @@ -91,7 +90,7 @@ public: } }; -std::unordered_map> Replayer::opened_files; +std::unordered_map Replayer::opened_files; int main(int argc, char* argv[]) {