summaryrefslogtreecommitdiffstats
path: root/include/clang/Basic/LangOptions.def
diff options
context:
space:
mode:
authorErik Pilkington <erik.pilkington@gmail.com>2018-10-30 20:31:30 +0000
committerErik Pilkington <erik.pilkington@gmail.com>2018-10-30 20:31:30 +0000
commite1dcbc21bc41e383255561184def6905f797a4f8 (patch)
tree7a1afc296657b896c8ce3626bcf2021f4b5f8d02 /include/clang/Basic/LangOptions.def
parent4288bb7112e75e40e5eb59b3b3d04663136f4f46 (diff)
NFC: Remove the ObjC1/ObjC2 distinction from clang (and related projects)
We haven't supported compiling ObjC1 for a long time (and never will again), so there isn't any reason to keep these separate. This patch replaces LangOpts::ObjC1 and LangOpts::ObjC2 with LangOpts::ObjC. Differential revision: https://reviews.llvm.org/D53547 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@345637 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/clang/Basic/LangOptions.def')
-rw-r--r--include/clang/Basic/LangOptions.def3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/clang/Basic/LangOptions.def b/include/clang/Basic/LangOptions.def
index 8b92841298..6397663726 100644
--- a/include/clang/Basic/LangOptions.def
+++ b/include/clang/Basic/LangOptions.def
@@ -92,8 +92,7 @@ LANGOPT(CPlusPlus11 , 1, 0, "C++11")
LANGOPT(CPlusPlus14 , 1, 0, "C++14")
LANGOPT(CPlusPlus17 , 1, 0, "C++17")
LANGOPT(CPlusPlus2a , 1, 0, "C++2a")
-LANGOPT(ObjC1 , 1, 0, "Objective-C 1")
-LANGOPT(ObjC2 , 1, 0, "Objective-C 2")
+LANGOPT(ObjC , 1, 0, "Objective-C")
BENIGN_LANGOPT(ObjCDefaultSynthProperties , 1, 0,
"Objective-C auto-synthesized properties")
BENIGN_LANGOPT(EncodeExtendedBlockSig , 1, 0,