From 46d5a265d56111cdf12253dbb6c707a4f5a84ce8 Mon Sep 17 00:00:00 2001 From: Argyrios Kyrtzidis Date: Thu, 17 Apr 2014 02:32:52 +0000 Subject: [PATCH] [Parser] Remove "add -fmodules" from the "use of '@import' when modules are disabled, add -fmodules" error. We disable modules for C++, at which point this is confusing. rdar://16641918 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@206440 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/DiagnosticParseKinds.td | 2 +- test/Parser/check-objc2-syntax-1.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/clang/Basic/DiagnosticParseKinds.td b/include/clang/Basic/DiagnosticParseKinds.td index 0b067842fe..6cb7a55db4 100644 --- a/include/clang/Basic/DiagnosticParseKinds.td +++ b/include/clang/Basic/DiagnosticParseKinds.td @@ -225,7 +225,7 @@ def err_expected_property_name : Error<"expected property name">; def err_unexpected_at : Error<"unexpected '@' in program">; def err_atimport : Error< -"use of '@import' when modules are disabled, add -fmodules">; +"use of '@import' when modules are disabled">; def err_invalid_reference_qualifier_application : Error< "'%0' qualifier may not be applied to a reference">; diff --git a/test/Parser/check-objc2-syntax-1.m b/test/Parser/check-objc2-syntax-1.m index 6c30096cdd..364f826776 100644 --- a/test/Parser/check-objc2-syntax-1.m +++ b/test/Parser/check-objc2-syntax-1.m @@ -1,7 +1,7 @@ // RUN: %clang_cc1 -fsyntax-only -verify %s // rdar://15505492 -@import Foundation; // expected-error {{use of '@import' when modules are disabled, add -fmodules}} +@import Foundation; // expected-error {{use of '@import' when modules are disabled}} @interface Subclass + (int)magicNumber; -- 2.40.0