summaryrefslogtreecommitdiffstats
path: root/clang/lib/Basic
diff options
context:
space:
mode:
authorSaar Raz <saar@raz.email>2020-01-24 00:43:22 +0200
committerSaar Raz <saar@raz.email>2020-01-24 02:28:33 +0200
commit2ec65e229314d468006998eaef7074b86ef7482d (patch)
treeb40b8f4c158de29132f5c6ff17d804273a68e3c9 /clang/lib/Basic
parent29f14c1df25992db8c908e441c69e1fd4d4e4010 (diff)
downloadbcm5719-llvm-2ec65e229314d468006998eaef7074b86ef7482d.tar.gz
bcm5719-llvm-2ec65e229314d468006998eaef7074b86ef7482d.zip
[Concepts] Deprecate -fconcepts-ts, enable Concepts under -std=c++2a
Now with concepts support merged and mostly complete, we do not need -fconcepts-ts (which was also misleading as we were not implementing the TS) and can enable concepts features under C++2a. A warning will be generated if users still attempt to use -fconcepts-ts. (cherry picked from commit 67c608a9695496cfc9d3fdf9d0b12b554ac6b4df)
Diffstat (limited to 'clang/lib/Basic')
-rw-r--r--clang/lib/Basic/IdentifierTable.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Basic/IdentifierTable.cpp b/clang/lib/Basic/IdentifierTable.cpp
index 4aebea19924..ee25bd883ca 100644
--- a/clang/lib/Basic/IdentifierTable.cpp
+++ b/clang/lib/Basic/IdentifierTable.cpp
@@ -142,7 +142,7 @@ static KeywordStatus getKeywordStatus(const LangOptions &LangOpts,
// We treat bridge casts as objective-C keywords so we can warn on them
// in non-arc mode.
if (LangOpts.ObjC && (Flags & KEYOBJC)) return KS_Enabled;
- if (LangOpts.ConceptsTS && (Flags & KEYCONCEPTS)) return KS_Enabled;
+ if (LangOpts.CPlusPlus2a && (Flags & KEYCONCEPTS)) return KS_Enabled;
if (LangOpts.Coroutines && (Flags & KEYCOROUTINES)) return KS_Enabled;
if (LangOpts.ModulesTS && (Flags & KEYMODULES)) return KS_Enabled;
if (LangOpts.CPlusPlus && (Flags & KEYALLCXX)) return KS_Future;
OpenPOWER on IntegriCloud