From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Thu, 11 May 2023 17:05:52 +0000 (-0600)
Subject: Avoid variables named 'import', part 2.
X-Git-Tag: v9.5.0-rc1~239^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fb86907223af873bf0f1b73435575fe4f6356cf;p=dealii.git

Avoid variables named 'import', part 2.
---

diff --git a/include/deal.II/lac/read_write_vector.templates.h b/include/deal.II/lac/read_write_vector.templates.h
index 6019ad8f59..692f306049 100644
--- a/include/deal.II/lac/read_write_vector.templates.h
+++ b/include/deal.II/lac/read_write_vector.templates.h
@@ -739,13 +739,13 @@ namespace LinearAlgebra
                       "LinearAlgebra::EpetraWrappers::CommunicationPattern."));
       }
 
-    Epetra_Import import(epetra_comm_pattern->get_epetra_import());
+    Epetra_Import import_map(epetra_comm_pattern->get_epetra_import());
 
-    Epetra_FEVector target_vector(import.TargetMap());
+    Epetra_FEVector target_vector(import_map.TargetMap());
 
     if (operation == VectorOperation::insert)
       {
-        const int err = target_vector.Import(multivector, import, Insert);
+        const int err = target_vector.Import(multivector, import_map, Insert);
         AssertThrow(err == 0,
                     ExcMessage("Epetra Import() failed with error code: " +
                                std::to_string(err)));
@@ -760,7 +760,7 @@ namespace LinearAlgebra
       }
     else if (operation == VectorOperation::add)
       {
-        const int err = target_vector.Import(multivector, import, Add);
+        const int err = target_vector.Import(multivector, import_map, Add);
         AssertThrow(err == 0,
                     ExcMessage("Epetra Import() failed with error code: " +
                                std::to_string(err)));
@@ -775,7 +775,7 @@ namespace LinearAlgebra
       }
     else if (operation == VectorOperation::min)
       {
-        const int err = target_vector.Import(multivector, import, Add);
+        const int err = target_vector.Import(multivector, import_map, Add);
         AssertThrow(err == 0,
                     ExcMessage("Epetra Import() failed with error code: " +
                                std::to_string(err)));
@@ -805,7 +805,7 @@ namespace LinearAlgebra
       }
     else if (operation == VectorOperation::max)
       {
-        const int err = target_vector.Import(multivector, import, Add);
+        const int err = target_vector.Import(multivector, import_map, Add);
         AssertThrow(err == 0,
                     ExcMessage("Epetra Import() failed with error code: " +
                                std::to_string(err)));