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

[lordhoto at users.sourceforge.net]

Revision: 53507
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53507&view=rev
Author:   lordhoto
Date:     2010-10-15 18:20:21 +0000 (Fri, 15 Oct 2010)

Log Message:
-----------
COMMON: Extend workaround in HashMap code for sgi IRIX MIPSpro to also apply for Intel's C++ compiler.

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

Modified: scummvm/trunk/common/hashmap.h
===================================================================
--- scummvm/trunk/common/hashmap.h	2010-10-15 18:20:01 UTC (rev 53506)
+++ scummvm/trunk/common/hashmap.h	2010-10-15 18:20:21 UTC (rev 53507)
@@ -42,7 +42,8 @@
 
 // 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 @@
 	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;


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