From 0d9ab221cb0bcc6dc14ca8526f86d9dadcc78fda Mon Sep 17 00:00:00 2001
From: "K. Devine" <kddevin@sandia.gov>
Date: Fri, 15 Oct 2021 14:38:31 -0600
Subject: [PATCH] tpetra:  fixed shadow warnings, including one true bug where
 loop index was re-used as a loop index in a nested loop

---
 .../test/ImportExport2/ImportExport2_UnitTests.cpp   |  1 -
 .../tpetra/core/test/RowMatrixTransposer/sorted.cpp  | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/tpetra/core/test/ImportExport2/ImportExport2_UnitTests.cpp b/packages/tpetra/core/test/ImportExport2/ImportExport2_UnitTests.cpp
index 95ec17d71174..46d026504efa 100644
--- a/packages/tpetra/core/test/ImportExport2/ImportExport2_UnitTests.cpp
+++ b/packages/tpetra/core/test/ImportExport2/ImportExport2_UnitTests.cpp
@@ -497,7 +497,6 @@ namespace {
       // constructor.  The returned matrix should also be diagonal and
       // should equal tgt_mat.
       Teuchos::ParameterList dummy;
-      typedef CrsMatrix<Scalar, LO, GO> crs_type;
       RCP<crs_type> A_tgt2 =
         Tpetra::importAndFillCompleteCrsMatrix<crs_type> (src_mat, importer,
                                                           Teuchos::null,
diff --git a/packages/tpetra/core/test/RowMatrixTransposer/sorted.cpp b/packages/tpetra/core/test/RowMatrixTransposer/sorted.cpp
index 2ad0a00b2555..38f380131bc8 100644
--- a/packages/tpetra/core/test/RowMatrixTransposer/sorted.cpp
+++ b/packages/tpetra/core/test/RowMatrixTransposer/sorted.cpp
@@ -247,12 +247,12 @@ testTranspose (bool& success,
                          valsBuf.begin ());
 
           bool good = true;
-          for (LO lclRow = 0; lclRow < lclNumRows; ++lclRow) {
-            if (lclColIndsBuf[lclRow] != lclRow) {
+          for (LO lclInd = 0; lclInd < lclNumRows; ++lclInd) {
+            if (lclColIndsBuf[lclInd] != lclInd) {
               good = false;
               break;
             }
-            else if (valsBuf[lclRow] != 1.0) {
+            else if (valsBuf[lclInd] != 1.0) {
               good = false;
               break;
             }
@@ -308,12 +308,12 @@ testTranspose (bool& success,
 
         if (success) {
           bool good = true;
-          for (LO lclRow = 0; lclRow < lclNumRows; ++lclRow) {
-            if (lclColInds[lclRow] != lclRow) {
+          for (LO lclInd = 0; lclInd < lclNumRows; ++lclInd) {
+            if (lclColInds[lclInd] != lclInd) {
               good = false;
               break;
             }
-            else if (vals[lclRow] != 1.0) {
+            else if (vals[lclInd] != 1.0) {
               good = false;
               break;
             }