crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-27 21:55:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fixed errors due to iterators

Browse source
This commit is contained in:
myerspat 2022-07-27 11:18:02 -05:00
parent 7c282b845c
commit 67d01417b7
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/cell.cpp
View file

@ -700,7 +700,7 @@ void CSGCell::remove_complement_ops(vector<int32_t>& infix)
// Define stop given left parenthesis or not
auto stop = it;
if (*it == OP_LEFT_PAREN) {
stop = std::find(infix.begin(), infix.end(), OP_RIGHT_PAREN);
stop = std::find(it, infix.end(), OP_RIGHT_PAREN);
it++;
}
@ -708,7 +708,7 @@ void CSGCell::remove_complement_ops(vector<int32_t>& infix)
// positions in the RPN
apply_demorgan(it, stop);
// update iterator position
it = std::find(infix.begin(), infix.end(), OP_COMPLEMENT);
it = std::find(it, infix.end(), OP_COMPLEMENT);
}
}
@ -801,7 +801,7 @@ bool CSGCell::contains_complex(
// the next right parenthesis, if the token is a right
// parenthesis leave short circuiting
if (next_token == OP_LEFT_PAREN) {
it = std::find(it, rpn_.end(), OP_RIGHT_PAREN);
it = std::find(it, rpn_.end() - 1, OP_RIGHT_PAREN);
} else if (next_token == OP_RIGHT_PAREN) {
break;
}