diff options
| author | click <none@none> | 2010-10-21 22:00:12 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-10-21 22:00:12 +0200 |
| commit | ea847598d0514cf6107583da983fb3c273703902 (patch) | |
| tree | 61b0a6e04fd894a66bdcb10c9365ec212d8799b0 /src | |
| parent | 03c6c34a4b0899a01deb4cfc4654bd652b322d13 (diff) | |
Buildsystem: Add initial support for Intel C++ Compiler (patch by Leak)
Note: Intel C++ Compiler for Windows is not supported in this change
Closes issue 4361
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/shared/Dynamic/UnorderedMap.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/server/shared/Dynamic/UnorderedMap.h b/src/server/shared/Dynamic/UnorderedMap.h index 6cf228d22df..80a23c4c290 100755 --- a/src/server/shared/Dynamic/UnorderedMap.h +++ b/src/server/shared/Dynamic/UnorderedMap.h @@ -42,12 +42,9 @@ using std::hash_map; #elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1300 #define UNORDERED_MAP stdext::hash_map using stdext::hash_map; -#elif COMPILER == COMPILER_INTEL -#define UNORDERED_MAP std::hash_map -using std::hash_map; #elif COMPILER == COMPILER_GNU && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 3) #define UNORDERED_MAP std::tr1::unordered_map -#elif COMPILER == COMPILER_GNU && __GNUC__ >= 3 +#elif (COMPILER == COMPILER_GNU && __GNUC__ >= 3) || COMPILER == COMPILER_INTEL #define UNORDERED_MAP __gnu_cxx::hash_map namespace __gnu_cxx |