port hashmap changes from scummvm

This commit is contained in:
Joost Peters 2010-05-17 16:51:07 +00:00
parent d4ef9f9497
commit 9b0cbde6c2

View File

@ -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;