nodestack: eliminate get_future_value_expiration()

[model-checker.git] / nodestack.cc

diff --git a/nodestack.cc b/nodestack.cc
index ccf79e40ea99b3726cbe092e6f0942b7659c61cb..708ec3d0f5fa3da43a563228ef53c4b6e72475dd 100644 (file)
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -195,7 +195,6 @@ bool Node::promise_empty() const
        return true;
 }
 
-
 void Node::set_misc_max(int i)
 {
        misc_max = i;
@@ -216,7 +215,6 @@ bool Node::misc_empty() const
        return (misc_index + 1) >= misc_max;
 }
 
-
 /**
  * Adds a value from a weakly ordered future write to backtrack to. This
  * operation may "fail" if the future value has already been run (within some
@@ -383,23 +381,16 @@ void Node::add_read_from(const ModelAction *act)
 }
 
 /**
- * Gets the next 'future_value' value from this Node. Only valid for a node
- * where this->action is a 'read'.
+ * Gets the next 'future_value' from this Node. Only valid for a node where
+ * this->action is a 'read'.
  * @return The first element in future_values
  */
-uint64_t Node::get_future_value() const
-{
-       ASSERT(future_index >= 0 && future_index < ((int)future_values.size()));
-       return future_values[future_index].value;
-}
-
-modelclock_t Node::get_future_value_expiration() const
+struct future_value Node::get_future_value() const
 {
        ASSERT(future_index >= 0 && future_index < ((int)future_values.size()));
-       return future_values[future_index].expiration;
+       return future_values[future_index];
 }
 
-
 int Node::get_read_from_size() const
 {
        return may_read_from.size();