[thread.lock] - C++23 → Trunk

Files changed (1) hide show

tmp/tmpo12g25qk/{from.md → to.md} +6 -16

tmp/tmpo12g25qk/{from.md → to.md} RENAMED Viewed

@@ -172,11 +172,11 @@ namespace std {
     unique_lock(const unique_lock&) = delete;
     unique_lock& operator=(const unique_lock&) = delete;
     unique_lock(unique_lock&& u) noexcept;
-    unique_lock& operator=(unique_lock&& u);
     // [thread.lock.unique.locking], locking
     void lock();
     bool try_lock();
@@ -298,24 +298,16 @@ unique_lock(unique_lock&& u) noexcept;
 *Ensures:* `pm == u_p.pm` and `owns == u_p.owns` (where `u_p` is the
 state of `u` just prior to this construction), `u.pm == 0` and
 `u.owns == false`.
 ``` cpp
-unique_lock& operator=(unique_lock&& u);
 ```
-*Effects:* If `owns` calls `pm->unlock()`.
-*Ensures:* `pm == u_p.pm` and `owns == u_p.owns` (where `u_p` is the
-state of `u` just prior to this construction), `u.pm == 0` and
-`u.owns == false`.
-[*Note 1*: With a recursive mutex it is possible for both `*this` and
-`u` to own the same mutex before the assignment. In this case, `*this`
-will own the mutex after the assignment and `u` will not. — *end note*]
-*Throws:* Nothing.
 ``` cpp
 ~unique_lock();
 ```
@@ -620,15 +612,13 @@ state of `sl` just prior to this construction), `sl.pm == nullptr` and
 ``` cpp
 shared_lock& operator=(shared_lock&& sl) noexcept;
 ```
-*Effects:* If `owns` calls `pm->unlock_shared()`.
-*Ensures:* `pm == sl_p.pm` and `owns == sl_p.owns` (where `sl_p` is the
-state of `sl` just prior to this assignment), `sl.pm == nullptr` and
-`sl.owns == false`.
 ##### Locking <a id="thread.lock.shared.locking">[[thread.lock.shared.locking]]</a>
 ``` cpp
 void lock();

     unique_lock(const unique_lock&) = delete;
     unique_lock& operator=(const unique_lock&) = delete;
     unique_lock(unique_lock&& u) noexcept;
+    unique_lock& operator=(unique_lock&& u) noexcept;
     // [thread.lock.unique.locking], locking
     void lock();
     bool try_lock();
 *Ensures:* `pm == u_p.pm` and `owns == u_p.owns` (where `u_p` is the
 state of `u` just prior to this construction), `u.pm == 0` and
 `u.owns == false`.
 ``` cpp
+unique_lock& operator=(unique_lock&& u) noexcept;
 ```
+*Effects:* Equivalent to: `unique_lock(std::move(u)).swap(*this)`
+*Returns:* `*this`.
 ``` cpp
 ~unique_lock();
 ```
 ``` cpp
 shared_lock& operator=(shared_lock&& sl) noexcept;
 ```
+*Effects:* Equivalent to: `shared_lock(std::move(sl)).swap(*this)`
+*Returns:* `*this`.
 ##### Locking <a id="thread.lock.shared.locking">[[thread.lock.shared.locking]]</a>
 ``` cpp
 void lock();

Diff to HTML by rtfpessoa