diff options
| author | Hein-Pieter van Braam <hp@tmm.cx> | 2017-09-06 23:50:18 +0200 |
|---|---|---|
| committer | Hein-Pieter van Braam <hp@tmm.cx> | 2017-09-08 14:59:15 +0200 |
| commit | 8230bf0a2f39f0849b670d26067207c45edcca1a (patch) | |
| tree | 42f598d11fab7f1449d0cace0f991f546bd72e72 /core/set.h | |
| parent | d1cb73b47a17de830d9474026ffa7b3587cfbc68 (diff) | |
| download | redot-engine-8230bf0a2f39f0849b670d26067207c45edcca1a.tar.gz | |
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.
Diffstat (limited to 'core/set.h')
| -rw-r--r-- | core/set.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/set.h b/core/set.h index 317e180869..f68d78cea1 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) { |