diff options
| -rw-r--r-- | src/command_parse.cpp | 2 | ||||
| -rw-r--r-- | src/mode.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_ident.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_silence.cpp | 2 | ||||
| -rw-r--r-- | src/timer.cpp | 2 | ||||
| -rw-r--r-- | src/users.cpp | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/command_parse.cpp b/src/command_parse.cpp index b05b34c9b..34844d804 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -256,7 +256,7 @@ bool CommandParser::ProcessCommand(LocalUser *user, std::string &cmd) while (command_p.size() > (cm->second->max_params - 1)) { // BE CAREFUL: .end() returns past the end of the vector, hence decrement. - std::vector<std::string>::iterator it = --command_p.end(); + std::vector<std::string>::iterator it = command_p.end() - 1; lparam.insert(0, " " + *(it)); command_p.erase(it); // remove last element diff --git a/src/mode.cpp b/src/mode.cpp index e2b0c2f68..16751e712 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -880,7 +880,7 @@ bool ModeParser::DelModeWatcher(ModeWatcher* mw) mw->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL; pos = (mw->GetModeChar()-65) | mask; - ModeWatchIter a = find(modewatchers[pos].begin(),modewatchers[pos].end(),mw); + ModeWatchIter a = std::find(modewatchers[pos].begin(),modewatchers[pos].end(),mw); if (a == modewatchers[pos].end()) { diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp index 6099e7c14..f0ced1db7 100644 --- a/src/modules/m_ident.cpp +++ b/src/modules/m_ident.cpp @@ -362,7 +362,7 @@ class ModuleIdent : public Module /* wooo, got a result (it will be good, or bad) */ if (isock->result.empty()) { - user->ident.insert(0, 1, '~'); + user->ident.insert(user->ident.begin(), 1, '~'); user->WriteServ("NOTICE Auth :*** Could not find your ident, using %s instead.", user->ident.c_str()); } else diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp index 817c8ffcf..ce5b26500 100644 --- a/src/modules/m_silence.cpp +++ b/src/modules/m_silence.cpp @@ -87,7 +87,7 @@ class CommandSVSSilence : public Command if (IS_LOCAL(u)) { - ServerInstance->Parser->CallHandler("SILENCE", std::vector<std::string>(++parameters.begin(), parameters.end()), u); + ServerInstance->Parser->CallHandler("SILENCE", std::vector<std::string>(parameters.begin() + 1, parameters.end()), u); } return CMD_SUCCESS; diff --git a/src/timer.cpp b/src/timer.cpp index a1ee0b488..e04a186cf 100644 --- a/src/timer.cpp +++ b/src/timer.cpp @@ -70,7 +70,7 @@ void TimerManager::DelTimer(Timer* T) void TimerManager::AddTimer(Timer* T) { Timers.push_back(T); - sort(Timers.begin(), Timers.end(), TimerManager::TimerComparison); + std::sort(Timers.begin(), Timers.end(), TimerManager::TimerComparison); } bool TimerManager::TimerComparison( Timer *one, Timer *two) diff --git a/src/users.cpp b/src/users.cpp index 18a356ef8..6b2432cc4 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -978,7 +978,7 @@ const char* User::GetIPString() irc::sockets::satoap(client_sa, cachedip, port); /* IP addresses starting with a : on irc are a Bad Thing (tm) */ if (cachedip.c_str()[0] == ':') - cachedip.insert(0,1,'0'); + cachedip.insert(cachedip.begin(),1,'0'); } return cachedip.c_str(); |