From: Wolfgang Bangerth Date: Tue, 24 Nov 2020 00:24:20 +0000 (-0700) Subject: Avoid using 'import' as function name in internal interfaces. X-Git-Tag: v9.3.0-rc1~856^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8016a3cb8f70bce94127b2cd977465d4db89e3e0;p=dealii.git Avoid using 'import' as function name in internal interfaces. --- diff --git a/include/deal.II/lac/la_parallel_vector.templates.h b/include/deal.II/lac/la_parallel_vector.templates.h index d57b76bf9d..2c5a8fc499 100644 --- a/include/deal.II/lac/la_parallel_vector.templates.h +++ b/include/deal.II/lac/la_parallel_vector.templates.h @@ -99,7 +99,7 @@ namespace LinearAlgebra {} static void - import( + import_elements( const ::dealii::LinearAlgebra::ReadWriteVector & /*V*/, ::dealii::VectorOperation::values /*operation*/, const std::shared_ptr & @@ -247,7 +247,7 @@ namespace LinearAlgebra } static void - import( + import_elements( const ::dealii::LinearAlgebra::ReadWriteVector &V, ::dealii::VectorOperation::values operation, const std::shared_ptr @@ -354,13 +354,15 @@ namespace LinearAlgebra } static void - import(const ReadWriteVector &V, - VectorOperation::values operation, - std::shared_ptr - communication_pattern, - const IndexSet &locally_owned_elem, - ::dealii::MemorySpace:: - MemorySpaceData &data) + import_elements( + const ReadWriteVector &V, + VectorOperation::values operation, + std::shared_ptr + communication_pattern, + const IndexSet &locally_owned_elem, + ::dealii::MemorySpace::MemorySpaceData + &data) { Assert( (operation == ::dealii::VectorOperation::add) || @@ -884,7 +886,7 @@ namespace LinearAlgebra Assert(partitioner->ghost_indices() == src.partitioner->ghost_indices(), ExcMessage("Ghost indices should be identical.")); ::dealii::internal::VectorOperations:: - functions::import( + functions::import_elements( thread_loop_partitioner, allocated_size, operation, src.data, data); } diff --git a/include/deal.II/lac/vector_operations_internal.h b/include/deal.II/lac/vector_operations_internal.h index 9f1d50fdd0..1b6a963135 100644 --- a/include/deal.II/lac/vector_operations_internal.h +++ b/include/deal.II/lac/vector_operations_internal.h @@ -1639,7 +1639,7 @@ namespace internal template static void - import( + import_elements( const std::shared_ptr<::dealii::parallel::internal::TBBPartitioner> & /*thread_loop_partitioner*/, const size_type /*size*/, @@ -1996,18 +1996,19 @@ namespace internal template static void - import(const std::shared_ptr<::dealii::parallel::internal::TBBPartitioner> - & thread_loop_partitioner, - const size_type size, - VectorOperation::values operation, - const ::dealii::MemorySpace::MemorySpaceData - &v_data, - ::dealii::MemorySpace::MemorySpaceData - &data, - typename std::enable_if< - std::is_same::value, - int>::type = 0) + import_elements( + const std::shared_ptr<::dealii::parallel::internal::TBBPartitioner> + & thread_loop_partitioner, + const size_type size, + VectorOperation::values operation, + const ::dealii::MemorySpace::MemorySpaceData + &v_data, + ::dealii::MemorySpace::MemorySpaceData + &data, + typename std::enable_if< + std::is_same::value, + int>::type = 0) { if (operation == VectorOperation::insert) { @@ -2026,18 +2027,19 @@ namespace internal #ifdef DEAL_II_COMPILER_CUDA_AWARE template static void - import(const std::shared_ptr<::dealii::parallel::internal::TBBPartitioner> - & /*thread_loop_partitioner*/, - const size_type size, - VectorOperation::values operation, - const ::dealii::MemorySpace::MemorySpaceData - &v_data, - ::dealii::MemorySpace::MemorySpaceData - &data, - typename std::enable_if< - std::is_same::value, - int>::type = 0) + import_elements( + const std::shared_ptr<::dealii::parallel::internal::TBBPartitioner> + & /*thread_loop_partitioner*/, + const size_type size, + VectorOperation::values operation, + const ::dealii::MemorySpace::MemorySpaceData + &v_data, + ::dealii::MemorySpace::MemorySpaceData + &data, + typename std::enable_if< + std::is_same::value, + int>::type = 0) { if (operation == VectorOperation::insert) { @@ -2512,18 +2514,19 @@ namespace internal template static void - import(const std::shared_ptr<::dealii::parallel::internal::TBBPartitioner> - & thread_loop_partitioner, - const size_type size, - VectorOperation::values operation, - const ::dealii::MemorySpace::MemorySpaceData - &v_data, - ::dealii::MemorySpace::MemorySpaceData - &data, - typename std::enable_if< - std::is_same::value, - int>::type = 0) + import_elements( + const std::shared_ptr<::dealii::parallel::internal::TBBPartitioner> + & thread_loop_partitioner, + const size_type size, + VectorOperation::values operation, + const ::dealii::MemorySpace::MemorySpaceData + &v_data, + ::dealii::MemorySpace::MemorySpaceData + &data, + typename std::enable_if< + std::is_same::value, + int>::type = 0) { if (operation == VectorOperation::insert) { @@ -2541,18 +2544,19 @@ namespace internal template static void - import(const std::shared_ptr<::dealii::parallel::internal::TBBPartitioner> - & /*thread_loop_partitioner*/, - const size_type size, - VectorOperation::values operation, - const ::dealii::MemorySpace::MemorySpaceData - &v_data, - ::dealii::MemorySpace::MemorySpaceData - &data, - typename std::enable_if< - std::is_same::value, - int>::type = 0) + import_elements( + const std::shared_ptr<::dealii::parallel::internal::TBBPartitioner> + & /*thread_loop_partitioner*/, + const size_type size, + VectorOperation::values operation, + const ::dealii::MemorySpace::MemorySpaceData + &v_data, + ::dealii::MemorySpace::MemorySpaceData + &data, + typename std::enable_if< + std::is_same::value, + int>::type = 0) { if (operation == VectorOperation::insert) {