From 8230bf0a2f39f0849b670d26067207c45edcca1a Mon Sep 17 00:00:00 2001
From: Hein-Pieter van Braam
Date: Wed, 6 Sep 2017 23:50:18 +0200
Subject: Remove assignment and declarations in if statements

After discussing with @reduz and @akien-mga it was decided that we do
not allow assignments or declarations in if statements. This PR removes
the instances of this I could find by automated means.
---
 core/set.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'core/set.h')

diff --git a/core/set.h b/core/set.h
index 317e18086..f68d78cea 100644
--- a/core/set.h
+++ b/core/set.h
@@ -438,8 +438,9 @@ private:
 		if (!rp)
 			rp = _data._nil;
 		Element *node = (rp->left == _data._nil) ? rp->right : rp->left;
+		node->parent = rp->parent;
 
-		if (_data._root == (node->parent = rp->parent)) {
+		if (_data._root == node->parent) {
 			_data._root->left = node;
 		} else {
 			if (rp == rp->parent->left) {
-- 
cgit v1.2.3-70-g09d2