From: Brian Norris <banorris@uci.edu>
Date: Wed, 30 Jan 2013 18:19:21 +0000 (-0800)
Subject: cyclegraph: use vector empty() and clear()
X-Git-Tag: oopsla2013~315
X-Git-Url: http://demsky.eecs.uci.edu/git/?p=model-checker.git;a=commitdiff_plain;h=9904060b44ad97b7aa4327678dfc902f1d83bbd2

cyclegraph: use vector empty() and clear()
---

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. */