aboutsummaryrefslogtreecommitdiffstats
path: root/src/experimental/memory_resource.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/experimental/memory_resource.cpp')
-rw-r--r--src/experimental/memory_resource.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/experimental/memory_resource.cpp b/src/experimental/memory_resource.cpp
index 9aa077942b0d..e98726283173 100644
--- a/src/experimental/memory_resource.cpp
+++ b/src/experimental/memory_resource.cpp
@@ -12,7 +12,7 @@
#include "atomic"
#elif !defined(_LIBCPP_HAS_NO_THREADS)
#include "mutex"
-#if defined(__unix__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA)
+#if defined(__unix__) && !defined(__ANDROID__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA)
#pragma comment(lib, "pthread")
#endif
#endif
@@ -116,11 +116,11 @@ __default_memory_resource(bool set = false, memory_resource * new_res = nullptr)
new_res = new_res ? new_res : new_delete_resource();
// TODO: Can a weaker ordering be used?
return _VSTD::atomic_exchange_explicit(
- &__res, new_res, memory_order::memory_order_acq_rel);
+ &__res, new_res, memory_order_acq_rel);
}
else {
return _VSTD::atomic_load_explicit(
- &__res, memory_order::memory_order_acquire);
+ &__res, memory_order_acquire);
}
#elif !defined(_LIBCPP_HAS_NO_THREADS)
_LIBCPP_SAFE_STATIC static memory_resource * res = &res_init.resources.new_delete_res;