From 342114cad2ef229053b6947040ffa04c77e6341e Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Mon, 21 Oct 2019 12:10:37 +0300 Subject: [PATCH] iputils.hh: Rename parent to pparent iputils.hh:785:32: warning: declaration of 'parent' shadows a global declaration --- pdns/iputils.hh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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); } } } -- 2.47.2