aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely.gcc@gmail.com>2013-06-16 21:56:43 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2013-06-16 22:56:43 +0100
commit2081281b1047bd7e047098f81bd03be539081aee (patch)
tree4036ab85667d9becaf5081737f224b64126eb589
parent0de86a92286fb5a6ddbe867e0f88b707e6e5ab29 (diff)
downloadgcc-2081281b1047bd7e047098f81bd03be539081aee.zip
gcc-2081281b1047bd7e047098f81bd03be539081aee.tar.gz
gcc-2081281b1047bd7e047098f81bd03be539081aee.tar.bz2
shared_mutex (shared_lock::operator=): Add missing return statement.
* include/std/shared_mutex (shared_lock::operator=): Add missing return statement. From-SVN: r200141
-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 7501675..332b01b 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 f606282..39ab83a 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()