re PR c++/16169 (-Weffc++ item 15 improvements)

2004-07-08  Benjamin Kosnik  <bkoz@redhat.com>

	PR c++/16169
	* include/bits/basic_string.h (basic_string::operator=): Revert.

From-SVN: r84296

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8919b564a661e63671bef78487f406249b06ebae..17819c9acc5187fbfce18cf3e167aa5e3d4b9fed 100644 (file)
--- 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 a7290d7e0c66a6ec4b728e8ffa20a1ca0adb3f35..7e6c669bd0bdc53b36c1509bb7477d557e3d572b 100644 (file)
--- 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.