aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-28 15:05:27 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2015-04-28 16:05:27 +0100
commit77e9546989e35ec709459af9ed3f87d38a0b471e (patch)
treef77c250b41704b54e6b5dc8bfe866dfaf01bc318
parent5756d0f9319b7f40051d1d2554243a766589b0bf (diff)
downloadgcc-77e9546989e35ec709459af9ed3f87d38a0b471e.zip
gcc-77e9546989e35ec709459af9ed3f87d38a0b471e.tar.gz
gcc-77e9546989e35ec709459af9ed3f87d38a0b471e.tar.bz2
vector (_Safe_vector::operator=): Add missing returns.
2015-04-28 Stephan Bergmann <sbergman@redhat.com> * include/debug/vector (_Safe_vector::operator=): Add missing returns. From-SVN: r222532
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/include/debug/vector6
2 files changed, 9 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a38b6e3..1b2567d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-28 Stephan Bergmann <sbergman@redhat.com>
+
+ * include/debug/vector (_Safe_vector::operator=): Add missing returns.
+
2015-04-28 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/60333
diff --git a/libstdc++-v3/include/debug/vector b/libstdc++-v3/include/debug/vector
index 40bc613..bf0a88e 100644
--- a/libstdc++-v3/include/debug/vector
+++ b/libstdc++-v3/include/debug/vector
@@ -69,13 +69,17 @@ namespace __gnu_debug
_Safe_vector&
operator=(const _Safe_vector&) noexcept
- { _M_update_guaranteed_capacity(); }
+ {
+ _M_update_guaranteed_capacity();
+ return *this;
+ }
_Safe_vector&
operator=(_Safe_vector&& __x) noexcept
{
_M_update_guaranteed_capacity();
__x._M_guaranteed_capacity = 0;
+ return *this;
}
#endif