From aea1b501ceff5a10e9def91febcc80926196391d Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Thu, 18 Mar 2010 19:01:12 +0000 Subject: [PATCH] Explicitly cast std::min's arguments to avoid type mismatches. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@98851 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/Allocator.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/llvm/Support/Allocator.h b/include/llvm/Support/Allocator.h index e39c5c121f1..cdb0fc85582 100644 --- a/include/llvm/Support/Allocator.h +++ b/include/llvm/Support/Allocator.h @@ -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 -- 2.34.1