2004-10-25 Paolo Carlini <pcarlini@suse.de>

	* include/bits/basic_string.tcc (assign(const _CharT*, size_type)):
	Adjust bit missing from the previous commit.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89532 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 46311ca..51f3932 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-25  Paolo Carlini  <pcarlini@suse.de>
+
+       * include/bits/basic_string.tcc (assign(const _CharT*, size_type)):
+       Adjust bit missing from the previous commit.
+

 2004-10-25  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
        PR other/18138
 2004-10-25  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
        PR other/18138

diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc
index 4063497..51fe9f5 100644 (file)
--- a/libstdc++-v3/include/bits/basic_string.tcc
+++ b/libstdc++-v3/include/bits/basic_string.tcc
@@ -253,9 +253,9 @@ namespace std
          // Work in-place.
          const size_type __pos = __s - _M_data();
          if (__pos >= __n)
          // Work in-place.
          const size_type __pos = __s - _M_data();
          if (__pos >= __n)

-           traits_type::copy(_M_data(), __s, __n);
+           _M_copy(_M_data(), __s, __n);

          else if (__pos)
          else if (__pos)

-           traits_type::move(_M_data(), __s, __n);
+           _M_move(_M_data(), __s, __n);

          _M_rep()->_M_set_length_and_sharable(__n);
          return *this;
        }
          _M_rep()->_M_set_length_and_sharable(__n);
          return *this;
        }