diff options
author | Benjamin Kramer <benny.kra@googlemail.com> | 2011-12-23 17:00:35 +0000 |
---|---|---|
committer | Benjamin Kramer <benny.kra@googlemail.com> | 2011-12-23 17:00:35 +0000 |
commit | e56f393249cb64968256090cc484edecf0078308 (patch) | |
tree | 4b758f4b945bdf8e278726ae166598d1c7e6edf9 /clang/lib/Basic/IdentifierTable.cpp | |
parent | 6784aeb9ef96e5735850fa7226ed0cb45cb82e75 (diff) | |
download | bcm5719-llvm-e56f393249cb64968256090cc484edecf0078308.tar.gz bcm5719-llvm-e56f393249cb64968256090cc484edecf0078308.zip |
Mass rename C1x references to C11. The name hasn't proliferated like "C++0x" so this patch is surprisingly small.
Also drop -Wc1x-extensions in favor of -Wc11-extensions. I don't think we need to keep this around for compatibility.
llvm-svn: 147221
Diffstat (limited to 'clang/lib/Basic/IdentifierTable.cpp')
-rw-r--r-- | clang/lib/Basic/IdentifierTable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Basic/IdentifierTable.cpp b/clang/lib/Basic/IdentifierTable.cpp index f5b417c72c7..690a1f5a84f 100644 --- a/clang/lib/Basic/IdentifierTable.cpp +++ b/clang/lib/Basic/IdentifierTable.cpp @@ -95,7 +95,7 @@ namespace { KEYNOCXX = 0x80, KEYBORLAND = 0x100, KEYOPENCL = 0x200, - KEYC1X = 0x400, + KEYC11 = 0x400, KEYARC = 0x800, KEYALL = 0x0fff }; @@ -124,7 +124,7 @@ static void AddKeyword(StringRef Keyword, else if (LangOpts.AltiVec && (Flags & KEYALTIVEC)) AddResult = 2; else if (LangOpts.OpenCL && (Flags & KEYOPENCL)) AddResult = 2; else if (!LangOpts.CPlusPlus && (Flags & KEYNOCXX)) AddResult = 2; - else if (LangOpts.C1X && (Flags & KEYC1X)) AddResult = 2; + else if (LangOpts.C11 && (Flags & KEYC11)) AddResult = 2; // We treat bridge casts as objective-C keywords so we can warn on them // in non-arc mode. else if (LangOpts.ObjC2 && (Flags & KEYARC)) AddResult = 2; |