Fix use of std::swap()

src/mod/irc.mod/cmdsirc.cc

@@ -27,6 +27,7 @@
 #include <bdlib/src/Stream.h>
 #include <bdlib/src/String.h>
 #include <algorithm>
+using std::swap;
 #include "src/misc_file.h"
 
 /* Do we have any flags that will allow us ops on a channel?
@@ -345,7 +346,7 @@ static void cmd_voice(int idx, char *par)
 {
   char *nick = newsplit(&par), *chname = newsplit(&par);
   if (strchr(CHANMETA, nick[0]) || (!chname[0] && !strcmp(nick, "*")))
-    std::swap(nick, chname);
+    swap(nick, chname);
   bool all = 0;
 
   struct chanset_t* chan = get_channel(idx, chname, 1, &all);
@@ -409,7 +410,7 @@ static void cmd_devoice(int idx, char *par)
 {
   char *nick = newsplit(&par), *chname = newsplit(&par);
   if (strchr(CHANMETA, nick[0]) || (!chname[0] && !strcmp(nick, "*")))
-    std::swap(nick, chname);
+    swap(nick, chname);
   bool all = 0;
 
   struct chanset_t* chan = get_channel(idx, chname, 1, &all);
@@ -478,7 +479,7 @@ static void cmd_op(int idx, char *par)
 {
   char *nick = newsplit(&par), *chname = newsplit(&par);
   if (strchr(CHANMETA, nick[0]) || (!chname[0] && !strcmp(nick, "*")))
-    std::swap(nick, chname);
+    swap(nick, chname);
   bool all = 0;
 
   struct chanset_t* chan = get_channel(idx, chname, 1, &all);
@@ -969,7 +970,7 @@ static void cmd_deop(int idx, char *par)
 {
   char *nick = newsplit(&par), *chname = newsplit(&par);
   if (strchr(CHANMETA, nick[0]) || (!chname[0] && !strcmp(nick, "*")))
-    std::swap(nick, chname);
+    swap(nick, chname);
   bool all = 0;
 
   struct chanset_t* chan = get_channel(idx, chname, 1, &all);
@@ -1346,7 +1347,7 @@ static void do_invite(int idx, char *par, bool op)
   }
 
   if (strchr(CHANMETA, nick[0]) || (!chname[0] && !strcmp(nick, "*")))
-    std::swap(nick, chname);
+    swap(nick, chname);
   bool all = 0;
 
   struct chanset_t* chan = get_channel(idx, chname, 1, &all);

src/mod/irc.mod/irc.cc

@@ -54,6 +54,8 @@
 #include "src/mod/server.mod/server.h"
 #include "src/mod/channels.mod/channels.h"
 #include "src/mod/ctcp.mod/ctcp.h"
+#include <algorithm>
+using std::swap;
 #include <bdlib/src/String.h>
 #include <bdlib/src/HashTable.h>
 #include <bdlib/src/Queue.h>
@@ -1198,8 +1200,6 @@ killmember(struct chanset_t *chan, char *nick, bool cacheMember)
  * Update the member with cached information from a parted/quitted member
  */
 static void member_update_from_cache(struct chanset_t* chan, memberlist *m) {
-  using std::swap;
-
   // Are they in the cache?
   const bd::String userhost(m->userhost);
   if (chan->channel.cached_members->contains(userhost)) {

src/mod/irc.mod/msgcmds.cc

@@ -26,6 +26,8 @@
 
 
 #include "src/core_binds.h"
+#include <algorithm>
+using std::swap;
 
 static int msg_bewm(char *nick, char *host, struct userrec *u, char *par)
 {
@@ -132,7 +134,7 @@ static int msg_op(char *nick, char *host, struct userrec *u, char *par)
 
   /* Check if they used the wrong order */
   if (!u_pass_match(u, pass) && u_pass_match(u, par)) {
-    std::swap(pass, par);
+    swap(pass, par);
   }
 
   bd::String msg;