From: Wolfgang Bangerth Date: Wed, 10 May 2023 19:08:51 +0000 (-0600) Subject: Avoid variables named 'import'. X-Git-Tag: v9.5.0-rc1~240^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fdff07c2367684816924b5806a7e6318c19b037;p=dealii.git Avoid variables named 'import'. --- diff --git a/source/lac/trilinos_epetra_vector.cc b/source/lac/trilinos_epetra_vector.cc index a6cecfa583..5343e808cd 100644 --- a/source/lac/trilinos_epetra_vector.cc +++ b/source/lac/trilinos_epetra_vector.cc @@ -178,21 +178,21 @@ namespace LinearAlgebra "LinearAlgebra::EpetraWrappers::CommunicationPattern.")); } - Epetra_Import import(epetra_comm_pattern->get_epetra_import()); + Epetra_Import import_map(epetra_comm_pattern->get_epetra_import()); // The TargetMap and the SourceMap have their roles inverted. - Epetra_FEVector source_vector(import.TargetMap()); + Epetra_FEVector source_vector(import_map.TargetMap()); double * values = source_vector.Values(); std::copy(V.begin(), V.end(), values); if (operation == VectorOperation::insert) - vector->Export(source_vector, import, Insert); + vector->Export(source_vector, import_map, Insert); else if (operation == VectorOperation::add) - vector->Export(source_vector, import, Add); + vector->Export(source_vector, import_map, Add); else if (operation == VectorOperation::max) - vector->Export(source_vector, import, Epetra_Max); + vector->Export(source_vector, import_map, Epetra_Max); else if (operation == VectorOperation::min) - vector->Export(source_vector, import, Epetra_Min); + vector->Export(source_vector, import_map, Epetra_Min); else AssertThrow(false, ExcNotImplemented()); }