From: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 29 Jan 2019 00:47:38 +0000 (+0000)
Subject: Avoid ambiguity between C++2a std::erase_if and LFTS version
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=307e86fcfe4d16306b8a3f5d202bf03b13cfaf9f;p=thirdparty%2Fgcc.git

Avoid ambiguity between C++2a std::erase_if and LFTS version

These calls should have been qualified to avoid ADL anyway, but in C++2a
it becomes essential to qualify the calls in experimental::erase because
std::erase_if is also declared and the calls become ambiguous.

	* include/experimental/forward_list (experimental::erase): Qualify
	call to erase_if.
	* include/experimental/list (experimental::erase): Likewise.
	* include/std/forward_list (std::erase): Likewise.
	* include/std/list (std::erase): Likewise.

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fc6f7d1a2109..7af725ae7bf7 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,11 @@
 2019-01-29  Jonathan Wakely  <jwakely@redhat.com>
 
+	* include/experimental/forward_list (experimental::erase): Qualify
+	call to erase_if.
+	* include/experimental/list (experimental::erase): Likewise.
+	* include/std/forward_list (std::erase): Likewise.
+	* include/std/list (std::erase): Likewise.
+
 	* testsuite/20_util/reference_wrapper/result_type.cc: Disable for
 	C++2a.
 	* testsuite/20_util/reference_wrapper/typedefs-2.cc: Likewise.
diff --git a/libstdc++-v3/include/experimental/forward_list b/libstdc++-v3/include/experimental/forward_list
index 60f0564f0658..f6ffbf0a0af5 100644
--- a/libstdc++-v3/include/experimental/forward_list
+++ b/libstdc++-v3/include/experimental/forward_list
@@ -54,7 +54,9 @@ inline namespace fundamentals_v2
     erase(forward_list<_Tp, _Alloc>& __cont, const _Up& __value)
     {
       using __elem_type = typename forward_list<_Tp, _Alloc>::value_type;
-      erase_if(__cont, [&](__elem_type& __elem) { return __elem == __value; });
+      std::experimental::erase_if(__cont, [&](__elem_type& __elem) {
+	  return __elem == __value;
+      });
     }
 
   namespace pmr {
diff --git a/libstdc++-v3/include/experimental/list b/libstdc++-v3/include/experimental/list
index 13c33f02e721..2b7a331e63af 100644
--- a/libstdc++-v3/include/experimental/list
+++ b/libstdc++-v3/include/experimental/list
@@ -54,7 +54,9 @@ inline namespace fundamentals_v2
     erase(list<_Tp, _Alloc>& __cont, const _Up& __value)
     {
       using __elem_type = typename list<_Tp, _Alloc>::value_type;
-      erase_if(__cont, [&](__elem_type& __elem) { return __elem == __value; });
+      experimental::erase_if(__cont, [&](__elem_type& __elem) {
+	  return __elem == __value;
+      });
     }
 
 namespace pmr {
diff --git a/libstdc++-v3/include/std/forward_list b/libstdc++-v3/include/std/forward_list
index 3d3b6d4f5f6d..9d6cc40593ba 100644
--- a/libstdc++-v3/include/std/forward_list
+++ b/libstdc++-v3/include/std/forward_list
@@ -78,8 +78,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     erase(forward_list<_Tp, _Alloc>& __cont, const _Up& __value)
     {
       using __elem_type = typename forward_list<_Tp, _Alloc>::value_type;
-      return erase_if(__cont,
-		      [&](__elem_type& __elem) { return __elem == __value; });
+      return std::erase_if(__cont, [&](__elem_type& __elem) {
+	  return __elem == __value;
+      });
     }
 _GLIBCXX_END_NAMESPACE_VERSION
 } // namespace std
diff --git a/libstdc++-v3/include/std/list b/libstdc++-v3/include/std/list
index 7b02e8685d48..8d6ac198c9a7 100644
--- a/libstdc++-v3/include/std/list
+++ b/libstdc++-v3/include/std/list
@@ -102,8 +102,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     erase(list<_Tp, _Alloc>& __cont, const _Up& __value)
     {
       using __elem_type = typename list<_Tp, _Alloc>::value_type;
-      return erase_if(__cont,
-		      [&](__elem_type& __elem) { return __elem == __value; });
+      return std::erase_if(__cont, [&](__elem_type& __elem) {
+	  return __elem == __value;
+      });
     }
 _GLIBCXX_END_NAMESPACE_VERSION
 } // namespace std