[libcxx] r343439 - Fix Shadowing warning on Windows

Eric Fiselier eric at efcs.ca
Sun Sep 30 19:54:08 PDT 2018


Author: ericwf
Date: Sun Sep 30 19:54:08 2018
New Revision: 343439

URL: http://llvm.org/viewvc/llvm-project?rev=343439&view=rev
Log:
Fix Shadowing warning on Windows

Modified:
    libcxx/trunk/include/support/win32/locale_win32.h

Modified: libcxx/trunk/include/support/win32/locale_win32.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/support/win32/locale_win32.h?rev=343439&r1=343438&r2=343439&view=diff
==============================================================================
--- libcxx/trunk/include/support/win32/locale_win32.h (original)
+++ libcxx/trunk/include/support/win32/locale_win32.h Sun Sep 30 19:54:08 2018
@@ -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;




More information about the libcxx-commits mailing list