From: Paolo Carlini Date: Sat, 29 Mar 2008 22:38:19 +0000 (+0000) Subject: re PR libstdc++/35725 (ambiguous std::fill with character array) X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b14f95a8d508ec2ba06603392e62d6d508c6c7d1;p=gcc.git re PR libstdc++/35725 (ambiguous std::fill with character array) 2008-03-29 Paolo Carlini PR libstdc++/35725 * include/bits/stl_algobase.h (__fill_a(_ForwardIterator, _ForwardIterator, _Tp), __fill_a(_Tp*, _Tp*, _Tp), __fill_n_a(_OutputIterator, _Size, _Tp), __fill_n_a(_Tp*, _Size, _Tp)): Fix signatures. * testsuite/25_algorithms/fill/35725.cc: New. * testsuite/25_algorithms/fill_n/35725.cc: Likewise. From-SVN: r133721 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 13e3a269b2f..f5900740560 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2008-03-29 Paolo Carlini + + PR libstdc++/35725 + * include/bits/stl_algobase.h (__fill_a(_ForwardIterator, + _ForwardIterator, _Tp), __fill_a(_Tp*, _Tp*, _Tp), + __fill_n_a(_OutputIterator, _Size, _Tp), __fill_n_a(_Tp*, _Size, + _Tp)): Fix signatures. + * testsuite/25_algorithms/fill/35725.cc: New. + * testsuite/25_algorithms/fill_n/35725.cc: Likewise. + 2008-03-29 Matthias Klose * config/abi/post/s390-linux-gnu/baseline_symbols.txt: Update. diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h index 8f194537fd2..9c64ef1be48 100644 --- a/libstdc++-v3/include/bits/stl_algobase.h +++ b/libstdc++-v3/include/bits/stl_algobase.h @@ -1,6 +1,6 @@ // Core algorithmic facilities -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -689,19 +689,24 @@ _GLIBCXX_BEGIN_NAMESPACE(std) template inline typename __gnu_cxx::__enable_if<__is_scalar<_Tp>::__value, void>::__type - __fill_a(_ForwardIterator __first, _ForwardIterator __last, _Tp __value) + __fill_a(_ForwardIterator __first, _ForwardIterator __last, + const _Tp& __value) { + const _Tp __tmp = __value; for (; __first != __last; ++__first) - *__first = __value; + *__first = __tmp; } // Specialization: for char types we can use memset. template inline typename __gnu_cxx::__enable_if<__is_byte<_Tp>::__value, void>::__type - __fill_a(_Tp* __first, _Tp* __last, _Tp __c) - { __builtin_memset(__first, static_cast(__c), - __last - __first); } + __fill_a(_Tp* __first, _Tp* __last, const _Tp& __c) + { + const _Tp __tmp = __c; + __builtin_memset(__first, static_cast(__tmp), + __last - __first); + } /** * @brief Fills the range [first,last) with copies of value. @@ -740,17 +745,18 @@ _GLIBCXX_BEGIN_NAMESPACE(std) template inline typename __gnu_cxx::__enable_if<__is_scalar<_Tp>::__value, _OutputIterator>::__type - __fill_n_a(_OutputIterator __first, _Size __n, _Tp __value) + __fill_n_a(_OutputIterator __first, _Size __n, const _Tp& __value) { + const _Tp __tmp = __value; for (; __n > 0; --__n, ++__first) - *__first = __value; + *__first = __tmp; return __first; } template inline typename __gnu_cxx::__enable_if<__is_byte<_Tp>::__value, _Tp*>::__type - __fill_n_a(_Tp* __first, _Size __n, _Tp __c) + __fill_n_a(_Tp* __first, _Size __n, const _Tp& __c) { std::__fill_a(__first, __first + __n, __c); return __first + __n; diff --git a/libstdc++-v3/testsuite/25_algorithms/fill/35725.cc b/libstdc++-v3/testsuite/25_algorithms/fill/35725.cc new file mode 100644 index 00000000000..0c5b0e46cb4 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/fill/35725.cc @@ -0,0 +1,30 @@ +// { dg-do compile } + +// Copyright (C) 2008 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +#include +#include +#include + +// libstdc++/35725 +void test01() +{ + std::vector foo(20); + std::fill(foo.begin(), foo.end(), "bar"); +} diff --git a/libstdc++-v3/testsuite/25_algorithms/fill_n/35725.cc b/libstdc++-v3/testsuite/25_algorithms/fill_n/35725.cc new file mode 100644 index 00000000000..a914d1cd4eb --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/fill_n/35725.cc @@ -0,0 +1,30 @@ +// { dg-do compile } + +// Copyright (C) 2008 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +#include +#include +#include + +// libstdc++/35725 +void test01() +{ + std::vector foo(20); + std::fill_n(foo.begin(), 20, "bar"); +}