Update aosp/master libcxx rebase to r263688

Change-Id: Ic3f4fb33a091ff4b7366ab9e6ca8ee99589c5c9f
This commit is contained in:
Dan Austin
2016-05-25 09:17:06 -07:00
1396 changed files with 38992 additions and 11535 deletions

View File

@@ -18,7 +18,7 @@
#include "__locale"
#include "algorithm"
#include "config_elast.h"
#include "include/config_elast.h"
#include "istream"
#include "limits"
#include "memory"
@@ -155,7 +155,7 @@ ios_base::getloc() const
}
// xalloc
#if __has_feature(cxx_atomic) && !defined(_LIBCPP_HAS_NO_THREADS)
#if defined(_LIBCPP_HAS_C_ATOMIC_IMP) && !defined(_LIBCPP_HAS_NO_THREADS)
atomic<int> ios_base::__xindex_ = ATOMIC_VAR_INIT(0);
#else
int ios_base::__xindex_ = 0;