From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 15 May 2019 21:19:39 +0000 (+0100)
Subject: Qualify calls in std::visit and std::visit<R>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e5d7010bb30b136e06f31edd197b6dca9f04f7cb;p=gcc.git

Qualify calls in std::visit and std::visit<R>

	* include/std/variant (visit, visit<R>): Qualify calls to __do_visit.

From-SVN: r271268
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ecdba1d0756..b5e6c973e64 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2019-05-15  Jonathan Wakely  <jwakely@redhat.com>
+
+	* include/std/variant (visit, visit<R>): Qualify calls to __do_visit.
+
 2019-05-14  Jonathan Wakely  <jwakely@redhat.com>
 
 	* testsuite/util/testsuite_allocator.h (NullablePointer::operator bool):
diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant
index dc4bbb7f356..8c710c30de5 100644
--- a/libstdc++-v3/include/std/variant
+++ b/libstdc++-v3/include/std/variant
@@ -1637,8 +1637,8 @@ namespace __variant
 
       using _Tag = __detail::__variant::__deduce_visit_result<_Result_type>;
 
-      return __do_visit<_Tag>(std::forward<_Visitor>(__visitor),
-			      std::forward<_Variants>(__variants)...);
+      return std::__do_visit<_Tag>(std::forward<_Visitor>(__visitor),
+				   std::forward<_Variants>(__variants)...);
     }
 
 #if __cplusplus > 201703L
@@ -1649,8 +1649,8 @@ namespace __variant
       if ((__variants.valueless_by_exception() || ...))
 	__throw_bad_variant_access("Unexpected index");
 
-      return __do_visit<_Res>(std::forward<_Visitor>(__visitor),
-			      std::forward<_Variants>(__variants)...);
+      return std::__do_visit<_Res>(std::forward<_Visitor>(__visitor),
+				   std::forward<_Variants>(__variants)...);
     }
 #endif