nodestack/model: spacing
authorBrian Norris <banorris@uci.edu>
Tue, 29 Jan 2013 18:15:44 +0000 (10:15 -0800)
committerBrian Norris <banorris@uci.edu>
Tue, 29 Jan 2013 19:26:33 +0000 (11:26 -0800)
model.cc
nodestack.cc

index 1ecc48e..c9b8460 100644 (file)
--- 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);
index dd2dd85..addf93f 100644 (file)
@@ -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;