6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-11-03 14:08:57 +00:00
Code Issues Projects Releases Wiki Activity

Explicitly cast std::min's arguments to avoid type mismatches.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@98851 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman 2010-03-18 19:01:12 +00:00
parent fe7bb05ad1
commit aea1b501ce
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/Support/Allocator.h
View File

@ -192,8 +192,8 @@ inline void *operator new(size_t Size, llvm::BumpPtrAllocator &Allocator) {
} x;
#endif
};
return Allocator.Allocate(Size, std::min(llvm::NextPowerOf2(Size),
offsetof(S, x)));
return Allocator.Allocate(Size, std::min((size_t)llvm::NextPowerOf2(Size),
(size_t)offsetof(S, x)));
}
#endif // LLVM_SUPPORT_ALLOCATOR_H