mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-24 09:29:42 +00:00
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
This commit is contained in:
parent
fe7bb05ad1
commit
aea1b501ce
@ -192,8 +192,8 @@ inline void *operator new(size_t Size, llvm::BumpPtrAllocator &Allocator) {
|
|||||||
} x;
|
} x;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
return Allocator.Allocate(Size, std::min(llvm::NextPowerOf2(Size),
|
return Allocator.Allocate(Size, std::min((size_t)llvm::NextPowerOf2(Size),
|
||||||
offsetof(S, x)));
|
(size_t)offsetof(S, x)));
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // LLVM_SUPPORT_ALLOCATOR_H
|
#endif // LLVM_SUPPORT_ALLOCATOR_H
|
||||||
|
Loading…
Reference in New Issue
Block a user