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 ecdba1d07569de2bd138810d28e4167f56e10806..b5e6c973e647cbce137a1f51f93d310a092b5d02 100644 (file)
--- 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 dc4bbb7f356f416f1c87de76b1021823dd15e8eb..8c710c30de5ad42f0bf7fdcd12be98fa3a47c83b 100644 (file)
--- 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