RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-12 15:51:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix type ambiguity with std::max

Browse Source 
llvm-svn: 286498
This commit is contained in:
Zachary Turner 2016-11-10 20:35:21 +00:00
parent 6d1aa9fbeb
commit 739dd10ba5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Support/raw_ostream.cpp
View File

@ -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.