projects
/
oota-llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
fe7bb05
)
Explicitly cast std::min's arguments to avoid type mismatches.
author
Dan Gohman
<gohman@apple.com>
Thu, 18 Mar 2010 19:01:12 +0000
(19:01 +0000)
committer
Dan Gohman
<gohman@apple.com>
Thu, 18 Mar 2010 19:01:12 +0000
(19:01 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@98851
91177308
-0d34-0410-b5e6-
96231b3b80d8
include/llvm/Support/Allocator.h
patch
|
blob
|
history
diff --git
a/include/llvm/Support/Allocator.h
b/include/llvm/Support/Allocator.h
index e39c5c121f157c9c841d138da15a7d98adb26d70..cdb0fc85582193f4964d1ff991e5009af7adda79 100644
(file)
--- 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