ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid ambiguous variable override with due to for scoping

Browse Source
This commit is contained in:
Axel Kohlmeyer
2022-09-12 16:27:54 -04:00
parent 44b8eee180
commit 3e51cfc4d1
2 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/atom.cpp
View File

@ -1278,9 +1278,9 @@ void Atom::data_bonds(int n, char *buf, int *count, tagint id_offset,
*next = '\0'; *next = '\0';
auto values = Tokenizer(buf).as_vector(); auto values = Tokenizer(buf).as_vector();
int nwords = values.size(); int nwords = values.size();
for (std::size_t i = 0; i < values.size(); ++i) { for (std::size_t ii = 0; ii < values.size(); ++ii) {
if (utils::strmatch(values[i], "^#")) { if (utils::strmatch(values[ii], "^#")) {
nwords = i; nwords = ii;
break; break;
} }
} }
@ -1369,9 +1369,9 @@ void Atom::data_angles(int n, char *buf, int *count, tagint id_offset,
*next = '\0'; *next = '\0';
auto values = Tokenizer(buf).as_vector(); auto values = Tokenizer(buf).as_vector();
int nwords = values.size(); int nwords = values.size();
for (std::size_t i = 0; i < values.size(); ++i) { for (std::size_t ii = 0; ii < values.size(); ++ii) {
if (utils::strmatch(values[i], "^#")) { if (utils::strmatch(values[ii], "^#")) {
nwords = i; nwords = ii;
break; break;
} }
} }
@ -1476,9 +1476,9 @@ void Atom::data_dihedrals(int n, char *buf, int *count, tagint id_offset,
*next = '\0'; *next = '\0';
auto values = Tokenizer(buf).as_vector(); auto values = Tokenizer(buf).as_vector();
int nwords = values.size(); int nwords = values.size();
for (std::size_t i = 0; i < values.size(); ++i) { for (std::size_t ii = 0; ii < values.size(); ++ii) {
if (utils::strmatch(values[i], "^#")) { if (utils::strmatch(values[ii], "^#")) {
nwords = i; nwords = ii;
break; break;
} }
} }
@ -1602,9 +1602,9 @@ void Atom::data_impropers(int n, char *buf, int *count, tagint id_offset,
*next = '\0'; *next = '\0';
auto values = Tokenizer(buf).as_vector(); auto values = Tokenizer(buf).as_vector();
int nwords = values.size(); int nwords = values.size();
for (std::size_t i = 0; i < values.size(); ++i) { for (std::size_t ii = 0; ii < values.size(); ++ii) {
if (utils::strmatch(values[i], "^#")) { if (utils::strmatch(values[ii], "^#")) {
nwords = i; nwords = ii;
break; break;
} }
} }

36
src/molecule.cpp
View File

@ -767,9 +767,9 @@ void Molecule::types(char *line)
readline(line); readline(line);
auto values = Tokenizer(utils::trim(line)).as_vector(); auto values = Tokenizer(utils::trim(line)).as_vector();
int nwords = values.size(); int nwords = values.size();
for (std::size_t i = 0; i < values.size(); ++i) { for (std::size_t ii = 0; ii < values.size(); ++ii) {
if (utils::strmatch(values[i], "^#")) { if (utils::strmatch(values[ii], "^#")) {
nwords = i; nwords = ii;
break; break;
} }
} }
@ -1007,9 +1007,9 @@ void Molecule::bonds(int flag, char *line)
readline(line); readline(line);
auto values = Tokenizer(utils::trim(line)).as_vector(); auto values = Tokenizer(utils::trim(line)).as_vector();
int nwords = values.size(); int nwords = values.size();
for (std::size_t i = 0; i < values.size(); ++i) { for (std::size_t ii = 0; ii < values.size(); ++ii) {
if (utils::strmatch(values[i], "^#")) { if (utils::strmatch(values[ii], "^#")) {
nwords = i; nwords = ii;
break; break;
} }
} }
@ -1093,9 +1093,9 @@ void Molecule::angles(int flag, char *line)
readline(line); readline(line);
auto values = Tokenizer(utils::trim(line)).as_vector(); auto values = Tokenizer(utils::trim(line)).as_vector();
int nwords = values.size(); int nwords = values.size();
for (std::size_t i = 0; i < values.size(); ++i) { for (std::size_t ii = 0; ii < values.size(); ++ii) {
if (utils::strmatch(values[i], "^#")) { if (utils::strmatch(values[ii], "^#")) {
nwords = i; nwords = ii;
break; break;
} }
} }
@ -1194,9 +1194,9 @@ void Molecule::dihedrals(int flag, char *line)
readline(line); readline(line);
auto values = Tokenizer(utils::trim(line)).as_vector(); auto values = Tokenizer(utils::trim(line)).as_vector();
int nwords = values.size(); int nwords = values.size();
for (std::size_t i = 0; i < values.size(); ++i) { for (std::size_t ii = 0; ii < values.size(); ++ii) {
if (utils::strmatch(values[i], "^#")) { if (utils::strmatch(values[ii], "^#")) {
nwords = i; nwords = ii;
break; break;
} }
} }
@ -1309,9 +1309,9 @@ void Molecule::impropers(int flag, char *line)
readline(line); readline(line);
auto values = Tokenizer(utils::trim(line)).as_vector(); auto values = Tokenizer(utils::trim(line)).as_vector();
int nwords = values.size(); int nwords = values.size();
for (std::size_t i = 0; i < values.size(); ++i) { for (std::size_t ii = 0; ii < values.size(); ++ii) {
if (utils::strmatch(values[i], "^#")) { if (utils::strmatch(values[ii], "^#")) {
nwords = i; nwords = ii;
break; break;
} }
} }
@ -1680,9 +1680,9 @@ void Molecule::shaketype_read(char *line)
readline(line); readline(line);
auto values = Tokenizer(utils::trim(line)).as_vector(); auto values = Tokenizer(utils::trim(line)).as_vector();
nmatch = values.size(); nmatch = values.size();
for (std::size_t i = 0; i < values.size(); ++i) { for (std::size_t ii = 0; ii < values.size(); ++ii) {
if (utils::strmatch(values[i], "^#")) { if (utils::strmatch(values[ii], "^#")) {
nmatch = i; nmatch = ii;
break; break;
} }
} }