summaryrefslogtreecommitdiffstats
path: root/clang/lib
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
commitdfcf1cb1759f24df0c2fa82c130b4d3a424fce91 (patch)
treeacebe220915c2059d03685a8a7fc07fda3b27188 /clang/lib
parent35c8983c3373dd9e4251c7cff7628ec0bb5344be (diff)
downloadbcm5719-llvm-dfcf1cb1759f24df0c2fa82c130b4d3a424fce91.tar.gz
bcm5719-llvm-dfcf1cb1759f24df0c2fa82c130b4d3a424fce91.zip
Revert r292508 given that we intend to remove driver options for cxx modules.
llvm-svn: 292639
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Parse/ParseObjc.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/clang/lib/Parse/ParseObjc.cpp b/clang/lib/Parse/ParseObjc.cpp
index 68768e18355..81761bf8d2d 100644
--- a/clang/lib/Parse/ParseObjc.cpp
+++ b/clang/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:
OpenPOWER on IntegriCloud