blob: a3a9532a12f4286aee9063bd8da46da0711ef785 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
diff --git a/include/__memory/shared_ptr.h b/include/__memory/shared_ptr.h
index d487e4f..146b205 100644
--- a/include/__memory/shared_ptr.h
+++ b/include/__memory/shared_ptr.h
@@ -53,7 +53,7 @@
#include <new>
#include <typeinfo>
#if !defined(_LIBCPP_HAS_NO_ATOMIC_HEADER)
-# include <__atomic/memory_order.h>
+# include <atomic>
#endif
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
@@ -137,7 +137,12 @@ class _LIBCPP_EXPORTED_FROM_ABI __shared_count {
__shared_count& operator=(const __shared_count&);
protected:
- long __shared_owners_;
+#ifdef _LIBCPP_HAS_NO_THREADS
+ typedef long __atomic_count;
+#else
+ typedef atomic<long> __atomic_count;
+#endif
+ __atomic_count __shared_owners_;
virtual ~__shared_count();
private:
@@ -150,20 +155,41 @@ public:
void __add_shared() noexcept;
bool __release_shared() noexcept;
#else
- _LIBCPP_HIDE_FROM_ABI void __add_shared() _NOEXCEPT { __libcpp_atomic_refcount_increment(__shared_owners_); }
+ _LIBCPP_HIDE_FROM_ABI void __add_shared() _NOEXCEPT {
+# ifdef _LIBCPP_HAS_NO_THREADS
+ __libcpp_atomic_refcount_increment(__shared_owners_);
+# else
+ __shared_owners_++;
+# endif
+ }
_LIBCPP_HIDE_FROM_ABI bool __release_shared() _NOEXCEPT {
+# ifdef _LIBCPP_HAS_NO_THREADS
if (__libcpp_atomic_refcount_decrement(__shared_owners_) == -1) {
+# else
+ if (--__shared_owners_ == -1) {
+# endif
__on_zero_shared();
return true;
}
return false;
}
#endif
- _LIBCPP_HIDE_FROM_ABI long use_count() const _NOEXCEPT { return __libcpp_relaxed_load(&__shared_owners_) + 1; }
+ _LIBCPP_HIDE_FROM_ABI long use_count() const _NOEXCEPT {
+#ifdef _LIBCPP_HAS_NO_THREADS
+ return __libcpp_relaxed_load(&__shared_owners_) + 1;
+#else
+ return __shared_owners_.load(memory_order_relaxed) + 1;
+#endif
+ }
};
class _LIBCPP_EXPORTED_FROM_ABI __shared_weak_count : private __shared_count {
- long __shared_weak_owners_;
+#ifdef _LIBCPP_HAS_NO_THREADS
+ typedef long __atomic_count;
+#else
+ typedef atomic<long> __atomic_count;
+#endif
+ __atomic_count __shared_weak_owners_;
public:
_LIBCPP_HIDE_FROM_ABI explicit __shared_weak_count(long __refs = 0) _NOEXCEPT
@@ -180,7 +206,13 @@ public:
void __release_shared() noexcept;
#else
_LIBCPP_HIDE_FROM_ABI void __add_shared() _NOEXCEPT { __shared_count::__add_shared(); }
- _LIBCPP_HIDE_FROM_ABI void __add_weak() _NOEXCEPT { __libcpp_atomic_refcount_increment(__shared_weak_owners_); }
+ _LIBCPP_HIDE_FROM_ABI void __add_weak() _NOEXCEPT {
+# ifdef _LIBCPP_HAS_NO_THREADS
+ __libcpp_atomic_refcount_increment(__shared_weak_owners_);
+# else
+ __shared_weak_owners_++;
+# endif
+ }
_LIBCPP_HIDE_FROM_ABI void __release_shared() _NOEXCEPT {
if (__shared_count::__release_shared())
__release_weak();
|
