procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libstdc++/57666 (valarray<T>::operator= in c++11 mode does not adapt to size)

Browse source 
2013-06-21  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/57666
	* include/std/valarray (valarray<>::operator=(const _Expr<>&)):
	Implement correctly C++11 26.6.2.3/1.
	* testsuite/26_numerics/valarray/dr630-3.C: New.

From-SVN: r200305
This commit is contained in:
Paolo Carlini 2013-06-21 14:23:15 +00:00 • committed by Paolo Carlini
parent 927f908bf8
commit b0ad3635b6
3 changed files with 59 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,10 @@
2013-06-21 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/57666
* include/std/valarray (valarray<>::operator=(const _Expr<>&)):
Implement correctly C++11 26.6.2.3/1.
* testsuite/26_numerics/valarray/dr630-3.C: New.
2013-06-18 Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/57641

17
libstdc++-v3/include/std/valarray
View file

@ -819,8 +819,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
inline valarray<_Tp>&
valarray<_Tp>::operator=(const _Expr<_Dom, _Tp>& __e)
{
_GLIBCXX_DEBUG_ASSERT(_M_size == __e.size());
std::__valarray_copy(__e, _M_size, _Array<_Tp>(_M_data));
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 630. arrays of valarray.
if (_M_size == __e.size())
std::__valarray_copy(__e, _M_size, _Array<_Tp>(_M_data));
else
{
if (_M_data)
{
std::__valarray_destroy_elements(_M_data, _M_data + _M_size);
std::__valarray_release_memory(_M_data);
}
_M_size = __e.size();
_M_data = __valarray_get_storage<_Tp>(_M_size);
std::__valarray_copy_construct(__e, _M_size, _Array<_Tp>(_M_data));
}
return *this;
}

37
libstdc++-v3/testsuite/26_numerics/valarray/dr630-3.C Normal file
View file

@ -0,0 +1,37 @@
// Copyright (C) 2013 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
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
#include <valarray>
#include <testsuite_hooks.h>
// libstdc++/57666
void test01()
{
bool test __attribute__((unused)) = true;
std::valarray<int> a(3), b(3), d1, d2;
d1 = a;
VERIFY( d1.size() == 3 );
d2 = a + b;
VERIFY( d2.size() == 3 );
}
int main()
{
test01();
return 0;
}