Revert "Update aosp/master libcxx rebase to r263688"

The world is burning.

This reverts commit c004fd909c, reversing
changes made to 1418e4163d.
This commit is contained in:
Dan Albert
2016-05-25 22:36:09 -07:00
parent c004fd909c
commit 1d4a1edbc7
1396 changed files with 11495 additions and 38952 deletions

View File

@@ -10,23 +10,11 @@
// <array>
// void swap(array& a);
// namespace std { void swap(array<T, N> &x, array<T, N> &y);
#include <cassert>
#include <array>
#include <cassert>
#include "test_macros.h"
// std::array is explicitly allowed to be initialized with A a = { init-list };.
// Disable the missing braces warning for this reason.
#include "disable_missing_braces_warning.h"
struct NonSwappable {
NonSwappable() {}
private:
NonSwappable(NonSwappable const&);
NonSwappable& operator=(NonSwappable const&);
};
#include "../suppress_array_warnings.h"
int main()
{
@@ -45,22 +33,6 @@ 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;
@@ -70,24 +42,4 @@ 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);
}
{
typedef NonSwappable T;
typedef std::array<T, 0> C0;
C0 l = {};
C0 r = {};
l.swap(r);
#if TEST_STD_VER >= 11
static_assert(noexcept(l.swap(r)), "");
#endif
}
}