RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-22 04:22:57 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
llvm-svn: 98851
This commit is contained in:
Dan Gohman 2010-03-18 19:01:12 +00:00
parent 82775edea3
commit 2fa523cbd7
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