From: Brian Norris <banorris@uci.edu>
Date: Thu, 13 Sep 2012 18:45:42 +0000 (-0700)
Subject: model: trivial fixups
X-Git-Tag: pldi2013~202
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=27178b4c4870ab7dcbcfb1135f73a78a19cf4ff8;p=model-checker.git

model: trivial fixups
---

diff --git a/model.cc b/model.cc
index b566b62..1cde354 100644
--- a/model.cc
+++ b/model.cc
@@ -393,6 +393,7 @@ Thread * ModelChecker::check_current_action(ModelAction *curr)
 	}
 
 	bool updated = false;
+
 	if (curr->is_read()) {
 		updated = process_read(curr, get_thread(curr), second_part_of_rmw);
 	}
@@ -400,7 +401,7 @@ Thread * ModelChecker::check_current_action(ModelAction *curr)
 	if (curr->is_write()) {
 		bool updated_mod_order = w_modification_order(curr);
 		bool updated_promises = resolve_promises(curr);
-		updated = updated_mod_order|updated_promises;
+		updated = updated_mod_order || updated_promises;
 
 		if (promises->size()==0) {
 			for (unsigned int i = 0; i<futurevalues->size(); i++) {