Revert "Revert "Update aosp/master libcxx rebase to r263688""

This reverts commit 1d4a1edbc7.

Change-Id: I2909937fe582f2c5552bc86e7f4d2d5cff0de0aa
This commit is contained in:
Dan Austin
2016-06-08 22:25:43 +00:00
parent 1d4a1edbc7
commit ee226c05af
1396 changed files with 38992 additions and 11535 deletions

View File

@@ -69,21 +69,12 @@ regex_error::~regex_error() throw() {}
namespace {
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpadded"
#endif
struct collationnames
{
const char* elem_;
char char_;
};
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
const collationnames collatenames[] =
{
{"A", 0x41},
@@ -199,21 +190,12 @@ const collationnames collatenames[] =
{"zero", 0x30}
};
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpadded"
#endif
struct classnames
{
const char* elem_;
regex_traits<char>::char_class_type mask_;
};
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
const classnames ClassNames[] =
{
{"alnum", ctype_base::alnum},