diff options
| author | Erik Pilkington <erik.pilkington@gmail.com> | 2018-10-30 20:31:30 +0000 |
|---|---|---|
| committer | Erik Pilkington <erik.pilkington@gmail.com> | 2018-10-30 20:31:30 +0000 |
| commit | fa98390b3c3144c7cd446621526ca04c075435d8 (patch) | |
| tree | f9c611a2729575b3822b5c0721b4a56f673c4ec2 /clang/lib/Frontend/InitHeaderSearch.cpp | |
| parent | fe09a20f09a290274ea81d1703d4106e06a11f94 (diff) | |
| download | bcm5719-llvm-fa98390b3c3144c7cd446621526ca04c075435d8.tar.gz bcm5719-llvm-fa98390b3c3144c7cd446621526ca04c075435d8.zip | |
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
llvm-svn: 345637
Diffstat (limited to 'clang/lib/Frontend/InitHeaderSearch.cpp')
| -rw-r--r-- | clang/lib/Frontend/InitHeaderSearch.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/Frontend/InitHeaderSearch.cpp b/clang/lib/Frontend/InitHeaderSearch.cpp index 8a70404629d..deedb22f3e1 100644 --- a/clang/lib/Frontend/InitHeaderSearch.cpp +++ b/clang/lib/Frontend/InitHeaderSearch.cpp @@ -616,11 +616,11 @@ void InitHeaderSearch::Realize(const LangOptions &Lang) { for (auto &Include : IncludePath) if (Include.first == System || Include.first == ExternCSystem || - (!Lang.ObjC1 && !Lang.CPlusPlus && Include.first == CSystem) || - (/*FIXME !Lang.ObjC1 && */ Lang.CPlusPlus && + (!Lang.ObjC && !Lang.CPlusPlus && Include.first == CSystem) || + (/*FIXME !Lang.ObjC && */ Lang.CPlusPlus && Include.first == CXXSystem) || - (Lang.ObjC1 && !Lang.CPlusPlus && Include.first == ObjCSystem) || - (Lang.ObjC1 && Lang.CPlusPlus && Include.first == ObjCXXSystem)) + (Lang.ObjC && !Lang.CPlusPlus && Include.first == ObjCSystem) || + (Lang.ObjC && Lang.CPlusPlus && Include.first == ObjCXXSystem)) SearchList.push_back(Include.second); for (auto &Include : IncludePath) |
