aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorclick <none@none>2010-08-16 13:27:09 +0200
committerclick <none@none>2010-08-16 13:27:09 +0200
commit3569130b277e536e441080ca415c6da71ea00755 (patch)
tree920a50ba68474d16f07579e452ce3628e3ddb1b3 /src
parent0fad74e44a2312e4746587edd78549119021ed28 (diff)
Core: Use std::max instead of just max() in WheatyExceptionreport - fixes MS-platform build-issues
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/server/shared/Debugging/WheatyExceptionReport.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/shared/Debugging/WheatyExceptionReport.cpp b/src/server/shared/Debugging/WheatyExceptionReport.cpp
index 7a3eae0f408..bc21b9e45b6 100644
--- a/src/server/shared/Debugging/WheatyExceptionReport.cpp
+++ b/src/server/shared/Debugging/WheatyExceptionReport.cpp
@@ -594,7 +594,7 @@ PVOID addr, PTSTR szModule, DWORD len, DWORD& section, DWORD_PTR& offset)
{
DWORD_PTR sectionStart = pSection->VirtualAddress;
DWORD_PTR sectionEnd = sectionStart
- + DWORD_PTR(max(pSection->SizeOfRawData, pSection->Misc.VirtualSize));
+ + DWORD_PTR(std::max(pSection->SizeOfRawData, pSection->Misc.VirtualSize));
// Is the address in this section???
if ((rva >= sectionStart) && (rva <= sectionEnd))
@@ -1038,4 +1038,4 @@ int __cdecl WheatyExceptionReport::_tprintf(const TCHAR * format, ...)
return retValue;
}
-#endif // _WIN32 \ No newline at end of file
+#endif // _WIN32