From: Brian Norris <banorris@uci.edu>
Date: Fri, 7 Sep 2012 17:31:08 +0000 (-0700)
Subject: model: use std::find for release sequence search
X-Git-Tag: pldi2013~232
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=commitdiff_plain;h=adccaa0225ce474d5d7a8e0833c11d0c0fdf944d

model: use std::find for release sequence search
---

diff --git a/model.cc b/model.cc
index bebd130..37bddaf 100644
--- a/model.cc
+++ b/model.cc
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <algorithm>
 
 #include "model.h"
 #include "action.h"
@@ -583,9 +584,8 @@ bool ModelChecker::release_seq_head(const ModelAction *rf,
 	action_list_t::const_reverse_iterator rit;
 
 	/* Find rf in the thread list */
-	for (rit = list->rbegin(); rit != list->rend(); rit++)
-		if (*rit == rf)
-			break;
+	rit = std::find(list->rbegin(), list->rend(), rf);
+	ASSERT(rit != list->rend());
 
 	/* Find the last write/release */
 	for (; rit != list->rend(); rit++)