From: Brian Norris <banorris@uci.edu>
Date: Wed, 9 May 2012 06:42:32 +0000 (-0700)
Subject: action: rename 'node' members to 'treenode'
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d6132c396ec2037c65e1b72382679a8e98781e29;p=cdsspec-compiler.git

action: rename 'node' members to 'treenode'

I am transitioning from class TreeNode to another class (perhaps class
Node?), so rename these members to avoid collision.
---

diff --git a/action.h b/action.h
index 508ad16..9391591 100644
--- a/action.h
+++ b/action.h
@@ -30,8 +30,8 @@ public:
 	void * get_location() { return location; }
 	int get_seq_number() { return seq_number; }
 
-	TreeNode * get_node() { return node; }
-	void set_node(TreeNode *n) { node = n; }
+	TreeNode * get_treenode() { return treenode; }
+	void set_node(TreeNode *n) { treenode = n; }
 
 	bool is_read();
 	bool is_write();
@@ -46,7 +46,7 @@ private:
 	void *location;
 	thread_id_t tid;
 	int value;
-	TreeNode *node;
+	TreeNode *treenode;
 	int seq_number;
 };
 
diff --git a/model.cc b/model.cc
index 1c15d92..53411c6 100644
--- a/model.cc
+++ b/model.cc
@@ -121,7 +121,7 @@ thread_id_t ModelChecker::get_next_replay_thread()
 	next = exploring->get_state();
 
 	if (next == exploring->get_diverge()) {
-		TreeNode *node = next->get_node();
+		TreeNode *node = next->get_treenode();
 
 		/* Reached divergence point; discard our current 'exploring' */
 		DEBUG("*** Discard 'Backtrack' object ***\n");
@@ -203,7 +203,7 @@ void ModelChecker::set_backtracking(ModelAction *act)
 	if (prev == NULL)
 		return;
 
-	node = prev->get_node();
+	node = prev->get_treenode();
 
 	while (t && !node->is_enabled(t))
 		t = t->get_parent();