diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2004-08-21 08:54:07 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2004-08-21 08:54:07 +0000 |
| commit | 87c6c816a6ff6f6465bd9984093dd794a207c69a (patch) | |
| tree | e332adef4d15377c3ff12f5fe907423aaf80a856 /libstdc++-v3 | |
| parent | 35da8b560f63db6aff3c37ce9633b26c0db6ca27 (diff) | |
| download | gcc-87c6c816a6ff6f6465bd9984093dd794a207c69a.zip gcc-87c6c816a6ff6f6465bd9984093dd794a207c69a.tar.gz gcc-87c6c816a6ff6f6465bd9984093dd794a207c69a.tar.bz2 | |
basic_ios.tcc (basic_ios<>::copyfmt): Don't deal with _M_word != _M_local_word two times, redundantly.
2004-08-21 Paolo Carlini <pcarlini@suse.de>
* include/bits/basic_ios.tcc (basic_ios<>::copyfmt): Don't deal
with _M_word != _M_local_word two times, redundantly.
From-SVN: r86359
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/basic_ios.tcc | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6d7bba1..44f5ccb 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2004-08-21 Paolo Carlini <pcarlini@suse.de> + + * include/bits/basic_ios.tcc (basic_ios<>::copyfmt): Don't deal + with _M_word != _M_local_word two times, redundantly. + 2004-08-20 Jason Merrill <jason@redhat.com> * include/Makefile.am (${host_builddir}/gthr.h): Don't add diff --git a/libstdc++-v3/include/bits/basic_ios.tcc b/libstdc++-v3/include/bits/basic_ios.tcc index fcb4b02..d6b465f 100644 --- a/libstdc++-v3/include/bits/basic_ios.tcc +++ b/libstdc++-v3/include/bits/basic_ios.tcc @@ -1,6 +1,6 @@ // basic_ios member functions -*- C++ -*- -// Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc. +// Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -87,11 +87,6 @@ namespace std _M_callbacks = __cb; for (int __i = 0; __i < __rhs._M_word_size; ++__i) __words[__i] = __rhs._M_word[__i]; - if (_M_word != _M_local_word) - { - delete [] _M_word; - _M_word = 0; - } _M_word = __words; _M_word_size = __rhs._M_word_size; |