diff options
| author | Eric Fiselier <eric@efcs.ca> | 2018-10-01 02:54:08 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2018-10-01 02:54:08 +0000 |
| commit | a0e23576b8558c7b35aa75f96761b97e904b6e87 (patch) | |
| tree | 5a2fd24f1c993d86f1090b960b3cf3d6e9b4e065 /libcxx/include/support/win32 | |
| parent | 0b485f3e911e946da4ecac73544116df2bd4dae1 (diff) | |
| download | bcm5719-llvm-a0e23576b8558c7b35aa75f96761b97e904b6e87.tar.gz bcm5719-llvm-a0e23576b8558c7b35aa75f96761b97e904b6e87.zip | |
Fix Shadowing warning on Windows
llvm-svn: 343439
Diffstat (limited to 'libcxx/include/support/win32')
| -rw-r--r-- | libcxx/include/support/win32/locale_win32.h | 4 |
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; |
