Merge pull request #976 from SaberUK/master+fix-xline-db

[user/henk/code/inspircd.git] / src / snomasks.cpp

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index d7cb64f26d45c5f46817049a0070ecc0b8cfa9df..fd6a2709a13c4d180e6432138ec2dabb80773c77 100644 (file)
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -21,7 +21,6 @@
 
 
 #include "inspircd.h"
-#include <stdarg.h>
 
 void SnomaskManager::FlushSnotices()
 {
@@ -47,7 +46,7 @@ void SnomaskManager::WriteGlobalSno(char letter, const std::string& text)
 {
        WriteToSnoMask(letter, text);
        letter = toupper(letter);
-       ServerInstance->PI->SendSNONotice(std::string(1, letter), text);
+       ServerInstance->PI->SendSNONotice(letter, text);
 }
 
 void SnomaskManager::WriteToSnoMask(char letter, const char* text, ...)
@@ -132,8 +131,8 @@ void Snomask::Send(char letter, const std::string& desc, const std::string& msg)
        std::string finalmsg = "*** ";
        finalmsg.append(log);
        /* Only opers can receive snotices, so we iterate the oper list */
-       const std::list<User*>& opers = ServerInstance->Users->all_opers;
-       for (std::list<User*>::const_iterator i = opers.begin(); i != opers.end(); ++i)
+       const UserManager::OperList& opers = ServerInstance->Users->all_opers;
+       for (UserManager::OperList::const_iterator i = opers.begin(); i != opers.end(); ++i)
        {
                User* user = *i;
                // IsNoticeMaskSet() returns false for opers who aren't +s, no need to check for it seperately