[cfe-commits] r145958 - in /cfe/trunk: include/clang/Basic/DiagnosticLexKinds.td lib/Lex/ModuleMap.cpp

[Douglas Gregor]

Author: dgregor
Date: Tue Dec  6 13:57:48 2011
New Revision: 145958

URL: http://llvm.org/viewvc/llvm-project?rev=145958&view=rev
Log:
Remove misleading error message

Modified:
    cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td
    cfe/trunk/lib/Lex/ModuleMap.cpp

Modified: cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td?rev=145958&r1=145957&r2=145958&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td Tue Dec  6 13:57:48 2011
@@ -377,8 +377,6 @@
 // Module map parsing
 def err_mmap_unknown_token : Error<"skipping stray token">;
 def err_mmap_expected_module : Error<"expected module declaration">;
-def err_mmap_expected_module_after_explicit : Error<
-  "expected 'module' keyword after 'explicit'">;
 def err_mmap_expected_module_name : Error<"expected module name">;
 def err_mmap_expected_lbrace : Error<"expected '{' to start module '%0'">;
 def err_mmap_expected_rbrace : Error<"expected '}'">;

Modified: cfe/trunk/lib/Lex/ModuleMap.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/ModuleMap.cpp?rev=145958&r1=145957&r2=145958&view=diff
==============================================================================
--- cfe/trunk/lib/Lex/ModuleMap.cpp (original)
+++ cfe/trunk/lib/Lex/ModuleMap.cpp Tue Dec  6 13:57:48 2011
@@ -603,8 +603,7 @@
   
   // Parse 'module' keyword.
   if (!Tok.is(MMToken::ModuleKeyword)) {
-    Diags.Report(Tok.getLocation(), 
-                 diag::err_mmap_expected_module_after_explicit);
+    Diags.Report(Tok.getLocation(), diag::err_mmap_expected_module);
     consumeToken();
     HadError = true;
     return;