From c0027af29b4fd58c84ea638b57bf0197b718359e Mon Sep 17 00:00:00 2001 From: Peter Munch Date: Sun, 2 Feb 2020 23:33:02 +0100 Subject: [PATCH] Fix types in ConsensusAlgorithmProcess --- include/deal.II/base/mpi.h | 10 ++++++---- .../deal.II/base/mpi_compute_index_owner_internal.h | 8 ++++---- source/base/mpi.cc | 6 +++--- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/include/deal.II/base/mpi.h b/include/deal.II/base/mpi.h index 0ea19a9eb6..fd954ec8cc 100644 --- a/include/deal.II/base/mpi.h +++ b/include/deal.II/base/mpi.h @@ -993,7 +993,8 @@ namespace Utilities * @note The buffer is empty. Before using it, you have to set its size. */ virtual void - create_request(const int other_rank, std::vector &send_buffer); + create_request(const unsigned int other_rank, + std::vector & send_buffer); /** * Prepare the buffer where the payload of the answer of the request to @@ -1004,8 +1005,8 @@ namespace Utilities * @param[out] recv_buffer data to be sent part of the request (optional) */ virtual void - prepare_buffer_for_answer(const int other_rank, - std::vector &recv_buffer); + prepare_buffer_for_answer(const unsigned int other_rank, + std::vector & recv_buffer); /** * Prepare the buffer where the payload of the answer of the request to @@ -1032,7 +1033,8 @@ namespace Utilities * @param[in] recv_buffer data to be sent part of the request (optional) */ virtual void - read_answer(const int other_rank, const std::vector &recv_buffer); + read_answer(const unsigned int other_rank, + const std::vector &recv_buffer); }; /** diff --git a/include/deal.II/base/mpi_compute_index_owner_internal.h b/include/deal.II/base/mpi_compute_index_owner_internal.h index b15ebb6ec5..7ecce658dc 100644 --- a/include/deal.II/base/mpi_compute_index_owner_internal.h +++ b/include/deal.II/base/mpi_compute_index_owner_internal.h @@ -84,7 +84,7 @@ namespace Utilities * Utilities::MPI::ConsensusAlgorithmProcess::create_request(). */ virtual void - create_request(const int other_rank, + create_request(const unsigned int other_rank, std::vector> &send_buffer) override @@ -723,7 +723,7 @@ namespace Utilities * Utilities::MPI::ConsensusAlgorithmProcess::create_request(). */ virtual void - create_request(const int other_rank, + create_request(const unsigned int other_rank, std::vector> &send_buffer) override @@ -747,7 +747,7 @@ namespace Utilities */ virtual void prepare_buffer_for_answer( - const int other_rank, + const unsigned int other_rank, std::vector &recv_buffer) override { recv_buffer.resize(recv_indices[other_rank].size()); @@ -758,7 +758,7 @@ namespace Utilities * Utilities::MPI::ConsensusAlgorithmProcess::read_answer(). */ virtual void - read_answer(const int other_rank, + read_answer(const unsigned int other_rank, const std::vector &recv_buffer) override { Assert(recv_indices[other_rank].size() == recv_buffer.size(), diff --git a/source/base/mpi.cc b/source/base/mpi.cc index 521f4743d3..400a787440 100644 --- a/source/base/mpi.cc +++ b/source/base/mpi.cc @@ -972,7 +972,7 @@ namespace Utilities template void - ConsensusAlgorithmProcess::create_request(const int, + ConsensusAlgorithmProcess::create_request(const unsigned int, std::vector &) { // nothing to do @@ -983,7 +983,7 @@ namespace Utilities template void ConsensusAlgorithmProcess::prepare_buffer_for_answer( - const int, + const unsigned int, std::vector &) { // nothing to do @@ -993,7 +993,7 @@ namespace Utilities template void - ConsensusAlgorithmProcess::read_answer(const int, + ConsensusAlgorithmProcess::read_answer(const unsigned int, const std::vector &) { // nothing to do -- 2.39.5