Merge to upstream r293197.
Bug: http://b/34740564 Test: make checkbuild && ./run_tests.py # Tested aosp_sailfish-eng Change-Id: I33320f72d9170548010c023bd28f03578461b5ff
This commit is contained in:
@@ -50,7 +50,7 @@ template bool __insertion_sort_incomplete<__less<long double>&, long double*>(lo
|
||||
template unsigned __sort5<__less<long double>&, long double*>(long double*, long double*, long double*, long double*, long double*, __less<long double>&);
|
||||
|
||||
#ifndef _LIBCPP_HAS_NO_THREADS
|
||||
static __libcpp_mutex_t __rs_mut = _LIBCPP_MUTEX_INITIALIZER;
|
||||
_LIBCPP_SAFE_STATIC static __libcpp_mutex_t __rs_mut = _LIBCPP_MUTEX_INITIALIZER;
|
||||
#endif
|
||||
unsigned __rs_default::__c_ = 0;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user