Skip to content

Commit 1c73a12

Browse files
committed
LWG feedback
1 parent 7045ef3 commit 1c73a12

File tree

4 files changed

+173
-174
lines changed

4 files changed

+173
-174
lines changed

atomic_smart_ptr.html

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ <h1>General</h1>
77

88
This section provides alternatives to raw pointers for thread-safe atomic
99
pointer operations, and defines the <code>atomic_shared_ptr</code> and
10-
<code>atomic_weak_ptr</code> classes.
10+
<code>atomic_weak_ptr</code> class<del>es</del><ins> templates</ins>.
1111

1212
</p>
1313
<p>
@@ -33,10 +33,21 @@ <h1>General</h1>
3333
<h1>Header &lt;experimental/atomic> synopsis</h1>
3434

3535
<pre><code>
36-
#include &lt;memory&gt;
36+
#include &lt;<del>memory</del><ins>atomic</ins>&gt;
37+
38+
<ins>
39+
namespace std {
40+
namespace experimental {
41+
inline namespace concurrency_v1 {
42+
</ins>
43+
template &lt;class T> struct atomic_shared_ptr;
44+
template &lt;class T> struct atomic_weak_ptr;
45+
<ins>
46+
} // namespace concurrency_v1
47+
} // namespace experimental
48+
} // namespace st
49+
</ins>
3750

38-
template &lt;class T> struct atomic_shared_ptr;
39-
template &lt;class T> struct atomic_weak_ptr;
4051
</code></pre>
4152

4253
</cxx-section>
@@ -77,7 +88,7 @@ <h1>Class template <code>atomic_shared_ptr</code></h1>
7788
memory_order = memory_order_seq_cst) noexcept;
7889

7990
atomic_shared_ptr() noexcept = default;
80-
constexpr atomic_shared_ptr(shared_ptr&lt;T&gt;) noexcept;
91+
<del>constexpr </del>atomic_shared_ptr(shared_ptr&lt;T&gt;) noexcept;
8192
atomic_shared_ptr(const atomic_shared_ptr&) = delete;
8293
atomic_shared_ptr& operator=(const atomic_shared_ptr&) = delete;
8394
atomic_shared_ptr& operator=(shared_ptr&lt;T&gt;) noexcept;
@@ -87,7 +98,7 @@ <h1>Class template <code>atomic_shared_ptr</code></h1>
8798
} // namespace std</code></pre>
8899
<br>
89100
<cxx-function>
90-
<cxx-signature>atomic_shared_ptr::atomic_shared_ptr() noexcept = default;</cxx-signature>
101+
<cxx-signature><del>atomic_shared_ptr::</del>atomic_shared_ptr() noexcept = default;</cxx-signature>
91102
<cxx-effects>Initializes the atomic object to an empty value.</cxx-effects>
92103
</cxx-function>
93104

@@ -103,11 +114,12 @@ <h1>Class template <code>atomic_weak_ptr</code></h1>
103114

104115
template &lt;class T&gt; struct atomic_weak_ptr {
105116
bool is_lock_free() const noexcept;
106-
107117
void store(weak_ptr&lt;T&gt;, memory_order = memory_order_seq_cst) noexcept;
108118
weak_ptr&lt;T&gt; load(memory_order = memory_order_seq_cst) const noexcept;
109-
operator weak_ptr&lt;T&gt;() const noexcept;
110-
weak_ptr&lt;T&gt; exchange(weak_ptr&lt;T&gt;, memory_order = memory_order_seq_cst) noexcept;
119+
operator weak_ptr&lt;T&gt;() const noexcept;
120+
121+
weak_ptr&lt;T&gt; exchange(weak_ptr&lt;T&gt;,
122+
memory_order = memory_order_seq_cst) noexcept;
111123

112124
bool compare_exchange_weak(weak_ptr&lt;T&gt;&, const weak_ptr&lt;T&gt;&,
113125
memory_order, memory_order) noexcept;
@@ -128,7 +140,7 @@ <h1>Class template <code>atomic_weak_ptr</code></h1>
128140
memory_order = memory_order_seq_cst) noexcept;
129141

130142
atomic_weak_ptr() noexcept = default;
131-
constexpr atomic_weak_ptr(weak_ptr&lt;T&gt;) noexcept;
143+
<del>constexpr </del>atomic_weak_ptr(weak_ptr&lt;T&gt;) noexcept;
132144
atomic_weak_ptr(const atomic_weak_ptr&) = delete;
133145
atomic_weak_ptr& operator=(const atomic_weak_ptr&) = delete;
134146
atomic_weak_ptr& operator=(weak_ptr&lt;T&gt;) noexcept;
@@ -139,7 +151,7 @@ <h1>Class template <code>atomic_weak_ptr</code></h1>
139151
</code></pre>
140152
<br>
141153
<cxx-function>
142-
<cxx-signature>atomic_weak_ptr::atomic_weak_ptr() noexcept = default;</cxx-signature>
154+
<cxx-signature><del>atomic_weak_ptr::</del>atomic_weak_ptr() noexcept = default;</cxx-signature>
143155
<cxx-effects>Initializes the atomic object to an empty value.</cxx-effects>
144156
</cxx-function>
145157
<p>

0 commit comments

Comments
 (0)