LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix memory_resource build for _LIBCPP_HAS_NO_THREADS

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@268850 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2016-05-07 05:37:31 +00:00
parent 1354c943ad
commit ab46ace714
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/experimental/memory_resource.cpp
View File

@@ -11,7 +11,7 @@
#ifndef _LIBCPP_HAS_NO_ATOMIC_HEADER #ifndef _LIBCPP_HAS_NO_ATOMIC_HEADER
#include "atomic" #include "atomic"
#else #elif !defined(_LIBCPP_HAS_NO_THREADS)
#include "mutex" #include "mutex"
#endif #endif
@@ -100,7 +100,7 @@ __default_memory_resource(bool set = false, memory_resource * new_res = nullptr)
return _VSTD::atomic_load_explicit( return _VSTD::atomic_load_explicit(
&__res, memory_order::memory_order_acquire); &__res, memory_order::memory_order_acquire);
} }
#else #elif !defined(_LIBCPP_HAS_NO_THREADS)
static memory_resource * res = &res_init.resources.new_delete_res; static memory_resource * res = &res_init.resources.new_delete_res;
static mutex res_lock; static mutex res_lock;
if (set) { if (set) {
@@ -113,6 +113,16 @@ __default_memory_resource(bool set = false, memory_resource * new_res = nullptr)
lock_guard<mutex> guard(res_lock); lock_guard<mutex> guard(res_lock);
return res; return res;
} }
#else
static memory_resource* res = &res_init.resources.new_delete_res;
if (set) {
new_res = new_res ? new_res : new_delete_resource();
memory_resource * old_res = res;
res = new_res;
return old_res;
} else {
return res;
}
#endif #endif
} }