mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 10:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[6811] Use unordered_map only from gcc 4.3.x where it became deprecated

Browse source
This commit is contained in:
Wyk3d 2008-11-09 11:58:01 +02:00
parent 928ea2bdcf
commit 61a3159c31
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/framework/Utilities/UnorderedMap.h
View file

@ -24,7 +24,7 @@
#if COMPILER == COMPILER_INTEL #if COMPILER == COMPILER_INTEL
#include <ext/hash_map> #include <ext/hash_map>
#elif COMPILER == COMPILER_GNU && __GNUC__ >= 4 #elif COMPILER == COMPILER_GNU && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 3)
#include <tr1/unordered_map> #include <tr1/unordered_map>
#elif COMPILER == COMPILER_GNU && __GNUC__ >= 3 #elif COMPILER == COMPILER_GNU && __GNUC__ >= 3
#include <ext/hash_map> #include <ext/hash_map>
@ -45,7 +45,7 @@ using stdext::hash_map;
#elif COMPILER == COMPILER_INTEL #elif COMPILER == COMPILER_INTEL
#define UNORDERED_MAP std::hash_map #define UNORDERED_MAP std::hash_map
using std::hash_map; using std::hash_map;
#elif COMPILER == COMPILER_GNU && __GNUC__ >= 4 #elif COMPILER == COMPILER_GNU && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 3)
#define UNORDERED_MAP std::tr1::unordered_map #define UNORDERED_MAP std::tr1::unordered_map
#elif COMPILER == COMPILER_GNU && __GNUC__ >= 3 #elif COMPILER == COMPILER_GNU && __GNUC__ >= 3
#define UNORDERED_MAP std::__gnu_cxx::hash_map #define UNORDERED_MAP std::__gnu_cxx::hash_map

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "6810" #define REVISION_NR "6811"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__