From a0e23576b8558c7b35aa75f96761b97e904b6e87 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Mon, 1 Oct 2018 02:54:08 +0000 Subject: [PATCH] Fix Shadowing warning on Windows llvm-svn: 343439 --- libcxx/include/support/win32/locale_win32.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libcxx/include/support/win32/locale_win32.h b/libcxx/include/support/win32/locale_win32.h index 68682c9..c7c6d78 100644 --- a/libcxx/include/support/win32/locale_win32.h +++ b/libcxx/include/support/win32/locale_win32.h @@ -35,8 +35,8 @@ public: : __locale(nullptr), __locale_str(nullptr) {} locale_t(std::nullptr_t) : __locale(nullptr), __locale_str(nullptr) {} - locale_t(_locale_t __locale, const char* __locale_str) - : __locale(__locale), __locale_str(__locale_str) {} + locale_t(_locale_t __xlocale, const char* __xlocale_str) + : __locale(__xlocale), __locale_str(__xlocale_str) {} friend bool operator==(const locale_t& __left, const locale_t& __right) { return __left.__locale == __right.__locale; -- 2.7.4