Change UniqueQueue to use a queue and a set.

src/map.cpp

@@ -1663,7 +1663,8 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> & modified_blocks)
 		/*
 			Get a queued transforming liquid node
 		*/
-		v3s16 p0 = m_transforming_liquid.pop_front();
+		v3s16 p0 = m_transforming_liquid.front();
+		m_transforming_liquid.pop_front();
 
 		MapNode n0 = getNodeNoEx(p0);
 
@@ -1909,7 +1910,10 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> & modified_blocks)
 	}
 	//infostream<<"Map::transformLiquids(): loopcount="<<loopcount<<std::endl;
 	while (must_reflow.size() > 0)
-		m_transforming_liquid.push_back(must_reflow.pop_front());
+	{
+		m_transforming_liquid.push_back(must_reflow.front());
+		must_reflow.pop_front();
+	}
 	updateLighting(lighting_modified_blocks, modified_blocks);
 
 
@@ -2380,8 +2384,8 @@ void ServerMap::finishBlockMake(BlockMakeData *data,
 	*/
 	while(data->transforming_liquid.size() > 0)
 	{
-		v3s16 p = data->transforming_liquid.pop_front();
-		m_transforming_liquid.push_back(p);
+		m_transforming_liquid.push_back(data->transforming_liquid.front());
+		data->transforming_liquid.pop_front();
 	}
 
 	/*

src/util/container.h

@@ -28,9 +28,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <list>
 #include <vector>
 #include <map>
+#include <set>
+#include <queue>
 
 /*
-	Queue with unique values with fast checking of value existence
+Queue with unique values with fast checking of value existence
 */
 
 template<typename Value>
@@ -44,36 +46,35 @@ class UniqueQueue
 	true: value added
 	false: value already exists
 	*/
-	bool push_back(Value value)
+	bool push_back(const Value& value)
 	{
-		// Check if already exists
-		if(m_map.find(value) != m_map.end())
-			return false;
-
-		// Add
-		m_map[value] = 0;
-		m_list.push_back(value);
-		
+		if (m_set.insert(value).second)
+		{
+			m_queue.push(value);
 			return true;
 		}
-
-	Value pop_front()
-	{
-		typename std::list<Value>::iterator i = m_list.begin();
-		Value value = *i;
-		m_map.erase(value);
-		m_list.erase(i);
-		return value;
+		return false;
 	}
 
-	u32 size()
+	void pop_front()
 	{
-		return m_map.size();
+		m_set.erase(m_queue.front());
+		m_queue.pop();
+	}
+
+	const Value& front() const
+	{
+		return m_queue.front();
+	}
+
+	u32 size() const
+	{
+		return m_queue.size();
 	}
 
 private:
-	std::map<Value, u8> m_map;
-	std::list<Value> m_list;
+	std::set<Value> m_set;
+	std::queue<Value> m_queue;
 };
 
 #if 1
@@ -131,16 +132,16 @@ class MutexedMap
 #endif
 
 /*
-	Generates ids for comparable values.
-	Id=0 is reserved for "no value".
+Generates ids for comparable values.
+Id=0 is reserved for "no value".
 
-	Is fast at:
-	- Returning value by id (very fast)
-	- Returning id by value
-	- Generating a new id for a value
+Is fast at:
+- Returning value by id (very fast)
+- Returning id by value
+- Generating a new id for a value
 
-	Is not able to:
-	- Remove an id/value pair (is possible to implement but slow)
+Is not able to:
+- Remove an id/value pair (is possible to implement but slow)
 */
 template<typename T>
 class MutexedIdGenerator
@@ -185,7 +186,7 @@ class MutexedIdGenerator
 };
 
 /*
-	FIFO queue (well, actually a FILO also)
+FIFO queue (well, actually a FILO also)
 */
 template<typename T>
 class Queue
@@ -246,7 +247,7 @@ class Queue
 };
 
 /*
-	Thread-safe FIFO queue (well, actually a FILO also)
+Thread-safe FIFO queue (well, actually a FILO also)
 */
 
 template<typename T>