diff options
| author | Joost Peters | 2010-05-17 16:50:10 +0000 |
|---|---|---|
| committer | Joost Peters | 2010-05-17 16:50:10 +0000 |
| commit | dd0c1fd6f0b0cca6fba9c189b69debe28fe8a078 (patch) | |
| tree | 8083d0fd54db21a04ec7c17c43f5e50840b41a13 /common/hashmap.h | |
| parent | 946fe2905ec9fed65d504381e616eb9dfd91507a (diff) | |
| download | scummvm-rg350-dd0c1fd6f0b0cca6fba9c189b69debe28fe8a078.tar.gz scummvm-rg350-dd0c1fd6f0b0cca6fba9c189b69debe28fe8a078.tar.bz2 scummvm-rg350-dd0c1fd6f0b0cca6fba9c189b69debe28fe8a078.zip | |
Restrict MIPSpro workaround to non-gcc compilers -- fixes compilation with gcc on irix.
svn-id: r49060
Diffstat (limited to 'common/hashmap.h')
| -rw-r--r-- | common/hashmap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/hashmap.h b/common/hashmap.h index c32d275a7c..db80f632ed 100644 --- a/common/hashmap.h +++ b/common/hashmap.h @@ -42,7 +42,7 @@ namespace Common { // The sgi IRIX MIPSpro Compiler has difficulties with nested templates. // This and the other __sgi conditionals below work around these problems. -#ifdef __sgi +#if defined(__sgi) && !defined(__GNUC__) template<class T> class IteratorImpl; #endif @@ -131,7 +131,7 @@ public: int lookupAndCreateIfMissing(const Key &key); void expandStorage(uint newCapacity); -#ifndef __sgi +#if !defined(__sgi) || defined(__GNUC__) template<class T> friend class IteratorImpl; #endif @@ -141,7 +141,7 @@ public: template<class NodeType> class IteratorImpl { friend class HashMap; -#ifdef __sgi +#if defined(__sgi) && !defined(__GNUC__) template<class T> friend class Common::IteratorImpl; #else template<class T> friend class IteratorImpl; |