From 80bd54a5423d5977c81f5f6db31a475b1f17ecce Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Tue, 29 Jan 2013 10:15:44 -0800 Subject: [PATCH] nodestack/model: spacing --- model.cc | 2 +- nodestack.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/model.cc b/model.cc index 1ecc48e3..c9b8460c 100644 --- a/model.cc +++ b/model.cc @@ -2339,7 +2339,7 @@ bool ModelChecker::resolve_promises(ModelAction *write) post_r_modification_order(read, write); //Make sure the promise's value matches the write's value ASSERT(promise->get_value() == write->get_value()); - delete(promise); + delete promise; promises->erase(promises->begin() + promise_index); actions_to_check.push_back(read); diff --git a/nodestack.cc b/nodestack.cc index dd2dd855..addf93f6 100644 --- a/nodestack.cc +++ b/nodestack.cc @@ -164,7 +164,7 @@ bool Node::increment_promise() //sending our value to two rmws... not going to work..try next combination continue; } - promises[i] = (promises[i] & PROMISE_RMW) |PROMISE_FULFILLED; + promises[i] = (promises[i] & PROMISE_RMW) | PROMISE_FULFILLED; while (i > 0) { i--; if ((promises[i] & PROMISE_MASK) == PROMISE_FULFILLED) @@ -188,9 +188,9 @@ bool Node::promise_empty() const for (int i = promises.size() - 1; i >= 0; i--) { if (promises[i] == PROMISE_UNFULFILLED) return false; - if (!fulfilledrmw && ((promises[i]&PROMISE_MASK) == PROMISE_UNFULFILLED)) + if (!fulfilledrmw && ((promises[i] & PROMISE_MASK) == PROMISE_UNFULFILLED)) return false; - if (promises[i] == (PROMISE_FULFILLED|PROMISE_RMW)) + if (promises[i] == (PROMISE_FULFILLED | PROMISE_RMW)) fulfilledrmw = true; } return true; -- 2.34.1