summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Turner <zturner@google.com>2017-04-21 20:18:43 +0000
committerZachary Turner <zturner@google.com>2017-04-21 20:18:43 +0000
commitf9161bd1d558a8a32ad494b611a9d99ee6aba5c5 (patch)
tree6a812b586b8e127d733431ed02d58c9c48490a3b
parent7beed8544ad52fe55e7abb3b0279a286625f0611 (diff)
downloadbcm5719-llvm-f9161bd1d558a8a32ad494b611a9d99ee6aba5c5.tar.gz
bcm5719-llvm-f9161bd1d558a8a32ad494b611a9d99ee6aba5c5.zip
Fixed a type conversion error in BitVector.
llvm-svn: 301033
-rw-r--r--llvm/include/llvm/ADT/BitVector.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/include/llvm/ADT/BitVector.h b/llvm/include/llvm/ADT/BitVector.h
index 9be7e7f9c4d..5aa101591e6 100644
--- a/llvm/include/llvm/ADT/BitVector.h
+++ b/llvm/include/llvm/ADT/BitVector.h
@@ -755,7 +755,7 @@ private:
}
void grow(unsigned NewSize) {
- unsigned NewCapacity = std::max(NumBitWords(NewSize), Bits.size() * 2);
+ size_t NewCapacity = std::max<size_t>(NumBitWords(NewSize), Bits.size() * 2);
assert(NewCapacity > 0 && "realloc-ing zero space");
BitWord *NewBits =
(BitWord *)std::realloc(Bits.data(), NewCapacity * sizeof(BitWord));
OpenPOWER on IntegriCloud