Fixed conflict between min/max macros and std::min/max when using GCC >= 4.2.

This commit is contained in:
Scott Ehlert committed 2011-04-28 01:30:37 -05:00
1 parent 6c38e2e589
commit 4caefcbcba
300 files changed
+1041 -1084

No files matched your search

+1 -1
View File
@@ -58,7 +58,7 @@ public:
m_errorStack[m_errorIndex] = symName;
}
m_errorIndex++;
m_maxErrorIndex = max( m_maxErrorIndex, (m_errorIndex-1) );
m_maxErrorIndex = MAX( m_maxErrorIndex, (m_errorIndex-1) );
return m_errorIndex-1;
}