From d87bdb13309e3f691fe0570c16cdcbdb6991d55b Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 25 Oct 2004 10:43:59 +0000 Subject: [PATCH] basic_string.tcc (assign(const _CharT*, size_type)): Adjust bit missing from the previous commit. 2004-10-25 Paolo Carlini * include/bits/basic_string.tcc (assign(const _CharT*, size_type)): Adjust bit missing from the previous commit. From-SVN: r89532 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/bits/basic_string.tcc | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 46311ca507d..51f39320ebd 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2004-10-25 Paolo Carlini + + * include/bits/basic_string.tcc (assign(const _CharT*, size_type)): + Adjust bit missing from the previous commit. + 2004-10-25 Eric Botcazou PR other/18138 diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc index 40634978712..51fe9f55472 100644 --- 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) - traits_type::copy(_M_data(), __s, __n); + _M_copy(_M_data(), __s, __n); 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; }