<div dir="ltr">Hey Richard,<br><br>Thanks for cleaning up some of the layering here!<br><br>I /think/ I vaguely recall having a conversation with Richard Smith about a different direction to fix the layering of the diagnostics system - but it was/is more involved. Ah, here, apparently I sent out a WIP patch & must've got engaged in other things: <a href="https://reviews.llvm.org/D41357">https://reviews.llvm.org/D41357</a> - not sure if this is a better/workable/useful way forward, or whether we should go with sinking the specific diagnostics into the Diagnostics library as you've done/started doing here (I don't have much context in my head right now, so I forget exactly what's involved in fully pushing them all down into Diagnostics).<br><br>Just some thoughts/directions/ideas,<br>- Dave<br><br><div class="gmail_quote"><div dir="ltr">On Fri, Dec 7, 2018 at 9:07 PM Richard Trieu via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rtrieu<br>
Date: Fri Dec 7 21:05:03 2018<br>
New Revision: 348685<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=348685&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=348685&view=rev</a><br>
Log:<br>
Move diagnostic enums into Basic.<br>
<br>
Move enums from */*Diagnostic.h to Basic/Diagnostic*.h. Basic/AllDiagnostics.h<br>
needs all the enums and moving the sources to Basic prevents a Basic->*->Basic<br>
dependency loop. This also allows each Basic/Diagnostics*Kinds.td to have a<br>
header at Basic/Diagnostic*.h (except for Common). The old headers are kept in place since other packages are still using them.<br>
<br>
Added:<br>
cfe/trunk/include/clang/Basic/DiagnosticAST.h<br>
- copied, changed from r348541, cfe/trunk/include/clang/AST/ASTDiagnostic.h<br>
cfe/trunk/include/clang/Basic/DiagnosticAnalysis.h<br>
- copied, changed from r348541, cfe/trunk/include/clang/Analysis/AnalysisDiagnostic.h<br>
cfe/trunk/include/clang/Basic/DiagnosticComment.h<br>
- copied, changed from r348541, cfe/trunk/include/clang/AST/CommentDiagnostic.h<br>
cfe/trunk/include/clang/Basic/DiagnosticCrossTU.h<br>
- copied, changed from r348541, cfe/trunk/include/clang/CrossTU/CrossTUDiagnostic.h<br>
cfe/trunk/include/clang/Basic/DiagnosticDriver.h<br>
- copied, changed from r348541, cfe/trunk/include/clang/Driver/DriverDiagnostic.h<br>
cfe/trunk/include/clang/Basic/DiagnosticFrontend.h<br>
- copied, changed from r348541, cfe/trunk/include/clang/Frontend/FrontendDiagnostic.h<br>
cfe/trunk/include/clang/Basic/DiagnosticLex.h<br>
- copied, changed from r348541, cfe/trunk/include/clang/Lex/LexDiagnostic.h<br>
cfe/trunk/include/clang/Basic/DiagnosticParse.h<br>
- copied, changed from r348541, cfe/trunk/include/clang/Parse/ParseDiagnostic.h<br>
cfe/trunk/include/clang/Basic/DiagnosticRefactoring.h<br>
- copied, changed from r348541, cfe/trunk/include/clang/Tooling/Refactoring/RefactoringDiagnostic.h<br>
cfe/trunk/include/clang/Basic/DiagnosticSema.h<br>
- copied, changed from r348541, cfe/trunk/include/clang/Sema/SemaDiagnostic.h<br>
cfe/trunk/include/clang/Basic/DiagnosticSerialization.h<br>
- copied, changed from r348541, cfe/trunk/include/clang/Serialization/SerializationDiagnostic.h<br>
Modified:<br>
cfe/trunk/include/clang/AST/ASTDiagnostic.h<br>
cfe/trunk/include/clang/AST/CommentDiagnostic.h<br>
cfe/trunk/include/clang/Analysis/AnalysisDiagnostic.h<br>
cfe/trunk/include/clang/Basic/AllDiagnostics.h<br>
cfe/trunk/include/clang/CrossTU/CrossTUDiagnostic.h<br>
cfe/trunk/include/clang/Driver/DriverDiagnostic.h<br>
cfe/trunk/include/clang/Frontend/FrontendDiagnostic.h<br>
cfe/trunk/include/clang/Lex/LexDiagnostic.h<br>
cfe/trunk/include/clang/Parse/ParseDiagnostic.h<br>
cfe/trunk/include/clang/Sema/SemaDiagnostic.h<br>
cfe/trunk/include/clang/Serialization/SerializationDiagnostic.h<br>
cfe/trunk/include/clang/Tooling/Refactoring/RefactoringDiagnostic.h<br>
<br>
Modified: cfe/trunk/include/clang/AST/ASTDiagnostic.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/ASTDiagnostic.h?rev=348685&r1=348684&r2=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/ASTDiagnostic.h?rev=348685&r1=348684&r2=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/ASTDiagnostic.h (original)<br>
+++ cfe/trunk/include/clang/AST/ASTDiagnostic.h Fri Dec 7 21:05:03 2018<br>
@@ -11,19 +11,9 @@<br>
#define LLVM_CLANG_AST_ASTDIAGNOSTIC_H<br>
<br>
#include "clang/Basic/Diagnostic.h"<br>
+#include "clang/Basic/DiagnosticAST.h"<br>
<br>
namespace clang {<br>
- namespace diag {<br>
- enum {<br>
-#define DIAG(ENUM,FLAGS,DEFAULT_MAPPING,DESC,GROUP,\<br>
- SFINAE,NOWERROR,SHOWINSYSHEADER,CATEGORY) ENUM,<br>
-#define ASTSTART<br>
-#include "clang/Basic/DiagnosticASTKinds.inc"<br>
-#undef DIAG<br>
- NUM_BUILTIN_AST_DIAGNOSTICS<br>
- };<br>
- } // end namespace diag<br>
-<br>
/// DiagnosticsEngine argument formatting function for diagnostics that<br>
/// involve AST nodes.<br>
///<br>
<br>
Modified: cfe/trunk/include/clang/AST/CommentDiagnostic.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/CommentDiagnostic.h?rev=348685&r1=348684&r2=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/CommentDiagnostic.h?rev=348685&r1=348684&r2=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/CommentDiagnostic.h (original)<br>
+++ cfe/trunk/include/clang/AST/CommentDiagnostic.h Fri Dec 7 21:05:03 2018<br>
@@ -10,20 +10,7 @@<br>
#ifndef LLVM_CLANG_AST_COMMENTDIAGNOSTIC_H<br>
#define LLVM_CLANG_AST_COMMENTDIAGNOSTIC_H<br>
<br>
-#include "clang/Basic/Diagnostic.h"<br>
-<br>
-namespace clang {<br>
- namespace diag {<br>
- enum {<br>
-#define DIAG(ENUM,FLAGS,DEFAULT_MAPPING,DESC,GROUP,\<br>
- SFINAE,NOWERROR,SHOWINSYSHEADER,CATEGORY) ENUM,<br>
-#define COMMENTSTART<br>
-#include "clang/Basic/DiagnosticCommentKinds.inc"<br>
-#undef DIAG<br>
- NUM_BUILTIN_COMMENT_DIAGNOSTICS<br>
- };<br>
- } // end namespace diag<br>
-} // end namespace clang<br>
+#include "clang/Basic/DiagnosticComment.h"<br>
<br>
#endif<br>
<br>
<br>
Modified: cfe/trunk/include/clang/Analysis/AnalysisDiagnostic.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/AnalysisDiagnostic.h?rev=348685&r1=348684&r2=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/AnalysisDiagnostic.h?rev=348685&r1=348684&r2=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Analysis/AnalysisDiagnostic.h (original)<br>
+++ cfe/trunk/include/clang/Analysis/AnalysisDiagnostic.h Fri Dec 7 21:05:03 2018<br>
@@ -10,19 +10,6 @@<br>
#ifndef LLVM_CLANG_ANALYSIS_ANALYSISDIAGNOSTIC_H<br>
#define LLVM_CLANG_ANALYSIS_ANALYSISDIAGNOSTIC_H<br>
<br>
-#include "clang/Basic/Diagnostic.h"<br>
-<br>
-namespace clang {<br>
- namespace diag {<br>
- enum {<br>
-#define DIAG(ENUM,FLAGS,DEFAULT_MAPPING,DESC,GROUP,\<br>
- SFINAE,NOWERROR,SHOWINSYSHEADER,CATEGORY) ENUM,<br>
-#define ANALYSISSTART<br>
-#include "clang/Basic/DiagnosticAnalysisKinds.inc"<br>
-#undef DIAG<br>
- NUM_BUILTIN_ANALYSIS_DIAGNOSTICS<br>
- };<br>
- } // end namespace diag<br>
-} // end namespace clang<br>
+#include "clang/Basic/DiagnosticAnalysis.h"<br>
<br>
#endif<br>
<br>
Modified: cfe/trunk/include/clang/Basic/AllDiagnostics.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/AllDiagnostics.h?rev=348685&r1=348684&r2=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/AllDiagnostics.h?rev=348685&r1=348684&r2=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/AllDiagnostics.h (original)<br>
+++ cfe/trunk/include/clang/Basic/AllDiagnostics.h Fri Dec 7 21:05:03 2018<br>
@@ -15,17 +15,17 @@<br>
#ifndef LLVM_CLANG_BASIC_ALLDIAGNOSTICS_H<br>
#define LLVM_CLANG_BASIC_ALLDIAGNOSTICS_H<br>
<br>
-#include "clang/AST/ASTDiagnostic.h"<br>
-#include "clang/AST/CommentDiagnostic.h"<br>
-#include "clang/Analysis/AnalysisDiagnostic.h"<br>
-#include "clang/CrossTU/CrossTUDiagnostic.h"<br>
-#include "clang/Driver/DriverDiagnostic.h"<br>
-#include "clang/Frontend/FrontendDiagnostic.h"<br>
-#include "clang/Lex/LexDiagnostic.h"<br>
-#include "clang/Parse/ParseDiagnostic.h"<br>
-#include "clang/Sema/SemaDiagnostic.h"<br>
-#include "clang/Serialization/SerializationDiagnostic.h"<br>
-#include "clang/Tooling/Refactoring/RefactoringDiagnostic.h"<br>
+#include "clang/Basic/DiagnosticAST.h"<br>
+#include "clang/Basic/DiagnosticAnalysis.h"<br>
+#include "clang/Basic/DiagnosticComment.h"<br>
+#include "clang/Basic/DiagnosticCrossTU.h"<br>
+#include "clang/Basic/DiagnosticDriver.h"<br>
+#include "clang/Basic/DiagnosticFrontend.h"<br>
+#include "clang/Basic/DiagnosticLex.h"<br>
+#include "clang/Basic/DiagnosticParse.h"<br>
+#include "clang/Basic/DiagnosticSema.h"<br>
+#include "clang/Basic/DiagnosticSerialization.h"<br>
+#include "clang/Basic/DiagnosticRefactoring.h"<br>
<br>
namespace clang {<br>
template <size_t SizeOfStr, typename FieldType><br>
<br>
Copied: cfe/trunk/include/clang/Basic/DiagnosticAST.h (from r348541, cfe/trunk/include/clang/AST/ASTDiagnostic.h)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticAST.h?p2=cfe/trunk/include/clang/Basic/DiagnosticAST.h&p1=cfe/trunk/include/clang/AST/ASTDiagnostic.h&r1=348541&r2=348685&rev=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticAST.h?p2=cfe/trunk/include/clang/Basic/DiagnosticAST.h&p1=cfe/trunk/include/clang/AST/ASTDiagnostic.h&r1=348541&r2=348685&rev=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/ASTDiagnostic.h (original)<br>
+++ cfe/trunk/include/clang/Basic/DiagnosticAST.h Fri Dec 7 21:05:03 2018<br>
@@ -1,4 +1,4 @@<br>
-//===--- ASTDiagnostic.h - Diagnostics for the AST library ------*- C++ -*-===//<br>
+//===--- DiagnosticAST.h - Diagnostics for the AST library ------*- C++ -*-===//<br>
//<br>
// The LLVM Compiler Infrastructure<br>
//<br>
@@ -7,41 +7,23 @@<br>
//<br>
//===----------------------------------------------------------------------===//<br>
<br>
-#ifndef LLVM_CLANG_AST_ASTDIAGNOSTIC_H<br>
-#define LLVM_CLANG_AST_ASTDIAGNOSTIC_H<br>
+#ifndef LLVM_CLANG_BASIC_DIAGNOSTICAST_H<br>
+#define LLVM_CLANG_BASIC_DIAGNOSTICAST_H<br>
<br>
#include "clang/Basic/Diagnostic.h"<br>
<br>
namespace clang {<br>
- namespace diag {<br>
- enum {<br>
-#define DIAG(ENUM,FLAGS,DEFAULT_MAPPING,DESC,GROUP,\<br>
- SFINAE,NOWERROR,SHOWINSYSHEADER,CATEGORY) ENUM,<br>
+namespace diag {<br>
+enum {<br>
+#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, NOWERROR, \<br>
+ SHOWINSYSHEADER, CATEGORY) \<br>
+ ENUM,<br>
#define ASTSTART<br>
#include "clang/Basic/DiagnosticASTKinds.inc"<br>
#undef DIAG<br>
- NUM_BUILTIN_AST_DIAGNOSTICS<br>
- };<br>
- } // end namespace diag<br>
+ NUM_BUILTIN_AST_DIAGNOSTICS<br>
+};<br>
+} // end namespace diag<br>
+} // end namespace clang<br>
<br>
- /// DiagnosticsEngine argument formatting function for diagnostics that<br>
- /// involve AST nodes.<br>
- ///<br>
- /// This function formats diagnostic arguments for various AST nodes,<br>
- /// including types, declaration names, nested name specifiers, and<br>
- /// declaration contexts, into strings that can be printed as part of<br>
- /// diagnostics. It is meant to be used as the argument to<br>
- /// \c DiagnosticsEngine::SetArgToStringFn(), where the cookie is an \c<br>
- /// ASTContext pointer.<br>
- void FormatASTNodeDiagnosticArgument(<br>
- DiagnosticsEngine::ArgumentKind Kind,<br>
- intptr_t Val,<br>
- StringRef Modifier,<br>
- StringRef Argument,<br>
- ArrayRef<DiagnosticsEngine::ArgumentValue> PrevArgs,<br>
- SmallVectorImpl<char> &Output,<br>
- void *Cookie,<br>
- ArrayRef<intptr_t> QualTypeVals);<br>
-} // end namespace clang<br>
-<br>
-#endif<br>
+#endif // LLVM_CLANG_BASIC_DIAGNOSTICAST_H<br>
<br>
Copied: cfe/trunk/include/clang/Basic/DiagnosticAnalysis.h (from r348541, cfe/trunk/include/clang/Analysis/AnalysisDiagnostic.h)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticAnalysis.h?p2=cfe/trunk/include/clang/Basic/DiagnosticAnalysis.h&p1=cfe/trunk/include/clang/Analysis/AnalysisDiagnostic.h&r1=348541&r2=348685&rev=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticAnalysis.h?p2=cfe/trunk/include/clang/Basic/DiagnosticAnalysis.h&p1=cfe/trunk/include/clang/Analysis/AnalysisDiagnostic.h&r1=348541&r2=348685&rev=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Analysis/AnalysisDiagnostic.h (original)<br>
+++ cfe/trunk/include/clang/Basic/DiagnosticAnalysis.h Fri Dec 7 21:05:03 2018<br>
@@ -7,22 +7,23 @@<br>
//<br>
//===----------------------------------------------------------------------===//<br>
<br>
-#ifndef LLVM_CLANG_ANALYSIS_ANALYSISDIAGNOSTIC_H<br>
-#define LLVM_CLANG_ANALYSIS_ANALYSISDIAGNOSTIC_H<br>
+#ifndef LLVM_CLANG_BASIC_DIAGNOSTICANALYSIS_H<br>
+#define LLVM_CLANG_BASIC_DIAGNOSTICANALYSIS_H<br>
<br>
#include "clang/Basic/Diagnostic.h"<br>
<br>
namespace clang {<br>
- namespace diag {<br>
- enum {<br>
-#define DIAG(ENUM,FLAGS,DEFAULT_MAPPING,DESC,GROUP,\<br>
- SFINAE,NOWERROR,SHOWINSYSHEADER,CATEGORY) ENUM,<br>
+namespace diag {<br>
+enum {<br>
+#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, NOWERROR, \<br>
+ SHOWINSYSHEADER, CATEGORY) \<br>
+ ENUM,<br>
#define ANALYSISSTART<br>
#include "clang/Basic/DiagnosticAnalysisKinds.inc"<br>
#undef DIAG<br>
- NUM_BUILTIN_ANALYSIS_DIAGNOSTICS<br>
- };<br>
- } // end namespace diag<br>
-} // end namespace clang<br>
+ NUM_BUILTIN_ANALYSIS_DIAGNOSTICS<br>
+};<br>
+} // end namespace diag<br>
+} // end namespace clang<br>
<br>
-#endif<br>
+#endif // LLVM_CLANG_BASIC_DIAGNOSTICANALYSIS_H<br>
<br>
Copied: cfe/trunk/include/clang/Basic/DiagnosticComment.h (from r348541, cfe/trunk/include/clang/AST/CommentDiagnostic.h)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticComment.h?p2=cfe/trunk/include/clang/Basic/DiagnosticComment.h&p1=cfe/trunk/include/clang/AST/CommentDiagnostic.h&r1=348541&r2=348685&rev=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticComment.h?p2=cfe/trunk/include/clang/Basic/DiagnosticComment.h&p1=cfe/trunk/include/clang/AST/CommentDiagnostic.h&r1=348541&r2=348685&rev=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/CommentDiagnostic.h (original)<br>
+++ cfe/trunk/include/clang/Basic/DiagnosticComment.h Fri Dec 7 21:05:03 2018<br>
@@ -1,4 +1,4 @@<br>
-//===--- CommentDiagnostic.h - Diagnostics for the AST library --*- C++ -*-===//<br>
+//===--- DiagnosticComment.h - Diagnostics for the AST library --*- C++ -*-===//<br>
//<br>
// The LLVM Compiler Infrastructure<br>
//<br>
@@ -7,23 +7,23 @@<br>
//<br>
//===----------------------------------------------------------------------===//<br>
<br>
-#ifndef LLVM_CLANG_AST_COMMENTDIAGNOSTIC_H<br>
-#define LLVM_CLANG_AST_COMMENTDIAGNOSTIC_H<br>
+#ifndef LLVM_CLANG_BASIC_DIAGNOSTICCOMMENT_H<br>
+#define LLVM_CLANG_BASIC_DIAGNOSTICCOMMENT_H<br>
<br>
#include "clang/Basic/Diagnostic.h"<br>
<br>
namespace clang {<br>
- namespace diag {<br>
- enum {<br>
-#define DIAG(ENUM,FLAGS,DEFAULT_MAPPING,DESC,GROUP,\<br>
- SFINAE,NOWERROR,SHOWINSYSHEADER,CATEGORY) ENUM,<br>
+namespace diag {<br>
+enum {<br>
+#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, NOWERROR, \<br>
+ SHOWINSYSHEADER, CATEGORY) \<br>
+ ENUM,<br>
#define COMMENTSTART<br>
#include "clang/Basic/DiagnosticCommentKinds.inc"<br>
#undef DIAG<br>
- NUM_BUILTIN_COMMENT_DIAGNOSTICS<br>
- };<br>
- } // end namespace diag<br>
-} // end namespace clang<br>
-<br>
-#endif<br>
+ NUM_BUILTIN_COMMENT_DIAGNOSTICS<br>
+};<br>
+} // end namespace diag<br>
+} // end namespace clang<br>
<br>
+#endif // LLVM_CLANG_BASIC_DIAGNOSTICCOMMENT_H<br>
<br>
Copied: cfe/trunk/include/clang/Basic/DiagnosticCrossTU.h (from r348541, cfe/trunk/include/clang/CrossTU/CrossTUDiagnostic.h)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticCrossTU.h?p2=cfe/trunk/include/clang/Basic/DiagnosticCrossTU.h&p1=cfe/trunk/include/clang/CrossTU/CrossTUDiagnostic.h&r1=348541&r2=348685&rev=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticCrossTU.h?p2=cfe/trunk/include/clang/Basic/DiagnosticCrossTU.h&p1=cfe/trunk/include/clang/CrossTU/CrossTUDiagnostic.h&r1=348541&r2=348685&rev=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/CrossTU/CrossTUDiagnostic.h (original)<br>
+++ cfe/trunk/include/clang/Basic/DiagnosticCrossTU.h Fri Dec 7 21:05:03 2018<br>
@@ -1,4 +1,4 @@<br>
-//===--- CrossTUDiagnostic.h - Diagnostics for Cross TU ---------*- C++ -*-===//<br>
+//===--- DiagnosticCrossTU.h - Diagnostics for Cross TU ---------*- C++ -*-===//<br>
//<br>
// The LLVM Compiler Infrastructure<br>
//<br>
@@ -7,8 +7,8 @@<br>
//<br>
//===----------------------------------------------------------------------===//<br>
<br>
-#ifndef LLVM_CLANG_CROSSTU_CROSSTUDIAGNOSTIC_H<br>
-#define LLVM_CLANG_CROSSTU_CROSSTUDIAGNOSTIC_H<br>
+#ifndef LLVM_CLANG_BASIC_DIAGNOSTICCROSSTU_H<br>
+#define LLVM_CLANG_BASIC_DIAGNOSTICCROSSTU_H<br>
<br>
#include "clang/Basic/Diagnostic.h"<br>
<br>
@@ -26,4 +26,4 @@ enum {<br>
} // end namespace diag<br>
} // end namespace clang<br>
<br>
-#endif // LLVM_CLANG_FRONTEND_FRONTENDDIAGNOSTIC_H<br>
+#endif // LLVM_CLANG_BASIC_DIAGNOSTICCROSSTU_H<br>
<br>
Copied: cfe/trunk/include/clang/Basic/DiagnosticDriver.h (from r348541, cfe/trunk/include/clang/Driver/DriverDiagnostic.h)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticDriver.h?p2=cfe/trunk/include/clang/Basic/DiagnosticDriver.h&p1=cfe/trunk/include/clang/Driver/DriverDiagnostic.h&r1=348541&r2=348685&rev=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticDriver.h?p2=cfe/trunk/include/clang/Basic/DiagnosticDriver.h&p1=cfe/trunk/include/clang/Driver/DriverDiagnostic.h&r1=348541&r2=348685&rev=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Driver/DriverDiagnostic.h (original)<br>
+++ cfe/trunk/include/clang/Basic/DiagnosticDriver.h Fri Dec 7 21:05:03 2018<br>
@@ -7,22 +7,23 @@<br>
//<br>
//===----------------------------------------------------------------------===//<br>
<br>
-#ifndef LLVM_CLANG_DRIVER_DRIVERDIAGNOSTIC_H<br>
-#define LLVM_CLANG_DRIVER_DRIVERDIAGNOSTIC_H<br>
+#ifndef LLVM_CLANG_BASIC_DIAGNOSTICDRIVER_H<br>
+#define LLVM_CLANG_BASIC_DIAGNOSTICDRIVER_H<br>
<br>
#include "clang/Basic/Diagnostic.h"<br>
<br>
namespace clang {<br>
- namespace diag {<br>
- enum {<br>
-#define DIAG(ENUM,FLAGS,DEFAULT_MAPPING,DESC,GROUP,\<br>
- SFINAE,NOWERROR,SHOWINSYSHEADER,CATEGORY) ENUM,<br>
+namespace diag {<br>
+enum {<br>
+#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, NOWERROR, \<br>
+ SHOWINSYSHEADER, CATEGORY) \<br>
+ ENUM,<br>
#define DRIVERSTART<br>
#include "clang/Basic/DiagnosticDriverKinds.inc"<br>
#undef DIAG<br>
- NUM_BUILTIN_DRIVER_DIAGNOSTICS<br>
- };<br>
- } // end namespace diag<br>
-} // end namespace clang<br>
+ NUM_BUILTIN_DRIVER_DIAGNOSTICS<br>
+};<br>
+} // end namespace diag<br>
+} // end namespace clang<br>
<br>
-#endif<br>
+#endif // LLVM_CLANG_BASIC_DIAGNOSTICDRIVER_H<br>
<br>
Copied: cfe/trunk/include/clang/Basic/DiagnosticFrontend.h (from r348541, cfe/trunk/include/clang/Frontend/FrontendDiagnostic.h)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticFrontend.h?p2=cfe/trunk/include/clang/Basic/DiagnosticFrontend.h&p1=cfe/trunk/include/clang/Frontend/FrontendDiagnostic.h&r1=348541&r2=348685&rev=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticFrontend.h?p2=cfe/trunk/include/clang/Basic/DiagnosticFrontend.h&p1=cfe/trunk/include/clang/Frontend/FrontendDiagnostic.h&r1=348541&r2=348685&rev=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Frontend/FrontendDiagnostic.h (original)<br>
+++ cfe/trunk/include/clang/Basic/DiagnosticFrontend.h Fri Dec 7 21:05:03 2018<br>
@@ -7,22 +7,23 @@<br>
//<br>
//===----------------------------------------------------------------------===//<br>
<br>
-#ifndef LLVM_CLANG_FRONTEND_FRONTENDDIAGNOSTIC_H<br>
-#define LLVM_CLANG_FRONTEND_FRONTENDDIAGNOSTIC_H<br>
+#ifndef LLVM_CLANG_BASIC_DIAGNOSTICFRONTEND_H<br>
+#define LLVM_CLANG_BASIC_DIAGNOSTICFRONTEND_H<br>
<br>
#include "clang/Basic/Diagnostic.h"<br>
<br>
namespace clang {<br>
- namespace diag {<br>
- enum {<br>
-#define DIAG(ENUM,FLAGS,DEFAULT_MAPPING,DESC,GROUP,\<br>
- SFINAE,NOWERROR,SHOWINSYSHEADER,CATEGORY) ENUM,<br>
+namespace diag {<br>
+enum {<br>
+#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, NOWERROR, \<br>
+ SHOWINSYSHEADER, CATEGORY) \<br>
+ ENUM,<br>
#define FRONTENDSTART<br>
#include "clang/Basic/DiagnosticFrontendKinds.inc"<br>
#undef DIAG<br>
- NUM_BUILTIN_FRONTEND_DIAGNOSTICS<br>
- };<br>
- } // end namespace diag<br>
-} // end namespace clang<br>
+ NUM_BUILTIN_FRONTEND_DIAGNOSTICS<br>
+};<br>
+} // end namespace diag<br>
+} // end namespace clang<br>
<br>
-#endif<br>
+#endif // LLVM_CLANG_BASIC_DIAGNOSTICFRONTEND_H<br>
<br>
Copied: cfe/trunk/include/clang/Basic/DiagnosticLex.h (from r348541, cfe/trunk/include/clang/Lex/LexDiagnostic.h)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticLex.h?p2=cfe/trunk/include/clang/Basic/DiagnosticLex.h&p1=cfe/trunk/include/clang/Lex/LexDiagnostic.h&r1=348541&r2=348685&rev=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticLex.h?p2=cfe/trunk/include/clang/Basic/DiagnosticLex.h&p1=cfe/trunk/include/clang/Lex/LexDiagnostic.h&r1=348541&r2=348685&rev=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Lex/LexDiagnostic.h (original)<br>
+++ cfe/trunk/include/clang/Basic/DiagnosticLex.h Fri Dec 7 21:05:03 2018<br>
@@ -7,22 +7,23 @@<br>
//<br>
//===----------------------------------------------------------------------===//<br>
<br>
-#ifndef LLVM_CLANG_LEX_LEXDIAGNOSTIC_H<br>
-#define LLVM_CLANG_LEX_LEXDIAGNOSTIC_H<br>
+#ifndef LLVM_CLANG_BASIC_DIAGNOSTICLEX_H<br>
+#define LLVM_CLANG_BASIC_DIAGNOSTICLEX_H<br>
<br>
#include "clang/Basic/Diagnostic.h"<br>
<br>
namespace clang {<br>
- namespace diag {<br>
- enum {<br>
-#define DIAG(ENUM,FLAGS,DEFAULT_MAPPING,DESC,GROUP,\<br>
- SFINAE,NOWERROR,SHOWINSYSHEADER,CATEGORY) ENUM,<br>
+namespace diag {<br>
+enum {<br>
+#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, NOWERROR, \<br>
+ SHOWINSYSHEADER, CATEGORY) \<br>
+ ENUM,<br>
#define LEXSTART<br>
#include "clang/Basic/DiagnosticLexKinds.inc"<br>
#undef DIAG<br>
- NUM_BUILTIN_LEX_DIAGNOSTICS<br>
- };<br>
- } // end namespace diag<br>
-} // end namespace clang<br>
+ NUM_BUILTIN_LEX_DIAGNOSTICS<br>
+};<br>
+} // end namespace diag<br>
+} // end namespace clang<br>
<br>
-#endif<br>
+#endif // LLVM_CLANG_BASIC_DIAGNOSTICLEX_H<br>
<br>
Copied: cfe/trunk/include/clang/Basic/DiagnosticParse.h (from r348541, cfe/trunk/include/clang/Parse/ParseDiagnostic.h)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticParse.h?p2=cfe/trunk/include/clang/Basic/DiagnosticParse.h&p1=cfe/trunk/include/clang/Parse/ParseDiagnostic.h&r1=348541&r2=348685&rev=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticParse.h?p2=cfe/trunk/include/clang/Basic/DiagnosticParse.h&p1=cfe/trunk/include/clang/Parse/ParseDiagnostic.h&r1=348541&r2=348685&rev=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Parse/ParseDiagnostic.h (original)<br>
+++ cfe/trunk/include/clang/Basic/DiagnosticParse.h Fri Dec 7 21:05:03 2018<br>
@@ -7,22 +7,23 @@<br>
//<br>
//===----------------------------------------------------------------------===//<br>
<br>
-#ifndef LLVM_CLANG_PARSE_PARSEDIAGNOSTIC_H<br>
-#define LLVM_CLANG_PARSE_PARSEDIAGNOSTIC_H<br>
+#ifndef LLVM_CLANG_BASIC_DIAGNOSTICPARSE_H<br>
+#define LLVM_CLANG_BASIC_DIAGNOSTICPARSE_H<br>
<br>
#include "clang/Basic/Diagnostic.h"<br>
<br>
namespace clang {<br>
- namespace diag {<br>
- enum {<br>
-#define DIAG(ENUM,FLAGS,DEFAULT_MAPPING,DESC,GROUP,\<br>
- SFINAE,NOWERROR,SHOWINSYSHEADER,CATEGORY) ENUM,<br>
+namespace diag {<br>
+enum {<br>
+#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, NOWERROR, \<br>
+ SHOWINSYSHEADER, CATEGORY) \<br>
+ ENUM,<br>
#define PARSESTART<br>
#include "clang/Basic/DiagnosticParseKinds.inc"<br>
#undef DIAG<br>
- NUM_BUILTIN_PARSE_DIAGNOSTICS<br>
- };<br>
- } // end namespace diag<br>
-} // end namespace clang<br>
+ NUM_BUILTIN_PARSE_DIAGNOSTICS<br>
+};<br>
+} // end namespace diag<br>
+} // end namespace clang<br>
<br>
-#endif<br>
+#endif // LLVM_CLANG_BASIC_DIAGNOSTICPARSE_H<br>
<br>
Copied: cfe/trunk/include/clang/Basic/DiagnosticRefactoring.h (from r348541, cfe/trunk/include/clang/Tooling/Refactoring/RefactoringDiagnostic.h)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticRefactoring.h?p2=cfe/trunk/include/clang/Basic/DiagnosticRefactoring.h&p1=cfe/trunk/include/clang/Tooling/Refactoring/RefactoringDiagnostic.h&r1=348541&r2=348685&rev=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticRefactoring.h?p2=cfe/trunk/include/clang/Basic/DiagnosticRefactoring.h&p1=cfe/trunk/include/clang/Tooling/Refactoring/RefactoringDiagnostic.h&r1=348541&r2=348685&rev=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Tooling/Refactoring/RefactoringDiagnostic.h (original)<br>
+++ cfe/trunk/include/clang/Basic/DiagnosticRefactoring.h Fri Dec 7 21:05:03 2018<br>
@@ -1,4 +1,4 @@<br>
-//===--- RefactoringDiagnostic.h - ------------------------------*- C++ -*-===//<br>
+//===--- DiagnosticRefactoring.h - ------------------------------*- C++ -*-===//<br>
//<br>
// The LLVM Compiler Infrastructure<br>
//<br>
@@ -7,11 +7,10 @@<br>
//<br>
//===----------------------------------------------------------------------===//<br>
<br>
-#ifndef LLVM_CLANG_TOOLING_REFACTORING_REFACTORINGDIAGNOSTIC_H<br>
-#define LLVM_CLANG_TOOLING_REFACTORING_REFACTORINGDIAGNOSTIC_H<br>
+#ifndef LLVM_CLANG_BASIC_DIAGNOSTICREFACTORING_H<br>
+#define LLVM_CLANG_BASIC_DIAGNOSTICREFACTORING_H<br>
<br>
#include "clang/Basic/Diagnostic.h"<br>
-#include "clang/Basic/PartialDiagnostic.h"<br>
<br>
namespace clang {<br>
namespace diag {<br>
@@ -27,4 +26,4 @@ enum {<br>
} // end namespace diag<br>
} // end namespace clang<br>
<br>
-#endif // LLVM_CLANG_TOOLING_REFACTORING_REFACTORINGDIAGNOSTIC_H<br>
+#endif // LLVM_CLANG_BASIC_DIAGNOSTICREFACTORING_H<br>
<br>
Copied: cfe/trunk/include/clang/Basic/DiagnosticSema.h (from r348541, cfe/trunk/include/clang/Sema/SemaDiagnostic.h)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSema.h?p2=cfe/trunk/include/clang/Basic/DiagnosticSema.h&p1=cfe/trunk/include/clang/Sema/SemaDiagnostic.h&r1=348541&r2=348685&rev=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSema.h?p2=cfe/trunk/include/clang/Basic/DiagnosticSema.h&p1=cfe/trunk/include/clang/Sema/SemaDiagnostic.h&r1=348541&r2=348685&rev=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Sema/SemaDiagnostic.h (original)<br>
+++ cfe/trunk/include/clang/Basic/DiagnosticSema.h Fri Dec 7 21:05:03 2018<br>
@@ -7,22 +7,23 @@<br>
//<br>
//===----------------------------------------------------------------------===//<br>
<br>
-#ifndef LLVM_CLANG_SEMA_SEMADIAGNOSTIC_H<br>
-#define LLVM_CLANG_SEMA_SEMADIAGNOSTIC_H<br>
+#ifndef LLVM_CLANG_BASIC_DIAGNOSTICSEMA_H<br>
+#define LLVM_CLANG_BASIC_DIAGNOSTICSEMA_H<br>
<br>
#include "clang/Basic/Diagnostic.h"<br>
<br>
namespace clang {<br>
- namespace diag {<br>
- enum {<br>
-#define DIAG(ENUM,FLAGS,DEFAULT_MAPPING,DESC,GROUP,\<br>
- SFINAE,NOWERROR,SHOWINSYSHEADER,CATEGORY) ENUM,<br>
+namespace diag {<br>
+enum {<br>
+#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, NOWERROR, \<br>
+ SHOWINSYSHEADER, CATEGORY) \<br>
+ ENUM,<br>
#define SEMASTART<br>
#include "clang/Basic/DiagnosticSemaKinds.inc"<br>
#undef DIAG<br>
- NUM_BUILTIN_SEMA_DIAGNOSTICS<br>
- };<br>
- } // end namespace diag<br>
-} // end namespace clang<br>
+ NUM_BUILTIN_SEMA_DIAGNOSTICS<br>
+};<br>
+} // end namespace diag<br>
+} // end namespace clang<br>
<br>
-#endif<br>
+#endif // LLVM_CLANG_BASIC_DIAGNOSTICSEMA_H<br>
<br>
Copied: cfe/trunk/include/clang/Basic/DiagnosticSerialization.h (from r348541, cfe/trunk/include/clang/Serialization/SerializationDiagnostic.h)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSerialization.h?p2=cfe/trunk/include/clang/Basic/DiagnosticSerialization.h&p1=cfe/trunk/include/clang/Serialization/SerializationDiagnostic.h&r1=348541&r2=348685&rev=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSerialization.h?p2=cfe/trunk/include/clang/Basic/DiagnosticSerialization.h&p1=cfe/trunk/include/clang/Serialization/SerializationDiagnostic.h&r1=348541&r2=348685&rev=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Serialization/SerializationDiagnostic.h (original)<br>
+++ cfe/trunk/include/clang/Basic/DiagnosticSerialization.h Fri Dec 7 21:05:03 2018<br>
@@ -1,4 +1,4 @@<br>
-//===--- SerializationDiagnostic.h - Serialization Diagnostics -*- C++ -*-===//<br>
+//===--- DiagnosticSerialization.h - Serialization Diagnostics -*- C++ -*-===//<br>
//<br>
// The LLVM Compiler Infrastructure<br>
//<br>
@@ -7,22 +7,23 @@<br>
//<br>
//===----------------------------------------------------------------------===//<br>
<br>
-#ifndef LLVM_CLANG_SERIALIZATION_SERIALIZATIONDIAGNOSTIC_H<br>
-#define LLVM_CLANG_SERIALIZATION_SERIALIZATIONDIAGNOSTIC_H<br>
+#ifndef LLVM_CLANG_BASIC_DIAGNOSTICSERIALIZATION_H<br>
+#define LLVM_CLANG_BASIC_DIAGNOSTICSERIALIZATION_H<br>
<br>
#include "clang/Basic/Diagnostic.h"<br>
<br>
namespace clang {<br>
- namespace diag {<br>
- enum {<br>
-#define DIAG(ENUM,FLAGS,DEFAULT_MAPPING,DESC,GROUP,\<br>
- SFINAE,NOWERROR,SHOWINSYSHEADER,CATEGORY) ENUM,<br>
+namespace diag {<br>
+enum {<br>
+#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, NOWERROR, \<br>
+ SHOWINSYSHEADER, CATEGORY) \<br>
+ ENUM,<br>
#define SERIALIZATIONSTART<br>
#include "clang/Basic/DiagnosticSerializationKinds.inc"<br>
#undef DIAG<br>
- NUM_BUILTIN_SERIALIZATION_DIAGNOSTICS<br>
- };<br>
- } // end namespace diag<br>
-} // end namespace clang<br>
+ NUM_BUILTIN_SERIALIZATION_DIAGNOSTICS<br>
+};<br>
+} // end namespace diag<br>
+} // end namespace clang<br>
<br>
-#endif<br>
+#endif // LLVM_CLANG_BASIC_DIAGNOSTICSERIALIZATION_H<br>
<br>
Modified: cfe/trunk/include/clang/CrossTU/CrossTUDiagnostic.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/CrossTU/CrossTUDiagnostic.h?rev=348685&r1=348684&r2=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/CrossTU/CrossTUDiagnostic.h?rev=348685&r1=348684&r2=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/CrossTU/CrossTUDiagnostic.h (original)<br>
+++ cfe/trunk/include/clang/CrossTU/CrossTUDiagnostic.h Fri Dec 7 21:05:03 2018<br>
@@ -10,20 +10,6 @@<br>
#ifndef LLVM_CLANG_CROSSTU_CROSSTUDIAGNOSTIC_H<br>
#define LLVM_CLANG_CROSSTU_CROSSTUDIAGNOSTIC_H<br>
<br>
-#include "clang/Basic/Diagnostic.h"<br>
+#include "clang/Basic/DiagnosticCrossTU.h"<br>
<br>
-namespace clang {<br>
-namespace diag {<br>
-enum {<br>
-#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, NOWERROR, \<br>
- SHOWINSYSHEADER, CATEGORY) \<br>
- ENUM,<br>
-#define CROSSTUSTART<br>
-#include "clang/Basic/DiagnosticCrossTUKinds.inc"<br>
-#undef DIAG<br>
- NUM_BUILTIN_CROSSTU_DIAGNOSTICS<br>
-};<br>
-} // end namespace diag<br>
-} // end namespace clang<br>
-<br>
-#endif // LLVM_CLANG_FRONTEND_FRONTENDDIAGNOSTIC_H<br>
+#endif // LLVM_CLANG_CROSSTU_CROSSTUDIAGNOSTIC_H<br>
<br>
Modified: cfe/trunk/include/clang/Driver/DriverDiagnostic.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/DriverDiagnostic.h?rev=348685&r1=348684&r2=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/DriverDiagnostic.h?rev=348685&r1=348684&r2=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Driver/DriverDiagnostic.h (original)<br>
+++ cfe/trunk/include/clang/Driver/DriverDiagnostic.h Fri Dec 7 21:05:03 2018<br>
@@ -10,19 +10,6 @@<br>
#ifndef LLVM_CLANG_DRIVER_DRIVERDIAGNOSTIC_H<br>
#define LLVM_CLANG_DRIVER_DRIVERDIAGNOSTIC_H<br>
<br>
-#include "clang/Basic/Diagnostic.h"<br>
-<br>
-namespace clang {<br>
- namespace diag {<br>
- enum {<br>
-#define DIAG(ENUM,FLAGS,DEFAULT_MAPPING,DESC,GROUP,\<br>
- SFINAE,NOWERROR,SHOWINSYSHEADER,CATEGORY) ENUM,<br>
-#define DRIVERSTART<br>
-#include "clang/Basic/DiagnosticDriverKinds.inc"<br>
-#undef DIAG<br>
- NUM_BUILTIN_DRIVER_DIAGNOSTICS<br>
- };<br>
- } // end namespace diag<br>
-} // end namespace clang<br>
+#include "clang/Basic/DiagnosticDriver.h"<br>
<br>
#endif<br>
<br>
Modified: cfe/trunk/include/clang/Frontend/FrontendDiagnostic.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/FrontendDiagnostic.h?rev=348685&r1=348684&r2=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/FrontendDiagnostic.h?rev=348685&r1=348684&r2=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Frontend/FrontendDiagnostic.h (original)<br>
+++ cfe/trunk/include/clang/Frontend/FrontendDiagnostic.h Fri Dec 7 21:05:03 2018<br>
@@ -10,19 +10,6 @@<br>
#ifndef LLVM_CLANG_FRONTEND_FRONTENDDIAGNOSTIC_H<br>
#define LLVM_CLANG_FRONTEND_FRONTENDDIAGNOSTIC_H<br>
<br>
-#include "clang/Basic/Diagnostic.h"<br>
-<br>
-namespace clang {<br>
- namespace diag {<br>
- enum {<br>
-#define DIAG(ENUM,FLAGS,DEFAULT_MAPPING,DESC,GROUP,\<br>
- SFINAE,NOWERROR,SHOWINSYSHEADER,CATEGORY) ENUM,<br>
-#define FRONTENDSTART<br>
-#include "clang/Basic/DiagnosticFrontendKinds.inc"<br>
-#undef DIAG<br>
- NUM_BUILTIN_FRONTEND_DIAGNOSTICS<br>
- };<br>
- } // end namespace diag<br>
-} // end namespace clang<br>
+#include "clang/Basic/DiagnosticFrontend.h"<br>
<br>
#endif<br>
<br>
Modified: cfe/trunk/include/clang/Lex/LexDiagnostic.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Lex/LexDiagnostic.h?rev=348685&r1=348684&r2=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Lex/LexDiagnostic.h?rev=348685&r1=348684&r2=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Lex/LexDiagnostic.h (original)<br>
+++ cfe/trunk/include/clang/Lex/LexDiagnostic.h Fri Dec 7 21:05:03 2018<br>
@@ -10,19 +10,6 @@<br>
#ifndef LLVM_CLANG_LEX_LEXDIAGNOSTIC_H<br>
#define LLVM_CLANG_LEX_LEXDIAGNOSTIC_H<br>
<br>
-#include "clang/Basic/Diagnostic.h"<br>
-<br>
-namespace clang {<br>
- namespace diag {<br>
- enum {<br>
-#define DIAG(ENUM,FLAGS,DEFAULT_MAPPING,DESC,GROUP,\<br>
- SFINAE,NOWERROR,SHOWINSYSHEADER,CATEGORY) ENUM,<br>
-#define LEXSTART<br>
-#include "clang/Basic/DiagnosticLexKinds.inc"<br>
-#undef DIAG<br>
- NUM_BUILTIN_LEX_DIAGNOSTICS<br>
- };<br>
- } // end namespace diag<br>
-} // end namespace clang<br>
+#include "clang/Basic/DiagnosticLex.h"<br>
<br>
#endif<br>
<br>
Modified: cfe/trunk/include/clang/Parse/ParseDiagnostic.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Parse/ParseDiagnostic.h?rev=348685&r1=348684&r2=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Parse/ParseDiagnostic.h?rev=348685&r1=348684&r2=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Parse/ParseDiagnostic.h (original)<br>
+++ cfe/trunk/include/clang/Parse/ParseDiagnostic.h Fri Dec 7 21:05:03 2018<br>
@@ -10,19 +10,6 @@<br>
#ifndef LLVM_CLANG_PARSE_PARSEDIAGNOSTIC_H<br>
#define LLVM_CLANG_PARSE_PARSEDIAGNOSTIC_H<br>
<br>
-#include "clang/Basic/Diagnostic.h"<br>
-<br>
-namespace clang {<br>
- namespace diag {<br>
- enum {<br>
-#define DIAG(ENUM,FLAGS,DEFAULT_MAPPING,DESC,GROUP,\<br>
- SFINAE,NOWERROR,SHOWINSYSHEADER,CATEGORY) ENUM,<br>
-#define PARSESTART<br>
-#include "clang/Basic/DiagnosticParseKinds.inc"<br>
-#undef DIAG<br>
- NUM_BUILTIN_PARSE_DIAGNOSTICS<br>
- };<br>
- } // end namespace diag<br>
-} // end namespace clang<br>
+#include "clang/Basic/DiagnosticParse.h"<br>
<br>
#endif<br>
<br>
Modified: cfe/trunk/include/clang/Sema/SemaDiagnostic.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/SemaDiagnostic.h?rev=348685&r1=348684&r2=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/SemaDiagnostic.h?rev=348685&r1=348684&r2=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Sema/SemaDiagnostic.h (original)<br>
+++ cfe/trunk/include/clang/Sema/SemaDiagnostic.h Fri Dec 7 21:05:03 2018<br>
@@ -10,19 +10,6 @@<br>
#ifndef LLVM_CLANG_SEMA_SEMADIAGNOSTIC_H<br>
#define LLVM_CLANG_SEMA_SEMADIAGNOSTIC_H<br>
<br>
-#include "clang/Basic/Diagnostic.h"<br>
-<br>
-namespace clang {<br>
- namespace diag {<br>
- enum {<br>
-#define DIAG(ENUM,FLAGS,DEFAULT_MAPPING,DESC,GROUP,\<br>
- SFINAE,NOWERROR,SHOWINSYSHEADER,CATEGORY) ENUM,<br>
-#define SEMASTART<br>
-#include "clang/Basic/DiagnosticSemaKinds.inc"<br>
-#undef DIAG<br>
- NUM_BUILTIN_SEMA_DIAGNOSTICS<br>
- };<br>
- } // end namespace diag<br>
-} // end namespace clang<br>
+#include "clang/Basic/DiagnosticSema.h"<br>
<br>
#endif<br>
<br>
Modified: cfe/trunk/include/clang/Serialization/SerializationDiagnostic.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Serialization/SerializationDiagnostic.h?rev=348685&r1=348684&r2=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Serialization/SerializationDiagnostic.h?rev=348685&r1=348684&r2=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Serialization/SerializationDiagnostic.h (original)<br>
+++ cfe/trunk/include/clang/Serialization/SerializationDiagnostic.h Fri Dec 7 21:05:03 2018<br>
@@ -10,19 +10,6 @@<br>
#ifndef LLVM_CLANG_SERIALIZATION_SERIALIZATIONDIAGNOSTIC_H<br>
#define LLVM_CLANG_SERIALIZATION_SERIALIZATIONDIAGNOSTIC_H<br>
<br>
-#include "clang/Basic/Diagnostic.h"<br>
-<br>
-namespace clang {<br>
- namespace diag {<br>
- enum {<br>
-#define DIAG(ENUM,FLAGS,DEFAULT_MAPPING,DESC,GROUP,\<br>
- SFINAE,NOWERROR,SHOWINSYSHEADER,CATEGORY) ENUM,<br>
-#define SERIALIZATIONSTART<br>
-#include "clang/Basic/DiagnosticSerializationKinds.inc"<br>
-#undef DIAG<br>
- NUM_BUILTIN_SERIALIZATION_DIAGNOSTICS<br>
- };<br>
- } // end namespace diag<br>
-} // end namespace clang<br>
+#include "clang/Basic/DiagnosticSerialization.h"<br>
<br>
#endif<br>
<br>
Modified: cfe/trunk/include/clang/Tooling/Refactoring/RefactoringDiagnostic.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Tooling/Refactoring/RefactoringDiagnostic.h?rev=348685&r1=348684&r2=348685&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Tooling/Refactoring/RefactoringDiagnostic.h?rev=348685&r1=348684&r2=348685&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Tooling/Refactoring/RefactoringDiagnostic.h (original)<br>
+++ cfe/trunk/include/clang/Tooling/Refactoring/RefactoringDiagnostic.h Fri Dec 7 21:05:03 2018<br>
@@ -10,21 +10,6 @@<br>
#ifndef LLVM_CLANG_TOOLING_REFACTORING_REFACTORINGDIAGNOSTIC_H<br>
#define LLVM_CLANG_TOOLING_REFACTORING_REFACTORINGDIAGNOSTIC_H<br>
<br>
-#include "clang/Basic/Diagnostic.h"<br>
-#include "clang/Basic/PartialDiagnostic.h"<br>
-<br>
-namespace clang {<br>
-namespace diag {<br>
-enum {<br>
-#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, NOWERROR, \<br>
- SHOWINSYSHEADER, CATEGORY) \<br>
- ENUM,<br>
-#define REFACTORINGSTART<br>
-#include "clang/Basic/DiagnosticRefactoringKinds.inc"<br>
-#undef DIAG<br>
- NUM_BUILTIN_REFACTORING_DIAGNOSTICS<br>
-};<br>
-} // end namespace diag<br>
-} // end namespace clang<br>
+#include "clang/Basic/DiagnosticRefactoring.h"<br>
<br>
#endif // LLVM_CLANG_TOOLING_REFACTORING_REFACTORINGDIAGNOSTIC_H<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div></div>