maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Speculatively unbreak Windows build 

<windows.h> defines macros named min and max in conflict with
<algorithm>.  Prevent macro expansion by wrapping std::min in
parenthesis.

llvm-svn: 250383
This commit is contained in:
David Majnemer 2015-10-15 09:17:15 +00:00
parent 54b1eb4c73
commit 6d91aa2bde
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/tools/llvm-pdbdump/llvm-pdbdump.cpp
View File

@ -361,8 +361,8 @@ static void dumpStructure(MemoryBufferRef M) {
if (BytesLeftToReadInStream == 0)
break;
uint32_t BytesToReadInBlock =
std::min(BytesLeftToReadInStream, static_cast<uint32_t>(SB->BlockSize));
uint32_t BytesToReadInBlock = (std::min)(
BytesLeftToReadInStream, static_cast<uint32_t>(SB->BlockSize));
auto StreamBlockData =
StringRef(M.getBufferStart() + StreamBlockOffset, BytesToReadInBlock);
if (auto EC = checkOffset(M, StreamBlockData))