From 9904060b44ad97b7aa4327678dfc902f1d83bbd2 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Wed, 30 Jan 2013 10:19:21 -0800 Subject: [PATCH] cyclegraph: use vector empty() and clear() --- cyclegraph.cc | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/cyclegraph.cc b/cyclegraph.cc index 7632b0c..00b8cd8 100644 --- a/cyclegraph.cc +++ b/cyclegraph.cc @@ -240,33 +240,31 @@ bool CycleGraph::checkPromise(const ModelAction *fromact, Promise *promise) cons void CycleGraph::startChanges() { - ASSERT(rollbackvector.size() == 0); - ASSERT(rmwrollbackvector.size() == 0); + ASSERT(rollbackvector.empty()); + ASSERT(rmwrollbackvector.empty()); ASSERT(oldCycles == hasCycles); } /** Commit changes to the cyclegraph. */ void CycleGraph::commitChanges() { - rollbackvector.resize(0); - rmwrollbackvector.resize(0); + rollbackvector.clear(); + rmwrollbackvector.clear(); oldCycles = hasCycles; } /** Rollback changes to the previous commit. */ void CycleGraph::rollbackChanges() { - for (unsigned int i = 0; i < rollbackvector.size(); i++) { + for (unsigned int i = 0; i < rollbackvector.size(); i++) rollbackvector[i]->popEdge(); - } - for (unsigned int i = 0; i < rmwrollbackvector.size(); i++) { + for (unsigned int i = 0; i < rmwrollbackvector.size(); i++) rmwrollbackvector[i]->clearRMW(); - } hasCycles = oldCycles; - rollbackvector.resize(0); - rmwrollbackvector.resize(0); + rollbackvector.clear(); + rmwrollbackvector.clear(); } /** @returns whether a CycleGraph contains cycles. */ -- 2.34.1