summaryrefslogtreecommitdiff
path: root/libcxx
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2018-10-01 02:54:08 +0000
committerEric Fiselier <eric@efcs.ca>2018-10-01 02:54:08 +0000
commit9ae1df5402e90271afb4d84dd7ad7bb4f2c33e2d (patch)
treefe254d45ed2afd15d79f440d05ce393ec320e009 /libcxx
parent5af983714f52bac707ca57e0db5a0ef06997bbae (diff)
Fix Shadowing warning on Windows
Diffstat (limited to 'libcxx')
-rw-r--r--libcxx/include/support/win32/locale_win32.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/support/win32/locale_win32.h b/libcxx/include/support/win32/locale_win32.h
index 68682c9624b..c7c6d786cb8 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;