From 26bb42c5236df19323f94e4a2016e5d714086b63 Mon Sep 17 00:00:00 2001 From: Bruno Turcksin Date: Thu, 22 Aug 2019 02:05:46 +0000 Subject: [PATCH] Use std::free instead of free to avoid name collision when using hipcc --- include/deal.II/base/memory_space.h | 12 ++++++------ include/deal.II/lac/read_write_vector.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/deal.II/base/memory_space.h b/include/deal.II/base/memory_space.h index 7cc0a7fe93..9042ac105e 100644 --- a/include/deal.II/base/memory_space.h +++ b/include/deal.II/base/memory_space.h @@ -85,7 +85,7 @@ namespace MemorySpace /** * Pointer to data on the host. */ - std::unique_ptr values; + std::unique_ptr values; /** * Pointer to data on the device. @@ -114,7 +114,7 @@ namespace MemorySpace struct MemorySpaceData { MemorySpaceData() - : values(nullptr, &free) + : values(nullptr, &std::free) {} void @@ -129,7 +129,7 @@ namespace MemorySpace std::copy(begin, begin + n_elements, values.get()); } - std::unique_ptr values; + std::unique_ptr values; // This is not used but it allows to simplify the code until we start using // CUDA-aware MPI. @@ -153,7 +153,7 @@ namespace MemorySpace struct MemorySpaceData { MemorySpaceData() - : values(nullptr, &free) + : values(nullptr, &std::free) , values_dev(nullptr, Utilities::CUDA::delete_device_data) {} @@ -179,8 +179,8 @@ namespace MemorySpace AssertCuda(cuda_error_code); } - std::unique_ptr values; - std::unique_ptr values_dev; + std::unique_ptr values; + std::unique_ptr values_dev; }; diff --git a/include/deal.II/lac/read_write_vector.h b/include/deal.II/lac/read_write_vector.h index f08bd622fd..1c90d3f369 100644 --- a/include/deal.II/lac/read_write_vector.h +++ b/include/deal.II/lac/read_write_vector.h @@ -701,7 +701,7 @@ namespace LinearAlgebra /** * Pointer to the array of local elements of this vector. */ - std::unique_ptr values; + std::unique_ptr values; /** * For parallel loops with TBB, this member variable stores the affinity -- 2.39.5