r206440 - [Parser] Remove "add -fmodules" from the "use of '@import' when modules are disabled, add -fmodules" error.

[Argyrios Kyrtzidis]

Author: akirtzidis
Date: Wed Apr 16 21:32:52 2014
New Revision: 206440

URL: http://llvm.org/viewvc/llvm-project?rev=206440&view=rev
Log:
[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

Modified:
    cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td
    cfe/trunk/test/Parser/check-objc2-syntax-1.m

Modified: cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td?rev=206440&r1=206439&r2=206440&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td Wed Apr 16 21:32:52 2014
@@ -225,7 +225,7 @@ def err_expected_property_name : Error<"
 
 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">;

Modified: cfe/trunk/test/Parser/check-objc2-syntax-1.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/check-objc2-syntax-1.m?rev=206440&r1=206439&r2=206440&view=diff
==============================================================================
--- cfe/trunk/test/Parser/check-objc2-syntax-1.m (original)
+++ cfe/trunk/test/Parser/check-objc2-syntax-1.m Wed Apr 16 21:32:52 2014
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s
 
 // rdar://15505492
- at import Foundation; // expected-error {{use of '@import' when modules are disabled, add -fmodules}}
+ at import Foundation; // expected-error {{use of '@import' when modules are disabled}}
 
 @interface Subclass 
 + (int)magicNumber;