non-member swap for array was mistakenly taking const ref params. Fixed and added test. Thanks to Ben Craig for the catch
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@262866 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -279,7 +279,7 @@ typename enable_if
|
|||||||
__is_swappable<_Tp>::value,
|
__is_swappable<_Tp>::value,
|
||||||
void
|
void
|
||||||
>::type
|
>::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)
|
_NOEXCEPT_(__is_nothrow_swappable<_Tp>::value)
|
||||||
{
|
{
|
||||||
__x.swap(__y);
|
__x.swap(__y);
|
||||||
|
|||||||
@@ -10,9 +10,10 @@
|
|||||||
// <array>
|
// <array>
|
||||||
|
|
||||||
// void swap(array& a);
|
// void swap(array& a);
|
||||||
|
// namespace std { void swap(array<T, N> &x, array<T, N> &y);
|
||||||
|
|
||||||
#include <array>
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
#include <array>
|
||||||
|
|
||||||
// std::array is explicitly allowed to be initialized with A a = { init-list };.
|
// std::array is explicitly allowed to be initialized with A a = { init-list };.
|
||||||
// Disable the missing braces warning for this reason.
|
// Disable the missing braces warning for this reason.
|
||||||
@@ -35,6 +36,22 @@ int main()
|
|||||||
assert(c2[1] == 2);
|
assert(c2[1] == 2);
|
||||||
assert(c2[2] == 3.5);
|
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 double T;
|
||||||
typedef std::array<T, 0> C;
|
typedef std::array<T, 0> C;
|
||||||
@@ -44,4 +61,14 @@ int main()
|
|||||||
assert(c1.size() == 0);
|
assert(c1.size() == 0);
|
||||||
assert(c2.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);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user