3 files changed, 18 insertions, 17 deletions

diff --git a/thirdparty/enet/godot.cpp b/thirdparty/enet/godot.cpp
index 93d3b3bbff..d2fcc4642e 100644
--- a/thirdparty/enet/godot.cpp
+++ b/thirdparty/enet/godot.cpp
@@ -259,7 +259,7 @@ public:
 class ENetDTLSServer : public ENetGodotSocket {
 	Ref<DTLSServer> server;
 	Ref<UDPServer> udp_server;
-	Map<String, Ref<PacketPeerDTLS>> peers;
+	HashMap<String, Ref<PacketPeerDTLS>> peers;
 	int last_service = 0;
 	IPAddress local_address;
 
@@ -331,15 +331,16 @@ public:
 		List<String> remove;
 		Error err = ERR_BUSY;
 		// TODO this needs to be fair!
-		for (Map<String, Ref<PacketPeerDTLS>>::Element *E = peers.front(); E; E = E->next()) {
-			Ref<PacketPeerDTLS> peer = E->get();
+
+		for (KeyValue<String, Ref<PacketPeerDTLS>> & E : peers) {
+			Ref<PacketPeerDTLS> peer = E.value;
 			peer->poll();
 
 			if (peer->get_status() == PacketPeerDTLS::STATUS_HANDSHAKING) {
 				continue;
 			} else if (peer->get_status() != PacketPeerDTLS::STATUS_CONNECTED) {
 				// Peer disconnected, removing it.
-				remove.push_back(E->key());
+				remove.push_back(E.key);
 				continue;
 			}
 
@@ -348,12 +349,12 @@ public:
 				err = peer->get_packet(&buffer, r_read);
 				if (err != OK || p_len < r_read) {
 					// Something wrong with this peer, removing it.
-					remove.push_back(E->key());
+					remove.push_back(E.key);
 					err = FAILED;
 					continue;
 				}
 
-				Vector<String> s = E->key().rsplit(":", false, 1);
+				Vector<String> s = E.key.rsplit(":", false, 1);
 				ERR_CONTINUE(s.size() != 2); // BUG!
 
 				memcpy(p_buffer, buffer, r_read);
@@ -376,8 +377,8 @@ public:
 	}
 
 	void close() {
-		for (Map<String, Ref<PacketPeerDTLS>>::Element *E = peers.front(); E; E = E->next()) {
-			E->get()->disconnect_from_peer();
+		for (KeyValue<String, Ref<PacketPeerDTLS>> &E : peers) {
+			E.value->disconnect_from_peer();
 		}
 		peers.clear();
 		udp_server->stop();
diff --git a/thirdparty/misc/polypartition.cpp b/thirdparty/misc/polypartition.cpp
index df144c57a6..a725125ed0 100644
--- a/thirdparty/misc/polypartition.cpp
+++ b/thirdparty/misc/polypartition.cpp
@@ -1357,12 +1357,12 @@ int TPPLPartition::MonotonePartition(TPPLPolyList *inpolys, TPPLPolyList *monoto
   // Note that while set doesn't actually have to be implemented as
   // a tree, complexity requirements for operations are the same as
   // for the balanced binary search tree.
-  Set<ScanLineEdge> edgeTree;
+  RBSet<ScanLineEdge> edgeTree;
   // Store iterators to the edge tree elements.
   // This makes deleting existing edges much faster.
-  Set<ScanLineEdge>::Element **edgeTreeIterators, *edgeIter;
-  edgeTreeIterators = new Set<ScanLineEdge>::Element *[maxnumvertices];
-  //Pair<Set<ScanLineEdge>::iterator, bool> edgeTreeRet;
+  RBSet<ScanLineEdge>::Element **edgeTreeIterators, *edgeIter;
+  edgeTreeIterators = new RBSet<ScanLineEdge>::Element *[maxnumvertices];
+  //Pair<RBSet<ScanLineEdge>::iterator, bool> edgeTreeRet;
   for (i = 0; i < numvertices; i++) {
     edgeTreeIterators[i] = nullptr;
   }
@@ -1569,8 +1569,8 @@ int TPPLPartition::MonotonePartition(TPPLPolyList *inpolys, TPPLPolyList *monoto
 
 // Adds a diagonal to the doubly-connected list of vertices.
 void TPPLPartition::AddDiagonal(MonotoneVertex *vertices, long *numvertices, long index1, long index2,
-        TPPLVertexType *vertextypes, Set<ScanLineEdge>::Element **edgeTreeIterators,
-        Set<ScanLineEdge> *edgeTree, long *helpers) {
+	TPPLVertexType *vertextypes, RBSet<ScanLineEdge>::Element **edgeTreeIterators,
+	RBSet<ScanLineEdge> *edgeTree, long *helpers) {
   long newindex1, newindex2;
 
   newindex1 = *numvertices;
diff --git a/thirdparty/misc/polypartition.h b/thirdparty/misc/polypartition.h
index b2d905a3ef..fae7909079 100644
--- a/thirdparty/misc/polypartition.h
+++ b/thirdparty/misc/polypartition.h
@@ -26,7 +26,7 @@
 
 #include "core/math/vector2.h"
 #include "core/templates/list.h"
-#include "core/templates/set.h"
+#include "core/templates/rb_set.h"
 
 typedef double tppl_float;
 
@@ -224,8 +224,8 @@ public:
   // Helper functions for MonotonePartition.
   bool Below(TPPLPoint &p1, TPPLPoint &p2);
   void AddDiagonal(MonotoneVertex *vertices, long *numvertices, long index1, long index2,
-          TPPLVertexType *vertextypes, Set<ScanLineEdge>::Element **edgeTreeIterators,
-          Set<ScanLineEdge> *edgeTree, long *helpers);
+	  TPPLVertexType *vertextypes, RBSet<ScanLineEdge>::Element **edgeTreeIterators,
+	  RBSet<ScanLineEdge> *edgeTree, long *helpers);
 
   // Triangulates a monotone polygon, used in Triangulate_MONO.
   int TriangulateMonotone(TPPLPoly *inPoly, TPPLPolyList *triangles);