Replace boost::flat_set with std::vector

Author: tstenner

src/send_buffer.cpp

@@ -34,15 +34,24 @@ void send_buffer::push_sample(const sample_p &s) {
 void send_buffer::register_consumer(consumer_queue *q) {
 	{
 		std::lock_guard<std::mutex> lock(consumers_mut_);
-		consumers_.insert(q);
+		if (std::find(consumers_.begin(), consumers_.end(), q) != consumers_.end())
+			LOG_F(WARNING, "Duplicate consumer queue in send buffer");
+		else
+			consumers_.push_back(q);
 	}
 	some_registered_.notify_all();
 }
 
 /// Unregister a previously registered consumer.
 void send_buffer::unregister_consumer(consumer_queue *q) {
 	std::lock_guard<std::mutex> lock(consumers_mut_);
-	consumers_.erase(q);
+	auto pos = std::find(consumers_.begin(), consumers_.end(), q);
+	if (pos == consumers_.end()) LOG_F(ERROR, "Trying to remove consumer queue not in send buffer");
+
+	// Put the element to be removed at the end (if it isn't there already) and
+	// remove the last element
+	if (*pos != consumers_.back()) std::swap(*pos, consumers_.back());
+	consumers_.pop_back();
 }
 
 /// Check whether there currently are consumers.

src/send_buffer.h

@@ -3,10 +3,10 @@
 
 #include "common.h"
 #include "forward.h"
-#include <boost/container/flat_set.hpp>
 #include <condition_variable>
 #include <memory>
 #include <mutex>
+#include <vector>
 
 namespace lsl {
 
@@ -20,7 +20,7 @@ namespace lsl {
  * send_buffer.
  */
 class send_buffer : public std::enable_shared_from_this<send_buffer> {
-	using consumer_set = lslboost::container::flat_set<consumer_queue *>;
+	using consumer_set = std::vector<class consumer_queue *>;
 
 public:
 	/**