OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: r249698
This commit is contained in:
Jonathan Wakely 2017-06-27 17:23:46 +01:00 committed by Jonathan Wakely
parent 4e365a51f6
commit b15062031a
3 changed files with 32 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 @@
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-21 Ville Voutilainen <ville.voutilainen@gmail.com>
Backport from mainline

5
libstdc++-v3/include/bits/stl_algo.h
View File

@ -5823,8 +5823,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

22
libstdc++-v3/testsuite/25_algorithms/sample/81221.cc Normal file
View File

@ -0,0 +1,22 @@
// 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 } }
// { dg-require-parallel-mode "" }
#include <algorithm>