diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-01-02 11:42:31 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-01-02 11:42:31 +0000 |
commit | 2bf7fdb723fc513e3d12bfdf96102c46230f74e3 (patch) | |
tree | 05892ba7d5ed952e7e46355c6aa48604de92e735 /clang/lib/Basic | |
parent | 9fb823bbd484eebe4f8756338b14ed3725261997 (diff) | |
download | bcm5719-llvm-2bf7fdb723fc513e3d12bfdf96102c46230f74e3.tar.gz bcm5719-llvm-2bf7fdb723fc513e3d12bfdf96102c46230f74e3.zip |
s/CPlusPlus0x/CPlusPlus11/g
llvm-svn: 171367
Diffstat (limited to 'clang/lib/Basic')
-rw-r--r-- | clang/lib/Basic/IdentifierTable.cpp | 2 | ||||
-rw-r--r-- | clang/lib/Basic/Module.cpp | 2 | ||||
-rw-r--r-- | clang/lib/Basic/OperatorPrecedence.cpp | 4 | ||||
-rw-r--r-- | clang/lib/Basic/Targets.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/clang/lib/Basic/IdentifierTable.cpp b/clang/lib/Basic/IdentifierTable.cpp index 49cd0ac615a..44769e440ee 100644 --- a/clang/lib/Basic/IdentifierTable.cpp +++ b/clang/lib/Basic/IdentifierTable.cpp @@ -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.CPlusPlus0x && (Flags & KEYCXX0X)) AddResult = 2; + else if (LangOpts.CPlusPlus11 && (Flags & KEYCXX0X)) 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; diff --git a/clang/lib/Basic/Module.cpp b/clang/lib/Basic/Module.cpp index 605a7366264..454dd9c02bd 100644 --- a/clang/lib/Basic/Module.cpp +++ b/clang/lib/Basic/Module.cpp @@ -56,7 +56,7 @@ static bool hasFeature(StringRef Feature, const LangOptions &LangOpts, .Case("altivec", LangOpts.AltiVec) .Case("blocks", LangOpts.Blocks) .Case("cplusplus", LangOpts.CPlusPlus) - .Case("cplusplus11", LangOpts.CPlusPlus0x) + .Case("cplusplus11", LangOpts.CPlusPlus11) .Case("objc", LangOpts.ObjC1) .Case("objc_arc", LangOpts.ObjCAutoRefCount) .Case("opencl", LangOpts.OpenCL) diff --git a/clang/lib/Basic/OperatorPrecedence.cpp b/clang/lib/Basic/OperatorPrecedence.cpp index 7782decbba4..f9de231c5e7 100644 --- a/clang/lib/Basic/OperatorPrecedence.cpp +++ b/clang/lib/Basic/OperatorPrecedence.cpp @@ -16,7 +16,7 @@ namespace clang { prec::Level getBinOpPrecedence(tok::TokenKind Kind, bool GreaterThanIsOperator, - bool CPlusPlus0x) { + bool CPlusPlus11) { switch (Kind) { case tok::greater: // C++ [temp.names]p3: @@ -34,7 +34,7 @@ prec::Level getBinOpPrecedence(tok::TokenKind Kind, bool GreaterThanIsOperator, // consecutive but distinct > tokens, the first of which is // taken as the end of the template-argument-list and completes // the template-id. [...] - if (GreaterThanIsOperator || !CPlusPlus0x) + if (GreaterThanIsOperator || !CPlusPlus11) return prec::Shift; return prec::Unknown; diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index ea19b15848e..2b932eb1211 100644 --- a/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp @@ -575,7 +575,7 @@ protected: if (Opts.MicrosoftExt) { Builder.defineMacro("_MSC_EXTENSIONS"); - if (Opts.CPlusPlus0x) { + if (Opts.CPlusPlus11) { Builder.defineMacro("_RVALUE_REFERENCES_V2_SUPPORTED"); Builder.defineMacro("_RVALUE_REFERENCES_SUPPORTED"); Builder.defineMacro("_NATIVE_NULLPTR_SUPPORTED"); |