[libcxx-commits] [libcxx] 02197f7 - [libcxx/variant] Avoided variable name shadowing.

[Michael Park via libcxx-commits]

Author: Michael Park
Date: 2020-08-14T16:30:27-07:00
New Revision: 02197f7e50b938f8167b17b89bdf7c55feff4339

URL: https://github.com/llvm/llvm-project/commit/02197f7e50b938f8167b17b89bdf7c55feff4339
DIFF: https://github.com/llvm/llvm-project/commit/02197f7e50b938f8167b17b89bdf7c55feff4339.diff

LOG: [libcxx/variant] Avoided variable name shadowing.

Added: 
    

Modified: 
    libcxx/include/variant

Removed: 
    


################################################################################
diff  --git a/libcxx/include/variant b/libcxx/include/variant
index c18ef552e260..7183ec001fc2 100644
--- a/libcxx/include/variant
+++ b/libcxx/include/variant
@@ -544,12 +544,12 @@ struct __base {
     constexpr size_t __size = __uncvref_t<_Vp>::__size();
     static_assert(__size == __uncvref_t<_Wp>::__size());
     constexpr auto __dispatch = [](auto __i) {
-      return +[](_Vis&& __vis, _Vp&& __v, _Wp&& __w) -> decltype(auto) {
+      return +[](_Vis&& __vis_, _Vp&& __v_, _Wp&& __w_) -> decltype(auto) {
         constexpr size_t _Ip = decltype(__i)::value;
         return __invoke_constexpr(
-            _VSTD::forward<_Vis>(__vis),
-            __access::__base::__get_alt<_Ip>(_VSTD::forward<_Vp>(__v)),
-            __access::__base::__get_alt<_Ip>(_VSTD::forward<_Wp>(__w)));
+            _VSTD::forward<_Vis>(__vis_),
+            __access::__base::__get_alt<_Ip>(_VSTD::forward<_Vp>(__v_)),
+            __access::__base::__get_alt<_Ip>(_VSTD::forward<_Wp>(__w_)));
       };
     };
 #define _LIBCPP_VARIANT_CASE(_Ip)                                              \
@@ -595,11 +595,11 @@ struct __base {
   __visit_alt_impl(index_sequence<_Is...>, _Vis&& __vis, _Vs&&... __vs) {
     using __multi = __multi<__uncvref_t<_Vs>::__size()...>;
     constexpr auto __dispatch = [](auto... __is) {
-      return +[](_Vis&& __vis, _Vs&&... __vs) {
+      return +[](_Vis&& __vis_, _Vs&&... __vs_) {
         return __invoke_constexpr(
-            _VSTD::forward<_Vis>(__vis),
+            _VSTD::forward<_Vis>(__vis_),
             __access::__base::__get_alt<decltype(__is)::value>(
-                _VSTD::forward<_Vs>(__vs))...);
+                _VSTD::forward<_Vs>(__vs_))...);
       };
     };
 #define _LIBCPP_VARIANT_CASE(_Ip)                                              \