From 9553677530a3cec8df27500c8e4381b286e4fec2 Mon Sep 17 00:00:00 2001 From: paolo Date: Sat, 21 Aug 2004 08:54:07 +0000 Subject: [PATCH] 2004-08-21 Paolo Carlini * include/bits/basic_ios.tcc (basic_ios<>::copyfmt): Don't deal with _M_word != _M_local_word two times, redundantly. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@86359 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 5 +++++ 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 + + * 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 * 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; -- 2.7.4