re PR libstdc++/40691 (bug in logical not operator for valarray used with slice)

PR libstdc++/40691
	* include/bits/valarray_after.h (_Expr::operator!): Fix return type.
	* testsuite/26_numerics/valarray/40691.cc: New test.

From-SVN: r149695
This commit is contained in:
Janis Johnson 2009-07-15 21:07:07 +00:00 committed by Janis Johnson
parent 1dc02deefe
commit 0f15cc4a26
3 changed files with 46 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2009-07-15 Janis Johnson <janis187@us.ibm.com>
PR libstdc++/40691
* include/bits/valarray_after.h (_Expr::operator!): Fix return type.
* testsuite/26_numerics/valarray/40691.cc: New test.
2009-07-13 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/29_atomics/atomic_address/cons/aggregate.cc: Remove xfail.

View File

@ -315,7 +315,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
_Expr<_Dom, _Tp>::operator!() const
{
typedef _UnClos<__logical_not, std::_Expr, _Dom> _Closure;
return _Expr<_Closure, _Tp>(_Closure(this->_M_closure));
return _Expr<_Closure, bool>(_Closure(this->_M_closure));
}
#define _DEFINE_EXPR_UNARY_OPERATOR(_Op, _Name) \

View File

@ -0,0 +1,39 @@
// Copyright (C) 2009 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/>.
// { dg-do compile }
#include <valarray>
// PR libstdc++/40691
void test01()
{
const std::valarray<int> vi(12);
std::valarray<bool> vb1(12);
std::valarray<bool> vb2(3);
std::slice s(0,3,4);
vb1 = !vi;
vb2 = !(std::valarray<int>)vi[s];
vb2 = !vi[s];
}
int main()
{
test01();
return 0;
}