diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-10-24 18:55:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-24 18:55:46 +0200 |
| commit | f74f27a66f997458f858be0a2d93b3938f105282 (patch) | |
| tree | e5a86831b6c893c57ec87317c405e67c787fd3b6 | |
| parent | 0268a95828bd0690aedadf0e2503f1e1f67bf81f (diff) | |
| parent | 8da9fd5d2319f9f901c0359e1190e8a62d6fbfe6 (diff) | |
Merge pull request #12377 from Cradmon/quickFix
Small fix in core/set.h and similar fix in core/map.h
| -rw-r--r-- | core/map.h | 1 | ||||
| -rw-r--r-- | core/set.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/core/map.h b/core/map.h index f01062ebed..fb24a5868c 100644 --- a/core/map.h +++ b/core/map.h @@ -438,7 +438,6 @@ private: Element *rp = ((p_node->left == _data._nil) || (p_node->right == _data._nil)) ? p_node : p_node->_next; Element *node = (rp->left == _data._nil) ? rp->right : rp->left; - node->parent = rp->parent; Element *sibling; if (rp == rp->parent->left) { diff --git a/core/set.h b/core/set.h index 0f48e07520..331979d4e3 100644 --- a/core/set.h +++ b/core/set.h @@ -424,7 +424,6 @@ private: Element *rp = ((p_node->left == _data._nil) || (p_node->right == _data._nil)) ? p_node : p_node->_next; Element *node = (rp->left == _data._nil) ? rp->right : rp->left; - node->parent = rp->parent; Element *sibling; if (rp == rp->parent->left) { |