Merge branch 'master' of git://github.com/EQEmu/Server into gcc-changes

This commit is contained in:
j883376
2013-05-23 21:12:07 -04:00
219 changed files with 2420 additions and 2489 deletions
+3 -3
View File
@@ -35,7 +35,7 @@ void ClientLogs::subscribe(EQEMuLog::LogIDs id, Client *c) {
//make sure they arnt allready subscribed.
vector<Client *>::iterator cur,end;
std::vector<Client *>::iterator cur,end;
cur = entries[id].begin();
end = entries[id].end();
for(; cur != end; cur++) {
@@ -55,7 +55,7 @@ void ClientLogs::unsubscribe(EQEMuLog::LogIDs id, Client *c) {
if(c == nullptr)
return;
vector<Client *>::iterator cur,end;
std::vector<Client *>::iterator cur,end;
cur = entries[id].begin();
end = entries[id].end();
for(; cur != end; cur++) {
@@ -94,7 +94,7 @@ void ClientLogs::clear() {
void ClientLogs::msg(EQEMuLog::LogIDs id, const char *buf) {
if(id >= EQEMuLog::MaxLogID)
return;
vector<Client *>::iterator cur,end;
std::vector<Client *>::iterator cur,end;
cur = entries[id].begin();
end = entries[id].end();
for(; cur != end; cur++) {