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
+2 -1
View File
@@ -22,6 +22,7 @@
#include "masterentity.h"
#include "../common/packet_dump.h"
#include "../common/rulesys.h"
#include "../common/StringUtil.h"
#include "StringIDs.h"
#include "QuestParserCollection.h"
@@ -791,7 +792,7 @@ void Client::SendZoneFlagInfo(Client *to) const {
return;
}
set<uint32>::const_iterator cur, end;
std::set<uint32>::const_iterator cur, end;
cur = zone_flags.begin();
end = zone_flags.end();
char empty[1] = { '\0' };