From: Brian Norris <banorris@uci.edu>
Date: Wed, 19 Dec 2012 06:18:03 +0000 (-0800)
Subject: nodestack: refactor Node constructor
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3d5c19a73ba8eb618da7c304a229af3afe54bd71;p=cdsspec-compiler.git

nodestack: refactor Node constructor
---

diff --git a/nodestack.cc b/nodestack.cc
index d4c9765..088fad8 100644
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -41,13 +41,13 @@ Node::Node(ModelAction *act, Node *par, int nthreads, Node *prevfairness)
 	ASSERT(act);
 	act->set_node(this);
 	int currtid = id_to_int(act->get_tid());
-	int prevtid = (prevfairness != NULL) ? id_to_int(prevfairness->action->get_tid()) : 0;
+	int prevtid = prevfairness ? id_to_int(prevfairness->action->get_tid()) : 0;
 
 	if (model->params.fairwindow != 0) {
-		for (int i = 0; i < nthreads; i++) {
+		for (int i = 0; i < num_threads; i++) {
 			ASSERT(i < ((int)fairness.size()));
 			struct fairness_info *fi = &fairness[i];
-			struct fairness_info *prevfi = (par != NULL) && (i < par->get_num_threads()) ? &par->fairness[i] : NULL;
+			struct fairness_info *prevfi = (parent && i < parent->get_num_threads()) ? &parent->fairness[i] : NULL;
 			if (prevfi) {
 				*fi = *prevfi;
 			}