diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-05-17 14:20:35 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-05-17 14:20:35 +0200 |
| commit | 1094783715c16faf7553d2391b8bf23bfc51524d (patch) | |
| tree | 98ac29f4b341d05ff144492c66ba3406c30d136d /src/server/shared/Dynamic/ObjectRegistry.h | |
| parent | 81b8deef529517a1f13397ff2aa13154bccf86c9 (diff) | |
| parent | 4136f3c974d2b08e1e9098fe9ab410db9a6aebd4 (diff) | |
Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/shared/Dynamic/ObjectRegistry.h')
| -rw-r--r-- | src/server/shared/Dynamic/ObjectRegistry.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h index 4b17b2fc558..be7ce00ac05 100644 --- a/src/server/shared/Dynamic/ObjectRegistry.h +++ b/src/server/shared/Dynamic/ObjectRegistry.h @@ -20,12 +20,12 @@ #define TRINITY_OBJECTREGISTRY_H #include "Define.h" -#include "Dynamic/UnorderedMap.h" #include <ace/Singleton.h> #include <string> #include <vector> #include <map> +#include <unordered_map> /** ObjectRegistry holds all registry item of the same type */ |