Merge branch 'std-queue' into std-bdlib

* std-queue:
  Replace bd::Queue usage with std::deque

src/mod/irc.mod/chan.cc

@@ -2093,12 +2093,13 @@ static int got315(char *from, char *msg)
 
   putlog(LOG_DEBUG, "*", "END who %s", chname);
 
-  if (!chained_who.isEmpty()) {
+  if (!chained_who.empty()) {
     // Send off next WHO request
     while (1) {
-      if (chained_who.isEmpty()) break;
+      if (chained_who.empty()) break;
       // Dequeue the next chan in the chain
-      chan = findchan(bd::String(chained_who.dequeue()).c_str());
+      chan = findchan(chained_who.front().c_str());
+      chained_who.pop_front();
       if (chan) {
         if (!strcmp(chan->name, chname)) continue; // First reply got queued too
         if (!shouldjoin(chan)) continue; // No longer care about this channel

src/mod/irc.mod/irc.cc

@@ -58,8 +58,8 @@
 using std::swap;
 #include <bdlib/src/String.h>
 #include <bdlib/src/HashTable.h>
-#include <bdlib/src/Queue.h>
 #include <bdlib/src/base64.h>
+#include <deque>
 
 #include <stdarg.h>
 
@@ -96,7 +96,7 @@ bool include_lk = 1;      /* For correct calculation
 bd::HashTable<bd::String, unsigned long> bot_counters;
 unsigned long my_cookie_counter = 0;
 
-static bd::Queue<bd::String> chained_who;
+static std::deque<bd::String> chained_who;
 static int chained_who_idx;
 
 static int
@@ -1314,8 +1314,9 @@ reset_chan_info(struct chanset_t *chan)
 
 static void send_chan_who(int queue, struct chanset_t *chan, bool chain) {
   if (chain) {
-    if (!chained_who.contains(chan->name))
-      chained_who.enqueue(chan->name);
+    if (std::find(std::begin(chained_who), std::end(chained_who),
+          chan->name) != std::end(chained_who))
+      chained_who.push_back(chan->name);
     chained_who_idx = queue;
     if (chained_who.size() > 1)
       return;