summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2013-06-16 21:56:43 +0000
committerredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2013-06-16 21:56:43 +0000
commit8a46ed36b0449c870d0a938c1010ad610ebcf4f7 (patch)
tree4036ab85667d9becaf5081737f224b64126eb589
parent0b4e9fcd8d8fc5c21875778d79e532bf1dd9d041 (diff)
downloadgcc-8a46ed36b0449c870d0a938c1010ad610ebcf4f7.tar.gz
* include/std/shared_mutex (shared_lock::operator=): Add missing
return statement. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@200141 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/std/shared_mutex5
2 files changed, 9 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7501675df35..332b01b3d94 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
2013-06-16 Jonathan Wakely <jwakely.gcc@gmail.com>
+ * include/std/shared_mutex (shared_lock::operator=): Add missing
+ return statement.
+
+2013-06-16 Jonathan Wakely <jwakely.gcc@gmail.com>
+
PR libstdc++/57263
* include/bits/forward_list.h (_Fwd_list_base): Convert to/from
allocator's pointer type.
diff --git a/libstdc++-v3/include/std/shared_mutex b/libstdc++-v3/include/std/shared_mutex
index f60628278f8..39ab83a2845 100644
--- a/libstdc++-v3/include/std/shared_mutex
+++ b/libstdc++-v3/include/std/shared_mutex
@@ -339,7 +339,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
shared_lock&
operator=(shared_lock&& __sl) noexcept
- { shared_lock(std::move(__sl)).swap(*this); }
+ {
+ shared_lock(std::move(__sl)).swap(*this);
+ return *this;
+ }
void
lock()