diff options
Diffstat (limited to 'clang')
49 files changed, 64 insertions, 110 deletions
diff --git a/clang/Driver/clang.cpp b/clang/Driver/clang.cpp index fba2df13a37..f5bb058d088 100644 --- a/clang/Driver/clang.cpp +++ b/clang/Driver/clang.cpp @@ -29,6 +29,7 @@ #include "clang/Driver/InitHeaderSearch.h" #include "clang/Driver/TextDiagnosticBuffer.h" #include "clang/Driver/TextDiagnosticPrinter.h" +#include "clang/Driver/DriverDiagnostic.h" #include "clang/Analysis/PathDiagnostic.h" #include "clang/AST/Decl.h" #include "clang/AST/TranslationUnit.h" @@ -40,7 +41,6 @@ #include "clang/Basic/FileManager.h" #include "clang/Basic/SourceManager.h" #include "clang/Basic/TargetInfo.h" -#include "clang/Basic/DiagnosticDriver.h" #include "llvm/ADT/OwningPtr.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/StringExtras.h" diff --git a/clang/include/clang/Basic/DiagnosticAST.h b/clang/include/clang/AST/ASTDiagnostic.h index 1a140167e6c..8adc2cd0a22 100644 --- a/clang/include/clang/Basic/DiagnosticAST.h +++ b/clang/include/clang/AST/ASTDiagnostic.h @@ -10,15 +10,15 @@ #ifndef LLVM_CLANG_DIAGNOSTICAST_H #define LLVM_CLANG_DIAGNOSTICAST_H -#include "clang/Basic/DiagnosticAST.h" +#include "clang/Basic/Diagnostic.h" namespace clang { namespace diag { enum { #define DIAG(ENUM,FLAGS,DESC) ENUM, -#include "DiagnosticCommonKinds.def" +#include "clang/Basic/DiagnosticCommonKinds.def" #define ASTSTART -#include "DiagnosticASTKinds.def" +#include "clang/Basic/DiagnosticASTKinds.def" NUM_BUILTIN_AST_DIAGNOSTICS }; } // end namespace diag diff --git a/clang/include/clang/Basic/DiagnosticAnalysis.h b/clang/include/clang/Analysis/AnalysisDiagnostic.h index 9dc008ec138..75d39e1d036 100644 --- a/clang/include/clang/Basic/DiagnosticAnalysis.h +++ b/clang/include/clang/Analysis/AnalysisDiagnostic.h @@ -16,9 +16,9 @@ namespace clang { namespace diag { enum { #define DIAG(ENUM,FLAGS,DESC) ENUM, -#include "DiagnosticCommonKinds.def" +#include "clang/Basic/DiagnosticCommonKinds.def" #define ANALYSISSTART -#include "DiagnosticAnalysisKinds.def" +#include "clang/Basic/DiagnosticAnalysisKinds.def" NUM_BUILTIN_ANALYSIS_DIAGNOSTICS }; } // end namespace diag diff --git a/clang/include/clang/Basic/DiagnosticDriver.h b/clang/include/clang/Basic/DiagnosticDriver.h deleted file mode 100644 index 60cdfcdb8ae..00000000000 --- a/clang/include/clang/Basic/DiagnosticDriver.h +++ /dev/null @@ -1,57 +0,0 @@ -//===--- DiagnosticDriver.h - Diagnostics for the driver --------*- C++ -*-===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// - -#ifndef LLVM_CLANG_DIAGNOSTICDRIVER_H -#define LLVM_CLANG_DIAGNOSTICDRIVER_H - -#include "clang/Basic/Diagnostic.h" - -namespace clang { - namespace diag { - enum { -#define DIAG(ENUM,FLAGS,DESC) ENUM, -#include "DiagnosticCommonKinds.def" - NUM_BUILTIN_DRIVER_DIAGNOSTICS - }; - } // end namespace diag -} // end namespace clang - -#endif -#ifndef LLVM_CLANG_DIAGNOSTICDRIVER_H -#define LLVM_CLANG_DIAGNOSTICDRIVER_H - -#include "clang/Basic/Diagnostic.h" - -namespace clang { - namespace diag { - enum { -#define DIAG(ENUM,FLAGS,DESC) ENUM, -#include "DiagnosticCommonKinds.def" - NUM_BUILTIN_DRIVER_DIAGNOSTICS - }; - } // end namespace diag -} // end namespace clang - -#endif -#ifndef LLVM_CLANG_DIAGNOSTICDRIVER_H -#define LLVM_CLANG_DIAGNOSTICDRIVER_H - -#include "clang/Basic/Diagnostic.h" - -namespace clang { - namespace diag { - enum { -#define DIAG(ENUM,FLAGS,DESC) ENUM, -#include "DiagnosticCommonKinds.def" - NUM_BUILTIN_DRIVER_DIAGNOSTICS - }; - } // end namespace diag -} // end namespace clang - -#endif diff --git a/clang/include/clang/Driver/DriverDiagnostic.h b/clang/include/clang/Driver/DriverDiagnostic.h new file mode 100644 index 00000000000..4afe5b23e8d --- /dev/null +++ b/clang/include/clang/Driver/DriverDiagnostic.h @@ -0,0 +1,26 @@ +//===--- DiagnosticDriver.h - Diagnostics for the driver --------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_CLANG_DIAGNOSTICDRIVER_H +#define LLVM_CLANG_DIAGNOSTICDRIVER_H + +#include "clang/Basic/Diagnostic.h" + +namespace clang { + namespace diag { + enum { +#define DIAG(ENUM,FLAGS,DESC) ENUM, +#include "clang/Basic/DiagnosticCommonKinds.def" + NUM_BUILTIN_DRIVER_DIAGNOSTICS + }; + } // end namespace diag +} // end namespace clang + +#endif + diff --git a/clang/include/clang/Basic/DiagnosticLex.h b/clang/include/clang/Lex/LexDiagnostic.h index 5430b730fb1..3d285cd6b5c 100644 --- a/clang/include/clang/Basic/DiagnosticLex.h +++ b/clang/include/clang/Lex/LexDiagnostic.h @@ -16,9 +16,9 @@ namespace clang { namespace diag { enum { #define DIAG(ENUM,FLAGS,DESC) ENUM, -#include "DiagnosticCommonKinds.def" +#include "clang/Basic/DiagnosticCommonKinds.def" #define LEXSTART -#include "DiagnosticLexKinds.def" +#include "clang/Basic/DiagnosticLexKinds.def" NUM_BUILTIN_LEX_DIAGNOSTICS }; } // end namespace diag diff --git a/clang/include/clang/Basic/DiagnosticParse.h b/clang/include/clang/Parse/ParseDiagnostic.h index 272f6ef868a..12a4b2534fa 100644 --- a/clang/include/clang/Basic/DiagnosticParse.h +++ b/clang/include/clang/Parse/ParseDiagnostic.h @@ -16,9 +16,9 @@ namespace clang { namespace diag { enum { #define DIAG(ENUM,FLAGS,DESC) ENUM, -#include "DiagnosticCommonKinds.def" +#include "clang/Basic/DiagnosticCommonKinds.def" #define PARSESTART -#include "DiagnosticParseKinds.def" +#include "clang/Basic/DiagnosticParseKinds.def" NUM_BUILTIN_PARSE_DIAGNOSTICS }; } // end namespace diag diff --git a/clang/include/clang/Basic/DiagnosticSema.h b/clang/include/clang/Sema/SemaDiagnostic.h index c0644a1d37e..52fa696218d 100644 --- a/clang/include/clang/Basic/DiagnosticSema.h +++ b/clang/include/clang/Sema/SemaDiagnostic.h @@ -16,9 +16,9 @@ namespace clang { namespace diag { enum { #define DIAG(ENUM,FLAGS,DESC) ENUM, -#include "DiagnosticCommonKinds.def" +#include "clang/Basic/DiagnosticCommonKinds.def" #define SEMASTART -#include "DiagnosticSemaKinds.def" +#include "clang/Basic/DiagnosticSemaKinds.def" NUM_BUILTIN_SEMA_DIAGNOSTICS }; } // end namespace diag diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp index c444a199f6c..f07df0a187e 100644 --- a/clang/lib/AST/ExprConstant.cpp +++ b/clang/lib/AST/ExprConstant.cpp @@ -15,7 +15,7 @@ #include "clang/AST/ASTContext.h" #include "clang/AST/RecordLayout.h" #include "clang/AST/StmtVisitor.h" -#include "clang/Basic/DiagnosticAST.h" +#include "clang/AST/ASTDiagnostic.h" #include "clang/Basic/TargetInfo.h" #include "llvm/Support/Compiler.h" using namespace clang; diff --git a/clang/lib/Analysis/UninitializedValues.cpp b/clang/lib/Analysis/UninitializedValues.cpp index 3947803ee88..9ff99f1fa1f 100644 --- a/clang/lib/Analysis/UninitializedValues.cpp +++ b/clang/lib/Analysis/UninitializedValues.cpp @@ -14,7 +14,7 @@ #include "clang/Analysis/Analyses/UninitializedValues.h" #include "clang/Analysis/Visitors/CFGRecStmtDeclVisitor.h" #include "clang/Analysis/LocalCheckers.h" -#include "clang/Basic/DiagnosticAnalysis.h" +#include "clang/Analysis/AnalysisDiagnostic.h" #include "clang/AST/ASTContext.h" #include "clang/Analysis/FlowSensitive/DataflowSolver.h" #include "llvm/Support/Compiler.h" diff --git a/clang/lib/Lex/Lexer.cpp b/clang/lib/Lex/Lexer.cpp index 2bf9300e916..72715c9eeda 100644 --- a/clang/lib/Lex/Lexer.cpp +++ b/clang/lib/Lex/Lexer.cpp @@ -26,7 +26,7 @@ #include "clang/Lex/Lexer.h" #include "clang/Lex/Preprocessor.h" -#include "clang/Basic/DiagnosticLex.h" +#include "clang/Lex/LexDiagnostic.h" #include "clang/Basic/SourceManager.h" #include "llvm/Support/Compiler.h" #include "llvm/Support/MemoryBuffer.h" diff --git a/clang/lib/Lex/LiteralSupport.cpp b/clang/lib/Lex/LiteralSupport.cpp index b06f9a4cf29..93b653aae6f 100644 --- a/clang/lib/Lex/LiteralSupport.cpp +++ b/clang/lib/Lex/LiteralSupport.cpp @@ -14,7 +14,7 @@ #include "clang/Lex/LiteralSupport.h" #include "clang/Lex/Preprocessor.h" -#include "clang/Basic/DiagnosticLex.h" +#include "clang/Lex/LexDiagnostic.h" #include "clang/Basic/TargetInfo.h" #include "llvm/ADT/StringExtras.h" using namespace clang; diff --git a/clang/lib/Lex/MacroArgs.cpp b/clang/lib/Lex/MacroArgs.cpp index 63086ad2747..2646a61e51a 100644 --- a/clang/lib/Lex/MacroArgs.cpp +++ b/clang/lib/Lex/MacroArgs.cpp @@ -14,7 +14,7 @@ #include "MacroArgs.h" #include "clang/Lex/MacroInfo.h" #include "clang/Lex/Preprocessor.h" -#include "clang/Basic/DiagnosticLex.h" +#include "clang/Lex/LexDiagnostic.h" using namespace clang; /// MacroArgs ctor function - This destroys the vector passed in. diff --git a/clang/lib/Lex/PPDirectives.cpp b/clang/lib/Lex/PPDirectives.cpp index 0ddd2292209..1ff469b8258 100644 --- a/clang/lib/Lex/PPDirectives.cpp +++ b/clang/lib/Lex/PPDirectives.cpp @@ -15,7 +15,7 @@ #include "clang/Lex/LiteralSupport.h" #include "clang/Lex/HeaderSearch.h" #include "clang/Lex/MacroInfo.h" -#include "clang/Basic/DiagnosticLex.h" +#include "clang/Lex/LexDiagnostic.h" #include "clang/Basic/SourceManager.h" #include "llvm/ADT/APInt.h" using namespace clang; diff --git a/clang/lib/Lex/PPExpressions.cpp b/clang/lib/Lex/PPExpressions.cpp index 73d677fe15b..3cba06f4603 100644 --- a/clang/lib/Lex/PPExpressions.cpp +++ b/clang/lib/Lex/PPExpressions.cpp @@ -20,7 +20,7 @@ #include "clang/Lex/MacroInfo.h" #include "clang/Lex/LiteralSupport.h" #include "clang/Basic/TargetInfo.h" -#include "clang/Basic/DiagnosticLex.h" +#include "clang/Lex/LexDiagnostic.h" #include "llvm/ADT/APSInt.h" using namespace clang; diff --git a/clang/lib/Lex/PPLexerChange.cpp b/clang/lib/Lex/PPLexerChange.cpp index f00283bfbda..3e02fbd6389 100644 --- a/clang/lib/Lex/PPLexerChange.cpp +++ b/clang/lib/Lex/PPLexerChange.cpp @@ -15,7 +15,7 @@ #include "clang/Lex/Preprocessor.h" #include "clang/Lex/HeaderSearch.h" #include "clang/Lex/MacroInfo.h" -#include "clang/Basic/DiagnosticLex.h" +#include "clang/Lex/LexDiagnostic.h" #include "clang/Basic/SourceManager.h" #include "llvm/Support/MemoryBuffer.h" diff --git a/clang/lib/Lex/PPMacroExpansion.cpp b/clang/lib/Lex/PPMacroExpansion.cpp index fb7d22a5813..776754372d3 100644 --- a/clang/lib/Lex/PPMacroExpansion.cpp +++ b/clang/lib/Lex/PPMacroExpansion.cpp @@ -17,7 +17,7 @@ #include "clang/Lex/MacroInfo.h" #include "clang/Basic/SourceManager.h" #include "clang/Basic/FileManager.h" -#include "clang/Basic/DiagnosticLex.h" +#include "clang/Lex/LexDiagnostic.h" #include <ctime> using namespace clang; diff --git a/clang/lib/Lex/Pragma.cpp b/clang/lib/Lex/Pragma.cpp index ad467630b16..87410f9ff4a 100644 --- a/clang/lib/Lex/Pragma.cpp +++ b/clang/lib/Lex/Pragma.cpp @@ -16,7 +16,7 @@ #include "clang/Lex/HeaderSearch.h" #include "clang/Lex/LiteralSupport.h" #include "clang/Lex/Preprocessor.h" -#include "clang/Basic/DiagnosticLex.h" +#include "clang/Lex/LexDiagnostic.h" #include "clang/Basic/FileManager.h" #include "clang/Basic/SourceManager.h" using namespace clang; diff --git a/clang/lib/Lex/Preprocessor.cpp b/clang/lib/Lex/Preprocessor.cpp index c265c2c75d4..3861e7d320e 100644 --- a/clang/lib/Lex/Preprocessor.cpp +++ b/clang/lib/Lex/Preprocessor.cpp @@ -30,7 +30,7 @@ #include "clang/Lex/MacroInfo.h" #include "clang/Lex/Pragma.h" #include "clang/Lex/ScratchBuffer.h" -#include "clang/Basic/DiagnosticLex.h" +#include "clang/Lex/LexDiagnostic.h" #include "clang/Basic/SourceManager.h" #include "clang/Basic/TargetInfo.h" #include "llvm/ADT/APFloat.h" diff --git a/clang/lib/Lex/PreprocessorLexer.cpp b/clang/lib/Lex/PreprocessorLexer.cpp index f75ce429c65..f9dfad9c808 100644 --- a/clang/lib/Lex/PreprocessorLexer.cpp +++ b/clang/lib/Lex/PreprocessorLexer.cpp @@ -13,7 +13,7 @@ #include "clang/Lex/PreprocessorLexer.h" #include "clang/Lex/Preprocessor.h" -#include "clang/Basic/DiagnosticLex.h" +#include "clang/Lex/LexDiagnostic.h" #include "clang/Basic/SourceManager.h" using namespace clang; diff --git a/clang/lib/Lex/TokenLexer.cpp b/clang/lib/Lex/TokenLexer.cpp index eaa49f36b9e..3ca0fcfa05d 100644 --- a/clang/lib/Lex/TokenLexer.cpp +++ b/clang/lib/Lex/TokenLexer.cpp @@ -16,7 +16,7 @@ #include "clang/Lex/MacroInfo.h" #include "clang/Lex/Preprocessor.h" #include "clang/Basic/SourceManager.h" -#include "clang/Basic/DiagnosticLex.h" +#include "clang/Lex/LexDiagnostic.h" #include "llvm/ADT/SmallVector.h" using namespace clang; diff --git a/clang/lib/Parse/DeclSpec.cpp b/clang/lib/Parse/DeclSpec.cpp index f75e3ea8b8b..32b00117683 100644 --- a/clang/lib/Parse/DeclSpec.cpp +++ b/clang/lib/Parse/DeclSpec.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "clang/Parse/DeclSpec.h" -#include "clang/Basic/DiagnosticParse.h" +#include "clang/Parse/ParseDiagnostic.h" #include "clang/Basic/LangOptions.h" #include "llvm/ADT/STLExtras.h" using namespace clang; diff --git a/clang/lib/Parse/ExtensionRAIIObject.h b/clang/lib/Parse/ExtensionRAIIObject.h index 4593dcff44e..928d443b74c 100644 --- a/clang/lib/Parse/ExtensionRAIIObject.h +++ b/clang/lib/Parse/ExtensionRAIIObject.h @@ -14,7 +14,7 @@ #ifndef LLVM_CLANG_PARSE_EXTENSION_RAII_OBJECT_H #define LLVM_CLANG_PARSE_EXTENSION_RAII_OBJECT_H -#include "clang/Basic/DiagnosticParse.h" +#include "clang/Parse/ParseDiagnostic.h" namespace clang { diff --git a/clang/lib/Parse/ParseCXXInlineMethods.cpp b/clang/lib/Parse/ParseCXXInlineMethods.cpp index bf9b3b2fb50..4aa923ca009 100644 --- a/clang/lib/Parse/ParseCXXInlineMethods.cpp +++ b/clang/lib/Parse/ParseCXXInlineMethods.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/Basic/DiagnosticParse.h" +#include "clang/Parse/ParseDiagnostic.h" #include "clang/Parse/Parser.h" #include "clang/Parse/DeclSpec.h" #include "clang/Parse/Scope.h" diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp index eb5cedd5f40..7b6d8f81852 100644 --- a/clang/lib/Parse/ParseDecl.cpp +++ b/clang/lib/Parse/ParseDecl.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "clang/Parse/Parser.h" -#include "clang/Basic/DiagnosticParse.h" +#include "clang/Parse/ParseDiagnostic.h" #include "clang/Parse/Scope.h" #include "ExtensionRAIIObject.h" #include "AstGuard.h" diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp index 27b2d74c850..628331fd1d4 100644 --- a/clang/lib/Parse/ParseDeclCXX.cpp +++ b/clang/lib/Parse/ParseDeclCXX.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "clang/Parse/Parser.h" -#include "clang/Basic/DiagnosticParse.h" +#include "clang/Parse/ParseDiagnostic.h" #include "clang/Parse/DeclSpec.h" #include "clang/Parse/Scope.h" #include "AstGuard.h" diff --git a/clang/lib/Parse/ParseExprCXX.cpp b/clang/lib/Parse/ParseExprCXX.cpp index 6a2ef36a37e..f434cfb1f71 100644 --- a/clang/lib/Parse/ParseExprCXX.cpp +++ b/clang/lib/Parse/ParseExprCXX.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/Basic/DiagnosticParse.h" +#include "clang/Parse/ParseDiagnostic.h" #include "clang/Parse/Parser.h" #include "clang/Parse/DeclSpec.h" #include "AstGuard.h" diff --git a/clang/lib/Parse/ParseInit.cpp b/clang/lib/Parse/ParseInit.cpp index 1e14dd6741a..c654a750ddd 100644 --- a/clang/lib/Parse/ParseInit.cpp +++ b/clang/lib/Parse/ParseInit.cpp @@ -14,7 +14,7 @@ #include "clang/Parse/Designator.h" #include "clang/Parse/Parser.h" #include "AstGuard.h" -#include "clang/Basic/DiagnosticParse.h" +#include "clang/Parse/ParseDiagnostic.h" #include "llvm/ADT/SmallString.h" using namespace clang; diff --git a/clang/lib/Parse/ParseObjc.cpp b/clang/lib/Parse/ParseObjc.cpp index 2cbb56417b4..5d7d7f10005 100644 --- a/clang/lib/Parse/ParseObjc.cpp +++ b/clang/lib/Parse/ParseObjc.cpp @@ -15,7 +15,7 @@ #include "clang/Parse/DeclSpec.h" #include "clang/Parse/Scope.h" #include "AstGuard.h" -#include "clang/Basic/DiagnosticParse.h" +#include "clang/Parse/ParseDiagnostic.h" #include "llvm/ADT/SmallVector.h" using namespace clang; diff --git a/clang/lib/Parse/ParsePragma.cpp b/clang/lib/Parse/ParsePragma.cpp index 279038c37ef..01496b31f75 100644 --- a/clang/lib/Parse/ParsePragma.cpp +++ b/clang/lib/Parse/ParsePragma.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "ParsePragma.h" -#include "clang/Basic/DiagnosticParse.h" +#include "clang/Parse/ParseDiagnostic.h" #include "clang/Lex/Preprocessor.h" #include "clang/Parse/Action.h" using namespace clang; diff --git a/clang/lib/Parse/ParseTemplate.cpp b/clang/lib/Parse/ParseTemplate.cpp index ea54e7ed302..b9a55147b85 100644 --- a/clang/lib/Parse/ParseTemplate.cpp +++ b/clang/lib/Parse/ParseTemplate.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "clang/Parse/Parser.h" -#include "clang/Basic/DiagnosticParse.h" +#include "clang/Parse/ParseDiagnostic.h" #include "clang/Parse/DeclSpec.h" #include "clang/Parse/Scope.h" diff --git a/clang/lib/Parse/ParseTentative.cpp b/clang/lib/Parse/ParseTentative.cpp index 5b242d82e75..445dd8b6eff 100644 --- a/clang/lib/Parse/ParseTentative.cpp +++ b/clang/lib/Parse/ParseTentative.cpp @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// #include "clang/Parse/Parser.h" -#include "clang/Basic/DiagnosticParse.h" +#include "clang/Parse/ParseDiagnostic.h" using namespace clang; /// isCXXDeclarationStatement - C++-specialized function that disambiguates diff --git a/clang/lib/Parse/Parser.cpp b/clang/lib/Parse/Parser.cpp index 33ce08ef48f..8685a599d2f 100644 --- a/clang/lib/Parse/Parser.cpp +++ b/clang/lib/Parse/Parser.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "clang/Parse/Parser.h" -#include "clang/Basic/DiagnosticParse.h" +#include "clang/Parse/ParseDiagnostic.h" #include "clang/Parse/DeclSpec.h" #include "clang/Parse/Scope.h" #include "ExtensionRAIIObject.h" diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp index 4f659b6beb8..60417362429 100644 --- a/clang/lib/Sema/Sema.cpp +++ b/clang/lib/Sema/Sema.cpp @@ -17,7 +17,6 @@ #include "clang/AST/DeclObjC.h" #include "clang/AST/Expr.h" #include "clang/Lex/Preprocessor.h" -#include "clang/Basic/DiagnosticSema.h" using namespace clang; /// ConvertQualTypeToStringFn - This function is used to pretty print the diff --git a/clang/lib/Sema/Sema.h b/clang/lib/Sema/Sema.h index f14aba6a4f5..4a81f71dea3 100644 --- a/clang/lib/Sema/Sema.h +++ b/clang/lib/Sema/Sema.h @@ -20,7 +20,7 @@ #include "SemaOverload.h" #include "clang/AST/DeclBase.h" #include "clang/Parse/Action.h" -#include "clang/Basic/DiagnosticSema.h" +#include "clang/Sema/SemaDiagnostic.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/DenseSet.h" #include "llvm/ADT/SmallPtrSet.h" diff --git a/clang/lib/Sema/SemaCXXScopeSpec.cpp b/clang/lib/Sema/SemaCXXScopeSpec.cpp index 357dcd7b60c..cf93571eb23 100644 --- a/clang/lib/Sema/SemaCXXScopeSpec.cpp +++ b/clang/lib/Sema/SemaCXXScopeSpec.cpp @@ -14,7 +14,6 @@ #include "Sema.h"
#include "clang/AST/ASTContext.h"
#include "clang/Parse/DeclSpec.h"
-#include "clang/Basic/DiagnosticSema.h"
#include "llvm/ADT/STLExtras.h"
using namespace clang;
diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp index 5b15a1a5be5..92cad1029b7 100644 --- a/clang/lib/Sema/SemaChecking.cpp +++ b/clang/lib/Sema/SemaChecking.cpp @@ -18,7 +18,6 @@ #include "clang/AST/ExprCXX.h" #include "clang/AST/ExprObjC.h" #include "clang/Lex/Preprocessor.h" -#include "clang/Basic/DiagnosticSema.h" #include "SemaUtil.h" using namespace clang; diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 77f99e848f1..7572560be19 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -18,7 +18,6 @@ #include "clang/AST/DeclObjC.h" #include "clang/AST/ExprCXX.h" #include "clang/Parse/DeclSpec.h" -#include "clang/Basic/DiagnosticSema.h" #include "clang/Basic/TargetInfo.h" #include "clang/Basic/SourceManager.h" // FIXME: layering (ideally, Sema shouldn't be dependent on Lex API's) diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp index c87483dd0c9..bf4549d05bc 100644 --- a/clang/lib/Sema/SemaDeclAttr.cpp +++ b/clang/lib/Sema/SemaDeclAttr.cpp @@ -15,7 +15,6 @@ #include "clang/AST/ASTContext.h" #include "clang/AST/DeclObjC.h" #include "clang/AST/Expr.h" -#include "clang/Basic/DiagnosticSema.h" #include "clang/Basic/TargetInfo.h" #include "clang/Parse/DeclSpec.h" #include <llvm/ADT/StringExtras.h> diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index a61184f6693..1870a8fdd39 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -18,7 +18,6 @@ #include "clang/AST/TypeOrdering.h" #include "clang/AST/StmtVisitor.h" #include "clang/Lex/Preprocessor.h" -#include "clang/Basic/DiagnosticSema.h" #include "clang/Parse/DeclSpec.h" #include "llvm/ADT/STLExtras.h" #include "llvm/Support/Compiler.h" diff --git a/clang/lib/Sema/SemaDeclObjC.cpp b/clang/lib/Sema/SemaDeclObjC.cpp index fcf9a92acab..3371e3ea6e2 100644 --- a/clang/lib/Sema/SemaDeclObjC.cpp +++ b/clang/lib/Sema/SemaDeclObjC.cpp @@ -14,7 +14,6 @@ #include "Sema.h" #include "clang/AST/ASTContext.h" #include "clang/AST/DeclObjC.h" -#include "clang/Basic/DiagnosticSema.h" #include "clang/Parse/DeclSpec.h" using namespace clang; diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 2eb4605623b..5ebec0270b5 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -18,7 +18,6 @@ #include "clang/AST/ExprObjC.h" #include "clang/Lex/Preprocessor.h" #include "clang/Lex/LiteralSupport.h" -#include "clang/Basic/DiagnosticSema.h" #include "clang/Basic/SourceManager.h" #include "clang/Basic/TargetInfo.h" #include "clang/Parse/DeclSpec.h" diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp index 743fa12b186..d0ceb97b3ae 100644 --- a/clang/lib/Sema/SemaExprCXX.cpp +++ b/clang/lib/Sema/SemaExprCXX.cpp @@ -16,7 +16,6 @@ #include "clang/AST/ASTContext.h" #include "clang/Parse/DeclSpec.h" #include "clang/Lex/Preprocessor.h" -#include "clang/Basic/DiagnosticSema.h" #include "clang/Basic/TargetInfo.h" #include "llvm/ADT/STLExtras.h" using namespace clang; diff --git a/clang/lib/Sema/SemaExprObjC.cpp b/clang/lib/Sema/SemaExprObjC.cpp index a19a1d16d0e..f436e61ee91 100644 --- a/clang/lib/Sema/SemaExprObjC.cpp +++ b/clang/lib/Sema/SemaExprObjC.cpp @@ -15,7 +15,6 @@ #include "clang/AST/ASTContext.h" #include "clang/AST/DeclObjC.h" #include "clang/AST/ExprObjC.h" -#include "clang/Basic/DiagnosticSema.h" using namespace clang; Sema::ExprResult Sema::ParseObjCStringLiteral(SourceLocation *AtLocs, diff --git a/clang/lib/Sema/SemaInherit.cpp b/clang/lib/Sema/SemaInherit.cpp index 307c5275043..cb58063d840 100644 --- a/clang/lib/Sema/SemaInherit.cpp +++ b/clang/lib/Sema/SemaInherit.cpp @@ -19,7 +19,6 @@ #include "clang/AST/DeclCXX.h" #include "clang/AST/Type.h" #include "clang/AST/TypeOrdering.h" -#include "clang/Basic/DiagnosticSema.h" #include <algorithm> #include <memory> #include <set> diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index bb523e179b8..5dc57751ffb 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -18,7 +18,6 @@ #include "clang/AST/ASTContext.h" #include "clang/AST/Expr.h" #include "clang/AST/ExprCXX.h" -#include "clang/Basic/DiagnosticSema.h" #include <map> using namespace clang; diff --git a/clang/lib/Sema/SemaNamedCast.cpp b/clang/lib/Sema/SemaNamedCast.cpp index cac76b63e4c..e2137b30012 100644 --- a/clang/lib/Sema/SemaNamedCast.cpp +++ b/clang/lib/Sema/SemaNamedCast.cpp @@ -15,7 +15,6 @@ #include "SemaInherit.h" #include "clang/AST/ExprCXX.h" #include "clang/AST/ASTContext.h" -#include "clang/Basic/DiagnosticSema.h" #include "llvm/ADT/SmallVector.h" #include <set> using namespace clang; diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp index c01eceb4ba9..cf26b90bc47 100644 --- a/clang/lib/Sema/SemaStmt.cpp +++ b/clang/lib/Sema/SemaStmt.cpp @@ -17,7 +17,6 @@ #include "clang/AST/DeclObjC.h" #include "clang/AST/Expr.h" #include "clang/Basic/TargetInfo.h" -#include "clang/Basic/DiagnosticSema.h" using namespace clang; Sema::OwningStmtResult Sema::ActOnExprStmt(ExprArg expr) { diff --git a/clang/lib/Sema/SemaType.cpp b/clang/lib/Sema/SemaType.cpp index 5d54f463ea1..43f8baae507 100644 --- a/clang/lib/Sema/SemaType.cpp +++ b/clang/lib/Sema/SemaType.cpp @@ -15,7 +15,6 @@ #include "clang/AST/ASTContext.h" #include "clang/AST/DeclObjC.h" #include "clang/AST/Expr.h" -#include "clang/Basic/DiagnosticSema.h" #include "clang/Parse/DeclSpec.h" using namespace clang; |
