From a6269f03267b856eaa5538bec3cdf8ed0776f5d9 Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Thu, 10 Nov 2016 20:35:21 +0000 Subject: [PATCH] Fix type ambiguity with std::max git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@286498 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Support/raw_ostream.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp index 9acc0d8e46d..218d4986fff 100644 --- 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(4, llvm::alignTo(Power, 4) / 4); } // The width of a block of data including all spaces for group separators. -- 2.40.0