From: Aki Tuomi <cmouse@cmouse.fi>
Date: Mon, 21 Oct 2019 09:10:37 +0000 (+0300)
Subject: iputils.hh: Rename parent to pparent
X-Git-Tag: dnsdist-1.4.0~15^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=342114cad2ef229053b6947040ffa04c77e6341e;p=thirdparty%2Fpdns.git

iputils.hh: Rename parent to pparent

iputils.hh:785:32: warning: declaration of 'parent' shadows a global declaration
---

diff --git a/pdns/iputils.hh b/pdns/iputils.hh
index d0b01adddb..c5d978b343 100644
--- a/pdns/iputils.hh
+++ b/pdns/iputils.hh
@@ -782,15 +782,15 @@ public:
     // only cleanup this node if it has no children and node4 and node6 are both empty
     if (!(node->left || node->right || node->node6 || node->node4)) {
       // get parent node ptr
-      TreeNode* parent = node->parent;
+      TreeNode* pparent = node->parent;
       // delete this node
-      if (parent) {
-	if (parent->left.get() == node)
-	  parent->left.reset();
+      if (pparent) {
+	if (pparent->left.get() == node)
+	  pparent->left.reset();
 	else
-	  parent->right.reset();
+	  pparent->right.reset();
 	// now recurse up to the parent
-	cleanup_tree(parent);
+	cleanup_tree(pparent);
       }
     }
   }