diff options
Diffstat (limited to 'common')
| -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; |