diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-01-02 12:01:23 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-01-02 12:01:23 +0000 |
| commit | 89645bc88866097101329d7f87dcfc57299e8b37 (patch) | |
| tree | 3c0227bbdab3ea861de95bd6dc579b9db921511f /clang/lib/Basic | |
| parent | 005f27a0d39047acb7085e19a7b3d57c3be6ed41 (diff) | |
| download | bcm5719-llvm-89645bc88866097101329d7f87dcfc57299e8b37.tar.gz bcm5719-llvm-89645bc88866097101329d7f87dcfc57299e8b37.zip | |
s/CXX0X/CXX11/g, except for __GNU_EXPERIMENTAL_CXX0X__, and update a few nearby 'C++0x' comments.
llvm-svn: 171372
Diffstat (limited to 'clang/lib/Basic')
| -rw-r--r-- | clang/lib/Basic/IdentifierTable.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Basic/IdentifierTable.cpp b/clang/lib/Basic/IdentifierTable.cpp index 44769e440ee..ecaaf036b01 100644 --- a/clang/lib/Basic/IdentifierTable.cpp +++ b/clang/lib/Basic/IdentifierTable.cpp @@ -94,7 +94,7 @@ namespace { enum { KEYC99 = 0x1, KEYCXX = 0x2, - KEYCXX0X = 0x4, + KEYCXX11 = 0x4, KEYGNU = 0x8, KEYMS = 0x10, BOOLSUPPORT = 0x20, @@ -124,7 +124,7 @@ static void AddKeyword(StringRef Keyword, unsigned AddResult = 0; if (Flags == KEYALL) AddResult = 2; else if (LangOpts.CPlusPlus && (Flags & KEYCXX)) AddResult = 2; - else if (LangOpts.CPlusPlus11 && (Flags & KEYCXX0X)) AddResult = 2; + else if (LangOpts.CPlusPlus11 && (Flags & KEYCXX11)) AddResult = 2; else if (LangOpts.C99 && (Flags & KEYC99)) AddResult = 2; else if (LangOpts.GNUKeywords && (Flags & KEYGNU)) AddResult = 1; else if (LangOpts.MicrosoftExt && (Flags & KEYMS)) AddResult = 1; @@ -138,7 +138,7 @@ static void AddKeyword(StringRef Keyword, // 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; - else if (LangOpts.CPlusPlus && (Flags & KEYCXX0X)) AddResult = 3; + else if (LangOpts.CPlusPlus && (Flags & KEYCXX11)) AddResult = 3; // Don't add this keyword under MicrosoftMode. if (LangOpts.MicrosoftMode && (Flags & KEYNOMS)) |
