diff options
-rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/basic_string.h | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3788084..00bb749 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2005-05-25 Paolo Carlini <pcarlini@suse.de> + * include/bits/basic_string.h (_Rep::_M_set_length_and_sharable): + Use, consistently, traits_type::assign. + +2005-05-25 Paolo Carlini <pcarlini@suse.de> + * config/cpu/alpha/atomicity.h: Use the builtins for atomic memory operations. * config/cpu/powerpc/atomicity.h: Likewise. diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 35dd364..001a68f 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -198,7 +198,8 @@ namespace std { this->_M_set_sharable(); // One reference. this->_M_length = __n; - this->_M_refdata()[__n] = _S_terminal; // grrr. (per 21.3.4) + traits_type::assign(this->_M_refdata()[__n], _S_terminal); + // grrr. (per 21.3.4) // You cannot leave those LWG people alone for a second. } |