diff options
| author | Johannes Schickel | 2010-10-15 18:20:21 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-10-15 18:20:21 +0000 |
| commit | 08afc68df0dd237ed27895135af51d66d76ef994 (patch) | |
| tree | 4d2c4b98ee864dd72ecfe131fdadfe0baa6ef595 | |
| parent | 4306a6557769d7d7f42d45b81bd62d4b6a17283c (diff) | |
| download | scummvm-rg350-08afc68df0dd237ed27895135af51d66d76ef994.tar.gz scummvm-rg350-08afc68df0dd237ed27895135af51d66d76ef994.tar.bz2 scummvm-rg350-08afc68df0dd237ed27895135af51d66d76ef994.zip | |
COMMON: Extend workaround in HashMap code for sgi IRIX MIPSpro to also apply for Intel's C++ compiler.
svn-id: r53507
| -rw-r--r-- | common/hashmap.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/common/hashmap.h b/common/hashmap.h index 0d4d7663f3..45192256a9 100644 --- a/common/hashmap.h +++ b/common/hashmap.h @@ -42,7 +42,8 @@ namespace Common { // The sgi IRIX MIPSpro Compiler has difficulties with nested templates. // This and the other __sgi conditionals below work around these problems. -#if defined(__sgi) && !defined(__GNUC__) +// The Intel C++ Compiler suffers from the same problems. +#if (defined(__sgi) && !defined(__GNUC__)) || defined(__INTEL_COMPILER) template<class T> class IteratorImpl; #endif @@ -138,7 +139,7 @@ private: template<class NodeType> class IteratorImpl { friend class HashMap; -#if defined(__sgi) && !defined(__GNUC__) +#if (defined(__sgi) && !defined(__GNUC__)) || defined(__INTEL_COMPILER) template<class T> friend class Common::IteratorImpl; #else template<class T> friend class IteratorImpl; |