non-member swap for array was mistakenly taking const ref params. Fixed and added test. Thanks to Ben Craig for the catch

llvm-svn: 262866
This commit is contained in:
Marshall Clow 2016-03-07 21:57:10 +00:00
parent de2d6a3033
commit ee66eb1328
2 changed files with 29 additions and 2 deletions

View File

@ -279,7 +279,7 @@ typename enable_if
__is_swappable<_Tp>::value,
void
>::type
swap(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
swap(array<_Tp, _Size>& __x, array<_Tp, _Size>& __y)
_NOEXCEPT_(__is_nothrow_swappable<_Tp>::value)
{
__x.swap(__y);

View File

@ -10,9 +10,10 @@
// <array>
// void swap(array& a);
// namespace std { void swap(array<T, N> &x, array<T, N> &y);
#include <array>
#include <cassert>
#include <array>
// std::array is explicitly allowed to be initialized with A a = { init-list };.
// Disable the missing braces warning for this reason.
@ -35,6 +36,22 @@ int main()
assert(c2[1] == 2);
assert(c2[2] == 3.5);
}
{
typedef double T;
typedef std::array<T, 3> C;
C c1 = {1, 2, 3.5};
C c2 = {4, 5, 6.5};
std::swap(c1, c2);
assert(c1.size() == 3);
assert(c1[0] == 4);
assert(c1[1] == 5);
assert(c1[2] == 6.5);
assert(c2.size() == 3);
assert(c2[0] == 1);
assert(c2[1] == 2);
assert(c2[2] == 3.5);
}
{
typedef double T;
typedef std::array<T, 0> C;
@ -44,4 +61,14 @@ int main()
assert(c1.size() == 0);
assert(c2.size() == 0);
}
{
typedef double T;
typedef std::array<T, 0> C;
C c1 = {};
C c2 = {};
std::swap(c1, c2);
assert(c1.size() == 0);
assert(c2.size() == 0);
}
}