From 75f29cdded521da42f6b3a8d790371203d833664 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Thu, 8 Jul 2004 15:56:21 +0000 Subject: [PATCH] re PR c++/16169 (-Weffc++ item 15 improvements) 2004-07-08 Benjamin Kosnik PR c++/16169 * include/bits/basic_string.h (basic_string::operator=): Revert. From-SVN: r84296 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/bits/basic_string.h | 10 ++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8919b564a66..17819c9acc5 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2004-07-08 Benjamin Kosnik + + PR c++/16169 + * include/bits/basic_string.h (basic_string::operator=): Revert. + 2004-07-07 Benjamin Kosnik * configure.ac (libtool_VERSION): To 6:2:0. diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index a7290d7e0c6..7e6c669bd0b 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -419,10 +419,7 @@ namespace std */ basic_string& operator=(const basic_string& __str) - { - this->assign(__str); - return *this; - } + { return this->assign(__str); } /** * @brief Copy contents of @a s into this string. @@ -430,10 +427,7 @@ namespace std */ basic_string& operator=(const _CharT* __s) - { - this->assign(__s); - return *this; - } + { return this->assign(__s); } /** * @brief Set value to string of length 1. -- 2.30.2