Fix -Wshadow warnings in common headers (#3826)

2 files changed, 10 insertions, 5 deletions

diff --git a/src/expr/node.h b/src/expr/node.h
index 616e256ab..e07499b69 100644
--- a/src/expr/node.h
+++ b/src/expr/node.h
@@ -825,10 +825,15 @@ public:
    * (might break language compliance, but good for debugging expressions)
    * @param language the language in which to output
    */
-  inline void toStream(std::ostream& out, int toDepth = -1, bool types = false, size_t dag = 1,
-                       OutputLanguage language = language::output::LANG_AUTO) const {
+  inline void toStream(
+      std::ostream& out,
+      int toDepth = -1,
+      bool types = false,
+      size_t dagThreshold = 1,
+      OutputLanguage language = language::output::LANG_AUTO) const
+  {
     assertTNodeNotExpired();
-    d_nv->toStream(out, toDepth, types, dag, language);
+    d_nv->toStream(out, toDepth, types, dagThreshold, language);
   }
 
   /**
diff --git a/src/expr/type_node.h b/src/expr/type_node.h
index 14eb9064c..dcafef9c0 100644
--- a/src/expr/type_node.h
+++ b/src/expr/type_node.h
@@ -798,9 +798,9 @@ TypeNode TypeNode::substitute(Iterator1 typesBegin,
       // push the operator
       nb << TypeNode(d_nv->d_children[0]);
     }
-    for (TypeNode::const_iterator it = begin(), iend = end(); it != iend; ++it)
+    for (const TypeNode& tn : *this)
     {
-      nb << (*it).substitute(
+      nb << tn.substitute(
           typesBegin, typesEnd, replacementsBegin, replacementsEnd, cache);
     }
     TypeNode tn = nb.constructTypeNode();