Merge branch 'master' into fixWShadowfixWShadow

1 files changed, 15 insertions, 9 deletions

diff --git a/src/smt_util/node_visitor.h b/src/smt_util/node_visitor.h
index 58070c0b2..47ed6eff8 100644
--- a/src/smt_util/node_visitor.h
+++ b/src/smt_util/node_visitor.h
@@ -59,13 +59,15 @@ public:
    */
   struct stack_element {
     /** The node to be visited */
-    TNode node;
+    TNode d_node;
     /** The parent of the node */
-    TNode parent;
+    TNode d_parent;
     /** Have the children been queued up for visitation */
-    bool children_added;
+    bool d_childrenAdded;
     stack_element(TNode node, TNode parent)
-    : node(node), parent(parent), children_added(false) {}
+        : d_node(node), d_parent(parent), d_childrenAdded(false)
+    {
+    }
   };/* struct preprocess_stack_element */
 
   /**
@@ -84,20 +86,24 @@ public:
     while (!toVisit.empty()) {
       stack_element& stackHead = toVisit.back();
       // The current node we are processing
-      TNode current = stackHead.node;
-      TNode parent = stackHead.parent;
+      TNode current = stackHead.d_node;
+      TNode parent = stackHead.d_parent;
 
       if (visitor.alreadyVisited(current, parent)) {
         // If already visited, we're done
         toVisit.pop_back();
-      } else if (stackHead.children_added) {
+      }
+      else if (stackHead.d_childrenAdded)
+      {
         // Call the visitor
         visitor.visit(current, parent);
         // Done with this node, remove from the stack
         toVisit.pop_back();
-      } else {
+      }
+      else
+      {
         // Mark that we have added the children
-        stackHead.children_added = true;
+        stackHead.d_childrenAdded = true;
         // We need to add the children
         for(TNode::iterator child_it = current.begin(); child_it != current.end(); ++ child_it) {
           TNode childNode = *child_it;