Commit e5472c1
UPSTREAM: Work around a build issue with MSVC; NFC (llvm#142195)
Microsoft helpfully defines `THIS` to `void` in two different platform
SDK headers, at least one of which is reachable via <Windows.h>. We have
a user who ran into a build because of `THIS` unfortunate macro name
collision.
Rename the members to better match our naming conventions.
Fixes llvm#142186
(cherry picked from commit 0adf6e8)1 parent 87f0227 commit e5472c1
File tree
5 files changed
+14
-12
lines changed- clang
- include/clang/Basic
- lib/Sema
5 files changed
+14
-12
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1927 | 1927 | | |
1928 | 1928 | | |
1929 | 1929 | | |
1930 | | - | |
1931 | | - | |
1932 | | - | |
1933 | | - | |
| 1930 | + | |
| 1931 | + | |
| 1932 | + | |
| 1933 | + | |
| 1934 | + | |
| 1935 | + | |
1934 | 1936 | | |
1935 | 1937 | | |
1936 | 1938 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
665 | 665 | | |
666 | 666 | | |
667 | 667 | | |
668 | | - | |
| 668 | + | |
669 | 669 | | |
670 | 670 | | |
671 | 671 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
290 | 290 | | |
291 | 291 | | |
292 | 292 | | |
293 | | - | |
| 293 | + | |
294 | 294 | | |
295 | 295 | | |
296 | 296 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3232 | 3232 | | |
3233 | 3233 | | |
3234 | 3234 | | |
3235 | | - | |
3236 | | - | |
| 3235 | + | |
| 3236 | + | |
3237 | 3237 | | |
3238 | 3238 | | |
3239 | 3239 | | |
| |||
3248 | 3248 | | |
3249 | 3249 | | |
3250 | 3250 | | |
3251 | | - | |
| 3251 | + | |
3252 | 3252 | | |
3253 | 3253 | | |
3254 | 3254 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3954 | 3954 | | |
3955 | 3955 | | |
3956 | 3956 | | |
3957 | | - | |
| 3957 | + | |
3958 | 3958 | | |
3959 | 3959 | | |
3960 | 3960 | | |
| |||
3997 | 3997 | | |
3998 | 3998 | | |
3999 | 3999 | | |
4000 | | - | |
4001 | | - | |
| 4000 | + | |
| 4001 | + | |
4002 | 4002 | | |
4003 | 4003 | | |
4004 | 4004 | | |
| |||
0 commit comments