summaryrefslogtreecommitdiffstats
path: root/lib/Parse
diff options
context:
space:
mode:
authorManman Ren <manman.ren@gmail.com>2017-01-20 20:03:00 +0000
committerManman Ren <manman.ren@gmail.com>2017-01-20 20:03:00 +0000
commite32fe3b81fca5fe93e466bc5b7d9f317c065de6c (patch)
tree2d27b453251811035063d80009a99e53892a2228 /lib/Parse
parent9218a3a9ca9f13d263be2fa3712f49b5948fef7b (diff)
Revert r292508 given that we intend to remove driver options for cxx modules.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@292639 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse')
-rw-r--r--lib/Parse/ParseObjc.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp
index 68768e1835..81761bf8d2 100644
--- a/lib/Parse/ParseObjc.cpp
+++ b/lib/Parse/ParseObjc.cpp
@@ -83,10 +83,7 @@ Parser::DeclGroupPtrTy Parser::ParseObjCAtDirectives() {
case tok::objc_import:
if (getLangOpts().Modules || getLangOpts().DebuggerSupport)
return ParseModuleImport(AtLoc);
- if (getLangOpts().CPlusPlus)
- Diag(AtLoc, diag::err_atimport_cxx);
- else
- Diag(AtLoc, diag::err_atimport);
+ Diag(AtLoc, diag::err_atimport);
SkipUntil(tok::semi);
return Actions.ConvertDeclToDeclGroup(nullptr);
default: