mirror of
https://github.com/mangosfour/server.git
synced 2025-12-13 04:37:00 +00:00
[6811] Use unordered_map only from gcc 4.3.x where it became deprecated
This commit is contained in:
parent
928ea2bdcf
commit
61a3159c31
2 changed files with 3 additions and 3 deletions
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
#if COMPILER == COMPILER_INTEL
|
||||
#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>
|
||||
#elif COMPILER == COMPILER_GNU && __GNUC__ >= 3
|
||||
#include <ext/hash_map>
|
||||
|
|
@ -45,7 +45,7 @@ using stdext::hash_map;
|
|||
#elif COMPILER == COMPILER_INTEL
|
||||
#define UNORDERED_MAP 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
|
||||
#elif COMPILER == COMPILER_GNU && __GNUC__ >= 3
|
||||
#define UNORDERED_MAP std::__gnu_cxx::hash_map
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#ifndef __REVISION_NR_H__
|
||||
#define __REVISION_NR_H__
|
||||
#define REVISION_NR "6810"
|
||||
#define REVISION_NR "6811"
|
||||
#endif // __REVISION_NR_H__
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue