model: revert broken bugfix

[c11tester.git] / nodestack.cc

diff --git a/nodestack.cc b/nodestack.cc
index 533f75a7fab1bbc2c014d7fc883133b957bb94ed..b33d24739ca89399ffb363c1ba3bdecd61ca6dc2 100644 (file)
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -178,7 +178,7 @@ bool Node::add_future_value(uint64_t value, modelclock_t expiration) {
  * @return true if the future_values set is empty.
  */
 bool Node::future_value_empty() {
-       return ((future_index + 1) >= future_values.size());
+       return ((future_index + 1) >= ((int)future_values.size()));
 }
 
 /**
@@ -288,12 +288,12 @@ void Node::add_read_from(const ModelAction *act)
  * @return The first element in future_values
  */
 uint64_t Node::get_future_value() {
-       ASSERT(future_index<future_values.size());
+       ASSERT(future_index<((int)future_values.size()));
        return future_values[future_index].value;
 }
 
 modelclock_t Node::get_future_value_expiration() {
-       ASSERT(future_index<future_values.size());
+       ASSERT(future_index<((int)future_values.size()));
        return future_values[future_index].expiration;
 }
 
@@ -325,11 +325,8 @@ const ModelAction * Node::get_read_from() {
 bool Node::increment_read_from() {
        DBG();
        promises.clear();
-       if ((read_from_index+1) < may_read_from.size()) {
-               read_from_index++;
-               return true;
-       }
-       return false;
+       read_from_index++;
+       return (read_from_index < may_read_from.size());
 }
 
 /**
@@ -339,11 +336,8 @@ bool Node::increment_read_from() {
 bool Node::increment_future_value() {
        DBG();
        promises.clear();
-       if ((future_index+1) < future_values.size()) {
-               future_index++;
-               return true;
-       }
-       return false;
+       future_index++;
+       return (future_index < (int)future_values.size());
 }
 
 void Node::explore(thread_id_t tid)