diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2017-06-27 15:44:50 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2017-06-27 15:44:50 +0100 |
| commit | e708b94bb76dd6c3d0085bdbe5e4f70d2af11117 (patch) | |
| tree | 98f5e49b3b61fff58954045b673456dfdc035a3a | |
| parent | e57f3ae8baeb35ba78da6c8bd00927df63105bdb (diff) | |
| download | gcc-e708b94bb76dd6c3d0085bdbe5e4f70d2af11117.zip gcc-e708b94bb76dd6c3d0085bdbe5e4f70d2af11117.tar.gz gcc-e708b94bb76dd6c3d0085bdbe5e4f70d2af11117.tar.bz2 | |
PR libstdc++/81221 fix namespace qualification for parallel mode
PR libstdc++/81221
* include/bits/stl_algo.h (sample): Qualify with _GLIBCXX_STD_A not
std.
* testsuite/25_algorithms/sample/81221.cc: New.
From-SVN: r249692
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_algo.h | 5 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/25_algorithms/sample/81221.cc | 23 |
3 files changed, 33 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6be91fe..6a143cf 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2017-06-27 Jonathan Wakely <jwakely@redhat.com> + + PR libstdc++/81221 + * include/bits/stl_algo.h (sample): Qualify with _GLIBCXX_STD_A not + std. + * testsuite/25_algorithms/sample/81221.cc: New. + 2017-06-22 Jonathan Wakely <jwakely@redhat.com> PR libstdc++/81173 diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h index 246193f..fbebfdb 100644 --- a/libstdc++-v3/include/bits/stl_algo.h +++ b/libstdc++-v3/include/bits/stl_algo.h @@ -5831,8 +5831,9 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO "sample size must be an integer type"); typename iterator_traits<_PopulationIterator>::difference_type __d = __n; - return std::__sample(__first, __last, __pop_cat{}, __out, __samp_cat{}, - __d, std::forward<_UniformRandomBitGenerator>(__g)); + return _GLIBCXX_STD_A:: + __sample(__first, __last, __pop_cat{}, __out, __samp_cat{}, __d, + std::forward<_UniformRandomBitGenerator>(__g)); } #endif // C++17 #endif // C++14 diff --git a/libstdc++-v3/testsuite/25_algorithms/sample/81221.cc b/libstdc++-v3/testsuite/25_algorithms/sample/81221.cc new file mode 100644 index 0000000..e6dd5e0 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/sample/81221.cc @@ -0,0 +1,23 @@ +// Copyright (C) 2017 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-options "-std=gnu++17" } +// { dg-do compile { target c++1z } } + +#undef _GLIBCXX_PARALLEL +#define _GLIBCXX_PARALLEL 1 +#include <algorithm> |