From: Peter Munch Date: Fri, 18 Oct 2019 21:44:32 +0000 (+0200) Subject: Fix ConsensusAlgorithm_NBX X-Git-Tag: v9.2.0-rc1~963^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15bb0fe054992743a15b79ceecebcab2a062e965;p=dealii.git Fix ConsensusAlgorithm_NBX --- diff --git a/include/deal.II/base/mpi.h b/include/deal.II/base/mpi.h index e144aea01e..294994e744 100644 --- a/include/deal.II/base/mpi.h +++ b/include/deal.II/base/mpi.h @@ -941,12 +941,12 @@ namespace Utilities /** * Buffers for sending answers to requests. */ - std::vector> request_buffers; + std::vector>> request_buffers; /** * Requests for sending answers to requests. */ - std::vector> request_requests; + std::vector> request_requests; // request for barrier MPI_Request barrier_request; diff --git a/source/base/mpi.cc b/source/base/mpi.cc index 0050303b5f..0e05f412ce 100644 --- a/source/base/mpi.cc +++ b/source/base/mpi.cc @@ -1011,11 +1011,12 @@ namespace Utilities AssertThrowMPI(ierr); // allocate memory for answer message - request_buffers.emplace_back(); - request_requests.emplace_back(new MPI_Request); + request_buffers.emplace_back( + std_cxx14::make_unique>()); + request_requests.emplace_back(std_cxx14::make_unique()); // process request - auto &request_buffer = request_buffers.back(); + auto &request_buffer = *request_buffers.back(); this->process.process_request(other_rank, buffer_recv, request_buffer);