diff options
| author | Janis Johnson <janis187@us.ibm.com> | 2009-07-08 22:26:50 +0000 |
|---|---|---|
| committer | Janis Johnson <janis@gcc.gnu.org> | 2009-07-08 22:26:50 +0000 |
| commit | 23862bec3e49c58067e159bdb0c9042d79999449 (patch) | |
| tree | 10e7c436f82c9e13dbe69e7404c3bde2e7536c43 | |
| parent | 60d340efa77c1ae01cf3e7a66bcf402ca7793d7f (diff) | |
| download | gcc-23862bec3e49c58067e159bdb0c9042d79999449.zip gcc-23862bec3e49c58067e159bdb0c9042d79999449.tar.gz gcc-23862bec3e49c58067e159bdb0c9042d79999449.tar.bz2 | |
re PR libstdc++/40691 (bug in logical not operator for valarray used with slice)
PR libstdc++/40691
* include/bugs/valarray-after.h (_Expr::operator!): Fix return type.
* testsuite/26_numerics/valarray/40691.cc: New test.
From-SVN: r149393
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/valarray_after.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/26_numerics/valarray/40691.cc | 39 |
3 files changed, 46 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 5641a78..3110601 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2009-07-08 Janis Johnson <janis187@us.ibm.com> + + PR libstdc++/40691 + * include/bugs/valarray-after.h (_Expr::operator!): Fix return type. + * testsuite/26_numerics/valarray/40691.cc: New test. + 2009-07-06 Benjamin Kosnik <bkoz@redhat.com> * testsuite/21_strings/c_strings/wchar_t/3.cc: Add copyright. diff --git a/libstdc++-v3/include/bits/valarray_after.h b/libstdc++-v3/include/bits/valarray_after.h index 8a6a256..e4093f1 100644 --- a/libstdc++-v3/include/bits/valarray_after.h +++ b/libstdc++-v3/include/bits/valarray_after.h @@ -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) \ diff --git a/libstdc++-v3/testsuite/26_numerics/valarray/40691.cc b/libstdc++-v3/testsuite/26_numerics/valarray/40691.cc new file mode 100644 index 0000000..5524835 --- /dev/null +++ b/libstdc++-v3/testsuite/26_numerics/valarray/40691.cc @@ -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; +} |