diff options
| author | Francois Pichet <pichet2000@gmail.com> | 2012-07-22 11:32:41 +0000 |
|---|---|---|
| committer | Francois Pichet <pichet2000@gmail.com> | 2012-07-22 11:32:41 +0000 |
| commit | 0e2b84312f21de416e91691473290a8df86e45c2 (patch) | |
| tree | fbdfb7306bfb59a3e7cf227601a4c940b9323346 /clang/lib/Basic/IdentifierTable.cpp | |
| parent | c8acd7c96b62347a79137b363adb461fa3fb434c (diff) | |
| download | bcm5719-llvm-0e2b84312f21de416e91691473290a8df86e45c2.tar.gz bcm5719-llvm-0e2b84312f21de416e91691473290a8df86e45c2.zip | |
char16_t and char32_t are defined via typedef in MSVC 11 RC. So introduce a way to disable keywords under Microsoft mode.
llvm-svn: 160612
Diffstat (limited to 'clang/lib/Basic/IdentifierTable.cpp')
| -rw-r--r-- | clang/lib/Basic/IdentifierTable.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/clang/lib/Basic/IdentifierTable.cpp b/clang/lib/Basic/IdentifierTable.cpp index 69814558558..96d09a6bc1f 100644 --- a/clang/lib/Basic/IdentifierTable.cpp +++ b/clang/lib/Basic/IdentifierTable.cpp @@ -103,7 +103,8 @@ namespace { KEYOPENCL = 0x200, KEYC11 = 0x400, KEYARC = 0x800, - KEYALL = 0x0fff + KEYALL = 0x0fff, + KEYNOMS = 0x1000 }; } @@ -136,6 +137,9 @@ static void AddKeyword(StringRef Keyword, else if (LangOpts.ObjC2 && (Flags & KEYARC)) AddResult = 2; else if (LangOpts.CPlusPlus && (Flags & KEYCXX0X)) AddResult = 3; + // Don't add this keyword under MicrosoftMode. + if (LangOpts.MicrosoftMode && (Flags & KEYNOMS)) + return; // Don't add this keyword if disabled in this language. if (AddResult == 0) return; |
