[Scummvm-cvs-logs] SF.net SVN: scummvm:[49060] scummvm/trunk/common/hashmap.h

[joostp at users.sourceforge.net]

Revision: 49060
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49060&view=rev
Author:   joostp
Date:     2010-05-17 16:50:10 +0000 (Mon, 17 May 2010)

Log Message:
-----------
Restrict MIPSpro workaround to non-gcc compilers -- fixes compilation with gcc on irix.

Modified Paths:
--------------
    scummvm/trunk/common/hashmap.h

Modified: scummvm/trunk/common/hashmap.h
===================================================================
--- scummvm/trunk/common/hashmap.h	2010-05-17 11:02:35 UTC (rev 49059)
+++ scummvm/trunk/common/hashmap.h	2010-05-17 16:50:10 UTC (rev 49060)
@@ -42,7 +42,7 @@
 
 // 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 @@
 	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 @@
 	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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.