From: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 27 Jun 2017 14:44:50 +0000 (+0000)
Subject: PR libstdc++/81221 fix namespace qualification for parallel mode
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fbe1dc9462b40fbb30e24ce19579541a473c275;p=thirdparty%2Fgcc.git

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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@249692 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6be91fedcc55..6a143cf0fefe 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 246193f38c7f..fbebfdbf0324 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 000000000000..e6dd5e0acd13
--- /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>