[Scummvm-git-logs] scummvm master -> b8f7e9416bcfa41750778065a87b9630b16352bd

[grisenti]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b8f7e9416b COMMON: Remove unused method in Common::RBTree


Commit: b8f7e9416bcfa41750778065a87b9630b16352bd
    https://github.com/scummvm/scummvm/commit/b8f7e9416bcfa41750778065a87b9630b16352bd
Author: grisenti (emanuele at grisenti.net)
Date: 2023-06-03T23:11:03+02:00

Commit Message:
COMMON: Remove unused method in Common::RBTree

Changed paths:
    common/rb_tree.h


diff --git a/common/rb_tree.h b/common/rb_tree.h
index 12498ba8ced..0b261689674 100644
--- a/common/rb_tree.h
+++ b/common/rb_tree.h
@@ -343,19 +343,6 @@ private:
 	Node *_leftmost = nullptr;
 	size_t _size = 0;
 
-	Node *merge(Node *left, Node *right) {
-		if (!right)
-			return left;
-		else if (!left)
-			return right;
-		else {
-			auto lm = leftmost(right);
-			lm->left = left;
-			left->parent = lm;
-			return right;
-		}
-	}
-
 	BasicIterator internalInsert(Node **starting_point, const ValueType &val) {
 		auto it = starting_point;
 		Node *parent = nullptr;