From 3e51cfc4d1a39d2fbed2a3b017cb18fcbd4467fc Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Mon, 12 Sep 2022 16:27:54 -0400
Subject: [PATCH] avoid ambiguous variable override with due to for scoping

---
 src/atom.cpp     | 24 ++++++++++++------------
 src/molecule.cpp | 36 ++++++++++++++++++------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/atom.cpp b/src/atom.cpp
index 02bd5605a3..f66570e57b 100644
--- a/src/atom.cpp
+++ b/src/atom.cpp
@@ -1278,9 +1278,9 @@ void Atom::data_bonds(int n, char *buf, int *count, tagint id_offset,
     *next = '\0';
     auto values = Tokenizer(buf).as_vector();
     int nwords = values.size();
-    for (std::size_t i = 0; i < values.size(); ++i) {
-      if (utils::strmatch(values[i], "^#")) {
-        nwords = i;
+    for (std::size_t ii = 0; ii < values.size(); ++ii) {
+      if (utils::strmatch(values[ii], "^#")) {
+        nwords = ii;
         break;
       }
     }
@@ -1369,9 +1369,9 @@ void Atom::data_angles(int n, char *buf, int *count, tagint id_offset,
     *next = '\0';
     auto values = Tokenizer(buf).as_vector();
     int nwords = values.size();
-    for (std::size_t i = 0; i < values.size(); ++i) {
-      if (utils::strmatch(values[i], "^#")) {
-        nwords = i;
+    for (std::size_t ii = 0; ii < values.size(); ++ii) {
+      if (utils::strmatch(values[ii], "^#")) {
+        nwords = ii;
         break;
       }
     }
@@ -1476,9 +1476,9 @@ void Atom::data_dihedrals(int n, char *buf, int *count, tagint id_offset,
     *next = '\0';
     auto values = Tokenizer(buf).as_vector();
     int nwords = values.size();
-    for (std::size_t i = 0; i < values.size(); ++i) {
-      if (utils::strmatch(values[i], "^#")) {
-        nwords = i;
+    for (std::size_t ii = 0; ii < values.size(); ++ii) {
+      if (utils::strmatch(values[ii], "^#")) {
+        nwords = ii;
         break;
       }
     }
@@ -1602,9 +1602,9 @@ void Atom::data_impropers(int n, char *buf, int *count, tagint id_offset,
     *next = '\0';
     auto values = Tokenizer(buf).as_vector();
     int nwords = values.size();
-    for (std::size_t i = 0; i < values.size(); ++i) {
-      if (utils::strmatch(values[i], "^#")) {
-        nwords = i;
+    for (std::size_t ii = 0; ii < values.size(); ++ii) {
+      if (utils::strmatch(values[ii], "^#")) {
+        nwords = ii;
         break;
       }
     }
diff --git a/src/molecule.cpp b/src/molecule.cpp
index 3ec2a22757..df7d8ac415 100644
--- a/src/molecule.cpp
+++ b/src/molecule.cpp
@@ -767,9 +767,9 @@ void Molecule::types(char *line)
     readline(line);
     auto values = Tokenizer(utils::trim(line)).as_vector();
     int nwords = values.size();
-    for (std::size_t i = 0; i < values.size(); ++i) {
-      if (utils::strmatch(values[i], "^#")) {
-        nwords = i;
+    for (std::size_t ii = 0; ii < values.size(); ++ii) {
+      if (utils::strmatch(values[ii], "^#")) {
+        nwords = ii;
         break;
       }
     }
@@ -1007,9 +1007,9 @@ void Molecule::bonds(int flag, char *line)
     readline(line);
     auto values = Tokenizer(utils::trim(line)).as_vector();
     int nwords = values.size();
-    for (std::size_t i = 0; i < values.size(); ++i) {
-      if (utils::strmatch(values[i], "^#")) {
-        nwords = i;
+    for (std::size_t ii = 0; ii < values.size(); ++ii) {
+      if (utils::strmatch(values[ii], "^#")) {
+        nwords = ii;
         break;
       }
     }
@@ -1093,9 +1093,9 @@ void Molecule::angles(int flag, char *line)
     readline(line);
     auto values = Tokenizer(utils::trim(line)).as_vector();
     int nwords = values.size();
-    for (std::size_t i = 0; i < values.size(); ++i) {
-      if (utils::strmatch(values[i], "^#")) {
-        nwords = i;
+    for (std::size_t ii = 0; ii < values.size(); ++ii) {
+      if (utils::strmatch(values[ii], "^#")) {
+        nwords = ii;
         break;
       }
     }
@@ -1194,9 +1194,9 @@ void Molecule::dihedrals(int flag, char *line)
     readline(line);
     auto values = Tokenizer(utils::trim(line)).as_vector();
     int nwords = values.size();
-    for (std::size_t i = 0; i < values.size(); ++i) {
-      if (utils::strmatch(values[i], "^#")) {
-        nwords = i;
+    for (std::size_t ii = 0; ii < values.size(); ++ii) {
+      if (utils::strmatch(values[ii], "^#")) {
+        nwords = ii;
         break;
       }
     }
@@ -1309,9 +1309,9 @@ void Molecule::impropers(int flag, char *line)
     readline(line);
     auto values = Tokenizer(utils::trim(line)).as_vector();
     int nwords = values.size();
-    for (std::size_t i = 0; i < values.size(); ++i) {
-      if (utils::strmatch(values[i], "^#")) {
-        nwords = i;
+    for (std::size_t ii = 0; ii < values.size(); ++ii) {
+      if (utils::strmatch(values[ii], "^#")) {
+        nwords = ii;
         break;
       }
     }
@@ -1680,9 +1680,9 @@ void Molecule::shaketype_read(char *line)
     readline(line);
     auto values = Tokenizer(utils::trim(line)).as_vector();
     nmatch = values.size();
-    for (std::size_t i = 0; i < values.size(); ++i) {
-      if (utils::strmatch(values[i], "^#")) {
-        nmatch = i;
+    for (std::size_t ii = 0; ii < values.size(); ++ii) {
+      if (utils::strmatch(values[ii], "^#")) {
+        nmatch = ii;
         break;
       }
     }