From: Wolfgang Bangerth Date: Thu, 29 Jul 2021 19:15:52 +0000 (-0600) Subject: Disable the new code when not using MPI. X-Git-Tag: v9.4.0-rc1~1055^2~3 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=887bfeadc8b241f8657c5f1e68c0754260dd4cd7;p=dealii.git Disable the new code when not using MPI. --- diff --git a/include/deal.II/base/aligned_vector.h b/include/deal.II/base/aligned_vector.h index 8f82b92b60..0924e47093 100644 --- a/include/deal.II/base/aligned_vector.h +++ b/include/deal.II/base/aligned_vector.h @@ -565,6 +565,7 @@ private: */ Deleter(AlignedVector *owning_object); +#ifdef DEAL_II_WITH_MPI /** * Constructor. When this constructor is called, it installs an * action that corresponds to MPI-based shared memory allocation that @@ -578,7 +579,7 @@ private: T * aligned_shmem_pointer, MPI_Comm shmem_group_communicator, MPI_Win shmem_window); - +#endif /** * The operator called by `std::unique_ptr` to destroy the data it @@ -619,6 +620,8 @@ private: delete_array(const AlignedVector *owning_aligned_vector, T *ptr) = 0; }; +#ifdef DEAL_II_WITH_MPI + /** * A class that implements the deleter action for MPI shared-memory * allocated data. @@ -655,6 +658,7 @@ private: MPI_Comm shmem_group_communicator; MPI_Win shmem_window; }; +#endif /** * A pointer to the object that facilitates the actual action of @@ -1049,6 +1053,7 @@ inline AlignedVector::Deleter::Deleter(AlignedVector *owning_object) {} +# ifdef DEAL_II_WITH_MPI template inline AlignedVector::Deleter::Deleter(AlignedVector *owning_object, @@ -1065,7 +1070,7 @@ inline AlignedVector::Deleter::Deleter(AlignedVector *owning_object, shmem_window)) , owning_aligned_vector(owning_object) {} - +# endif template @@ -1105,6 +1110,7 @@ AlignedVector::Deleter::reset_owning_object( } +# ifdef DEAL_II_WITH_MPI template inline AlignedVector::Deleter::MPISharedMemDeleterAction:: @@ -1140,6 +1146,8 @@ AlignedVector::Deleter::MPISharedMemDeleterAction::delete_array( AssertThrowMPI(ierr); } +# endif + template inline AlignedVector::AlignedVector()