diff options
| author | David Majnemer <david.majnemer@gmail.com> | 2015-10-15 09:17:15 +0000 |
|---|---|---|
| committer | David Majnemer <david.majnemer@gmail.com> | 2015-10-15 09:17:15 +0000 |
| commit | 6d91aa2bded9260ecf92a1f1f7030849b5fd4363 (patch) | |
| tree | caeadfd69d435475c933a195eb64cd99f6609633 /llvm/tools/llvm-pdbdump | |
| parent | 54b1eb4c734e19a352e2128a9dfea281e9734f58 (diff) | |
| download | bcm5719-llvm-6d91aa2bded9260ecf92a1f1f7030849b5fd4363.tar.gz bcm5719-llvm-6d91aa2bded9260ecf92a1f1f7030849b5fd4363.zip | |
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
Diffstat (limited to 'llvm/tools/llvm-pdbdump')
| -rw-r--r-- | llvm/tools/llvm-pdbdump/llvm-pdbdump.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/tools/llvm-pdbdump/llvm-pdbdump.cpp b/llvm/tools/llvm-pdbdump/llvm-pdbdump.cpp index 5b5cf00956c..7af8c5fe352 100644 --- a/llvm/tools/llvm-pdbdump/llvm-pdbdump.cpp +++ b/llvm/tools/llvm-pdbdump/llvm-pdbdump.cpp @@ -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)) |
