Copy the right amount of elements.

llvm-svn: 152254
This commit is contained in:
Benjamin Kramer 2012-03-07 22:48:42 +00:00
parent fba33af11c
commit 22842f89e4
1 changed files with 5 additions and 3 deletions

View File

@ -241,7 +241,8 @@ void SmallPtrSetImpl::swap(SmallPtrSetImpl &RHS) {
// If only RHS is small, copy the small elements into LHS and move the pointer
// from LHS to RHS.
if (!this->isSmall() && RHS.isSmall()) {
std::copy(RHS.SmallArray, RHS.SmallArray+CurArraySize, this->SmallArray);
std::copy(RHS.SmallArray, RHS.SmallArray+RHS.CurArraySize,
this->SmallArray);
std::swap(this->NumElements, RHS.NumElements);
std::swap(this->CurArraySize, RHS.CurArraySize);
RHS.CurArray = this->CurArray;
@ -254,7 +255,8 @@ void SmallPtrSetImpl::swap(SmallPtrSetImpl &RHS) {
// If only LHS is small, copy the small elements into RHS and move the pointer
// from RHS to LHS.
if (this->isSmall() && !RHS.isSmall()) {
std::copy(this->SmallArray, this->SmallArray+CurArraySize, RHS.SmallArray);
std::copy(this->SmallArray, this->SmallArray+this->CurArraySize,
RHS.SmallArray);
std::swap(RHS.NumElements, this->NumElements);
std::swap(RHS.CurArraySize, this->CurArraySize);
this->CurArray = RHS.CurArray;
@ -267,7 +269,7 @@ void SmallPtrSetImpl::swap(SmallPtrSetImpl &RHS) {
// Both a small, just swap the small elements.
assert(this->isSmall() && RHS.isSmall());
assert(this->CurArraySize == RHS.CurArraySize);
std::swap_ranges(this->SmallArray, this->SmallArray+CurArraySize,
std::swap_ranges(this->SmallArray, this->SmallArray+this->CurArraySize,
RHS.SmallArray);
std::swap(this->NumElements, RHS.NumElements);
}