diff options
| author | Yotam Barnoy | 2010-10-31 11:08:43 +0000 |
|---|---|---|
| committer | Yotam Barnoy | 2010-10-31 11:08:43 +0000 |
| commit | 94c8d0a14df429a1b25bd9f5c5d75497fd0ddbd1 (patch) | |
| tree | 3df2a4ae7967c56d464729669fc06ce4e93dff36 /common/hashmap.h | |
| parent | 8df4278ba8cfbf71228e1927f9db635a9a30a57f (diff) | |
| parent | dca3c8d8bfc6c4db38cf8e8291818dd472041d4e (diff) | |
| download | scummvm-rg350-94c8d0a14df429a1b25bd9f5c5d75497fd0ddbd1.tar.gz scummvm-rg350-94c8d0a14df429a1b25bd9f5c5d75497fd0ddbd1.tar.bz2 scummvm-rg350-94c8d0a14df429a1b25bd9f5c5d75497fd0ddbd1.zip | |
Updated with latest from trunk
svn-id: r53976
Diffstat (limited to 'common/hashmap.h')
| -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; |