Fix type ambiguity with std::max

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

diff --git a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp
index 9acc0d8e46d5ac2c6847878f736cf938ee117750..218d4986fff9652dc78a7b2b814c45cca7ada810 100644 (file)
--- a/lib/Support/raw_ostream.cpp
+++ b/lib/Support/raw_ostream.cpp
@@ -370,7 +370,7 @@ raw_ostream &raw_ostream::operator<<(const FormattedBytes &FB) {
     unsigned Power = 0;
     if (MaxOffset > 0)
       Power = llvm::Log2_64_Ceil(MaxOffset);
-    OffsetWidth = std::max(4ULL, llvm::alignTo(Power, 4) / 4);
+    OffsetWidth = std::max<uint64_t>(4, llvm::alignTo(Power, 4) / 4);
   }
 
   // The width of a block of data including all spaces for group separators.