X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1bf13b42c09009ec33fd1928b8bffd2ded6bb931..c288c8c926d3bcedd09efa7ef0b6c9aceedf4921:/src/smpi/internals/smpi_global.cpp diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index 3922c63077..9a4bd791e1 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2020. 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. */ @@ -132,13 +132,14 @@ void smpi_comm_set_copy_data_callback(void (*callback) (smx_activity_t, void*, s }; } -static void memcpy_private(void* dest, const void* src, std::vector>& private_blocks) +static void memcpy_private(void* dest, const void* src, const std::vector>& private_blocks) { for (auto const& block : private_blocks) memcpy((uint8_t*)dest+block.first, (uint8_t*)src+block.first, block.second-block.first); } -static void check_blocks(std::vector> &private_blocks, size_t buff_size) { +static void check_blocks(const std::vector>& private_blocks, size_t buff_size) +{ for (auto const& block : private_blocks) xbt_assert(block.first <= block.second && block.second <= buff_size, "Oops, bug in shared malloc."); } @@ -557,7 +558,7 @@ int smpi_main(const char* executable, int argc, char* argv[]) /* This is a ... heavy way to count the MPI ranks */ int rank_counts = 0; - simgrid::s4u::Actor::on_creation.connect([&rank_counts](simgrid::s4u::Actor& actor) { + simgrid::s4u::Actor::on_creation.connect([&rank_counts](const simgrid::s4u::Actor& actor) { if (not actor.is_daemon()) rank_counts++; });