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

@@ -41,17 +41,17 @@ bool g1_called = false;
bool g2_called = false;
bool g3_called = false;
void f1(std::ios_base::event, std::ios_base&, int)
void f1(std::ios_base::event ev, std::ios_base& stream, int index)
{
f1_called = true;
}
void f2(std::ios_base::event, std::ios_base&, int)
void f2(std::ios_base::event ev, std::ios_base& stream, int index)
{
f2_called = true;
}
void g1(std::ios_base::event ev, std::ios_base&, int index)
void g1(std::ios_base::event ev, std::ios_base& stream, int index)
{
if (ev == std::ios_base::imbue_event)
{
@@ -60,7 +60,7 @@ void g1(std::ios_base::event ev, std::ios_base&, int index)
}
}
void g2(std::ios_base::event ev, std::ios_base&, int index)
void g2(std::ios_base::event ev, std::ios_base& stream, int index)
{
if (ev == std::ios_base::imbue_event)
{
@@ -69,7 +69,7 @@ void g2(std::ios_base::event ev, std::ios_base&, int index)
}
}
void g3(std::ios_base::event ev, std::ios_base&, int index)
void g3(std::ios_base::event ev, std::ios_base& stream, int index)
{
if (ev == std::ios_base::imbue_event)
{