Commit c6577ea6 authored by Frazer Leslie Clews's avatar Frazer Leslie Clews
Browse files

make non-primitave types pre increment instead of post increment

parent 7a02c59b
......@@ -65,7 +65,7 @@ CustomNonbondedForce::CustomNonbondedForce(const CustomNonbondedForce& rhs) {
particles = rhs.particles;
exclusions = rhs.exclusions;
interactionGroups = rhs.interactionGroups;
for (vector<FunctionInfo>::const_iterator it = rhs.functions.begin(); it != rhs.functions.end(); it++)
for (vector<FunctionInfo>::const_iterator it = rhs.functions.begin(); it != rhs.functions.end(); ++it)
functions.push_back(FunctionInfo(it->name, it->function->Copy()));
}
......
......@@ -138,7 +138,7 @@ bool System::usesPeriodicBoundaryConditions() const {
bool uses_pbc = false;
bool all_forces_implement = true;
for (std::vector<Force*>::const_iterator it = forces.begin();
it != forces.end(); it++) {
it != forces.end(); ++it) {
try {
if ((*it)->usesPeriodicBoundaryConditions())
uses_pbc = true;
......
......@@ -132,9 +132,9 @@ void AmoebaTorsionTorsionForceImpl::reorderGrid(const TorsionTorsionGrid& grid,
// increment map iterators
mapJJ++;
++mapJJ;
if (mapJJ == map_Double_IntPair.end()) {
mapII++;
++mapII;
if (mapII == mapAngles.end()) {
if ((jj != (grid[ii].size()-1)) && (ii != (grid.size()-1))) {
char buffer[1024];
......
......@@ -128,7 +128,7 @@ void testSerialization() {
map<string, double>::const_iterator it1=p1.begin();
map<string, double>::const_iterator it2=p2.begin();
//maps are ordered, so iterators should be in the same order.
for (it1 = p1.begin(); it1 != p1.end(); it1++, it2++) {
for (it1 = p1.begin(); it1 != p1.end(); ++it1, ++it2) {
assert((it1->first).compare(it2->first) == 0);
ASSERT_EQUAL(it1->second, it2->second);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment