projects
/
platform
/
upstream
/
llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0b485f3
)
Fix Shadowing warning on Windows
author
Eric Fiselier
<eric@efcs.ca>
Mon, 1 Oct 2018 02:54:08 +0000
(
02:54
+0000)
committer
Eric Fiselier
<eric@efcs.ca>
Mon, 1 Oct 2018 02:54:08 +0000
(
02:54
+0000)
llvm-svn: 343439
libcxx/include/support/win32/locale_win32.h
patch
|
blob
|
history
diff --git
a/libcxx/include/support/win32/locale_win32.h
b/libcxx/include/support/win32/locale_win32.h
index
68682c9
..
c7c6d78
100644
(file)
--- 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* __x
locale_str)
+ : __locale(__
xlocale), __locale_str(__x
locale_str) {}
friend bool operator==(const locale_t& __left, const locale_t& __right) {
return __left.__locale == __right.__locale;