Merge commit '999a5ffa642c27dc3566664cf0e5b44dffafb1b7' into 4.3.4
Conflicts: sql/updates/world/2015_03_01_00_world.sql src/server/game/Server/WorldSocket.cpp src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp
This commit is contained in:
commit
67d616c195
26 files changed
+219
-246
No files matched your search
@@ -23,6 +23,7 @@
|
||||
#include "ByteBuffer.h"
|
||||
|
||||
#include <functional>
|
||||
#include <unordered_set>
|
||||
|
||||
enum TypeID
|
||||
{
|
||||
@@ -229,6 +230,7 @@ typedef std::set<ObjectGuid> GuidSet;
|
||||
typedef std::list<ObjectGuid> GuidList;
|
||||
typedef std::deque<ObjectGuid> GuidDeque;
|
||||
typedef std::vector<ObjectGuid> GuidVector;
|
||||
typedef std::unordered_set<ObjectGuid> GuidUnorderedSet;
|
||||
|
||||
// minimum buffer size for packed guid is 9 bytes
|
||||
#define PACKED_GUID_MIN_BUFFER_SIZE 9
|
||||
|
||||
Reference in new issue
Block a user