diff options
| author | David Carlier <devnexen@gmail.com> | 2018-08-09 18:29:07 +0000 |
|---|---|---|
| committer | David Carlier <devnexen@gmail.com> | 2018-08-09 18:29:07 +0000 |
| commit | 89005c33c3e5fd1877d83477c565278ceac88c4d (patch) | |
| tree | cb9d7765d48457e3e7a0a38a11c5998bbe1bc10c | |
| parent | e69ae76b20f1c417a21524b630aeac34c82fd5fc (diff) | |
| download | bcm5719-llvm-89005c33c3e5fd1877d83477c565278ceac88c4d.tar.gz bcm5719-llvm-89005c33c3e5fd1877d83477c565278ceac88c4d.zip | |
Fix few g++ 8 warning with non obvious copy object operations
Reviewers: dblaikie, dexonsmith
Reviewed By: dblaikie
Differential Revision: https://reviews.llvm.org/D50296
llvm-svn: 339367
| -rw-r--r-- | llvm/include/llvm/ADT/DenseMap.h | 2 | ||||
| -rw-r--r-- | llvm/include/llvm/ADT/SmallVector.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/llvm/include/llvm/ADT/DenseMap.h b/llvm/include/llvm/ADT/DenseMap.h index ba60b7972a8..380f1db0d04 100644 --- a/llvm/include/llvm/ADT/DenseMap.h +++ b/llvm/include/llvm/ADT/DenseMap.h @@ -393,7 +393,7 @@ protected: setNumTombstones(other.getNumTombstones()); if (isPodLike<KeyT>::value && isPodLike<ValueT>::value) - memcpy(getBuckets(), other.getBuckets(), + memcpy(reinterpret_cast<void *>(getBuckets()), other.getBuckets(), getNumBuckets() * sizeof(BucketT)); else for (size_t i = 0; i < getNumBuckets(); ++i) { diff --git a/llvm/include/llvm/ADT/SmallVector.h b/llvm/include/llvm/ADT/SmallVector.h index acb4426b4f4..e4ddd12afdf 100644 --- a/llvm/include/llvm/ADT/SmallVector.h +++ b/llvm/include/llvm/ADT/SmallVector.h @@ -299,7 +299,7 @@ protected: // use memcpy here. Note that I and E are iterators and thus might be // invalid for memcpy if they are equal. if (I != E) - memcpy(Dest, I, (E - I) * sizeof(T)); + memcpy(reinterpret_cast<void *>(Dest), I, (E - I) * sizeof(T)); } /// Double the size of the allocated memory, guaranteeing space for at @@ -310,7 +310,7 @@ public: void push_back(const T &Elt) { if (LLVM_UNLIKELY(this->size() >= this->capacity())) this->grow(); - memcpy(this->end(), &Elt, sizeof(T)); + memcpy(reinterpret_cast<void *>(this->end()), &Elt, sizeof(T)); this->set_size(this->size() + 1); } |

