From: David Majnemer <david.majnemer@gmail.com>
Date: Thu, 15 Oct 2015 09:17:15 +0000 (+0000)
Subject: Speculatively unbreak Windows build
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a1079b7d51ebd2bdce335f22387db85eacbdab4e;p=oota-llvm.git

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.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@250383 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/tools/llvm-pdbdump/llvm-pdbdump.cpp b/tools/llvm-pdbdump/llvm-pdbdump.cpp
index 5b5cf00956c..7af8c5fe352 100644
--- a/tools/llvm-pdbdump/llvm-pdbdump.cpp
+++ b/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))