From af4beb4b957395c1eddac112cf14fa4e53d6c414 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Wed, 22 Jul 2009 12:19:58 +0000 Subject: valarray (valarray<>::operator=(const valarray<>&), [...]): Implement resolution of DR 630, [Ready] in Frankfurt. 2009-07-22 Paolo Carlini * include/std/valarray (valarray<>::operator=(const valarray<>&), valarray<>::operator=(initializer_list<>)): Implement resolution of DR 630, [Ready] in Frankfurt. * testsuite/26_numerics/valarray/dr630-1.cc: New. * testsuite/26_numerics/valarray/dr630-2.cc: Likewise. * doc/xml/manual/intro.xml: Add an entry for DR 630. From-SVN: r149929 --- libstdc++-v3/include/std/valarray | 41 +++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) (limited to 'libstdc++-v3/include/std/valarray') diff --git a/libstdc++-v3/include/std/valarray b/libstdc++-v3/include/std/valarray index 79d3a16..fa92751 100644 --- a/libstdc++-v3/include/std/valarray +++ b/libstdc++-v3/include/std/valarray @@ -1,7 +1,7 @@ // The template and inlines for the -*- C++ -*- valarray class. // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2009 +// 2006, 2007, 2008, 2009 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -647,7 +647,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) template inline valarray<_Tp>::valarray(initializer_list<_Tp> __l) - : _M_size(__l.size()), _M_data(__valarray_get_storage<_Tp>(__l.size())) + : _M_size(__l.size()), _M_data(__valarray_get_storage<_Tp>(__l.size())) { std::__valarray_copy_construct (__l.begin(), __l.end(), _M_data); } #endif @@ -669,8 +669,22 @@ _GLIBCXX_BEGIN_NAMESPACE(std) inline valarray<_Tp>& valarray<_Tp>::operator=(const valarray<_Tp>& __v) { - _GLIBCXX_DEBUG_ASSERT(_M_size == __v._M_size); - std::__valarray_copy(__v._M_data, _M_size, _M_data); + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 630. arrays of valarray. + if (_M_size == __v._M_size) + std::__valarray_copy(__v._M_data, _M_size, _M_data); + else + { + if (_M_data) + { + std::__valarray_destroy_elements(_M_data, _M_data + _M_size); + std::__valarray_release_memory(_M_data); + } + _M_size = __v._M_size; + _M_data = __valarray_get_storage<_Tp>(_M_size); + std::__valarray_copy_construct(__v._M_data, __v._M_data + _M_size, + _M_data); + } return *this; } @@ -679,8 +693,23 @@ _GLIBCXX_BEGIN_NAMESPACE(std) inline valarray<_Tp>& valarray<_Tp>::operator=(initializer_list<_Tp> __l) { - _GLIBCXX_DEBUG_ASSERT(_M_size == __l.size()); - std::__valarray_copy(__l.begin(), __l.size(), _M_data); + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 630. arrays of valarray. + if (_M_size == __l.size()) + std::__valarray_copy(__l.begin(), __l.size(), _M_data); + else + { + if (_M_data) + { + std::__valarray_destroy_elements(_M_data, _M_data + _M_size); + std::__valarray_release_memory(_M_data); + } + _M_size = __l.size(); + _M_data = __valarray_get_storage<_Tp>(_M_size); + std::__valarray_copy_construct(__l.begin(), __l.begin() + _M_size, + _M_data); + } + return *this; } #endif -- cgit v1.1