commit f0bff15efde225c39db20f0dc6536635c054c41f
author Arthur O'Dwyer <arthur.j.odwyer@gmail.com> Tue Nov 24 09:59:26 2020 -0500
committer Copybara-Service <copybara-worker@google.com> Wed Nov 25 06:26:21 2020 -0800
tree 67bd487a348c86dff315f3dd4f7c876df20a08e9
parent f7bdf15fc41a05ecb0157634497f4cae91a8a3db

[libc++] ADL-proof <variant> by adding _VSTD:: qualification on calls.

Differential Revision: https://reviews.llvm.org/D92036

GitOrigin-RevId: bbf8a9ca3ffedb7059194086bac490b6171cc474

include/variant

diff --git a/include/variant b/include/variant
index cb92a69..3621f2c 100644
--- a/include/variant
+++ b/include/variant
@@ -491,7 +491,7 @@
     template <class _Fp, class... _Vs>
     inline _LIBCPP_INLINE_VISIBILITY
     static constexpr decltype(auto) __dispatch(_Fp __f, _Vs... __vs) {
-        return __invoke_constexpr(
+        return _VSTD::__invoke_constexpr(
             static_cast<_Fp>(__f),
             __access::__base::__get_alt<_Is>(static_cast<_Vs>(__vs))...);
     }
@@ -599,7 +599,7 @@
       __std_visit_exhaustive_visitor_check<
           _Visitor,
           decltype((_VSTD::forward<_Alts>(__alts).__value))...>();
-      return __invoke_constexpr(_VSTD::forward<_Visitor>(__visitor),
+      return _VSTD::__invoke_constexpr(_VSTD::forward<_Visitor>(__visitor),
                                 _VSTD::forward<_Alts>(__alts).__value...);
     }
     _Visitor&& __visitor;