diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-07-08 15:56:21 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-07-08 15:56:21 +0000 |
| commit | 2cb8dec3ceb8515297b3922dae59ffe5c53ce29d (patch) | |
| tree | 740ac0cf713d86bccbe7691a6b07c4d02363ee94 | |
| parent | 3b05d3a05135bc87955546829484752fcc962ff6 (diff) | |
| download | gcc-2cb8dec3ceb8515297b3922dae59ffe5c53ce29d.tar.gz | |
2004-07-08 Benjamin Kosnik <bkoz@redhat.com>
PR c++/16169
* include/bits/basic_string.h (basic_string::operator=): Revert.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@84296 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 <bkoz@redhat.com> + + PR c++/16169 + * include/bits/basic_string.h (basic_string::operator=): Revert. + 2004-07-07 Benjamin Kosnik <bkoz@redhat.com> * 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. |