From cc0694c8a4b8c4c4d28302b473d4af4d9224f6a2 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Tue, 4 Dec 2012 09:25:21 +0000 Subject: [PATCH] Sort #include lines for tools/... Completely automated with sort_includes.py llvm-svn: 169240 --- clang/tools/arcmt-test/arcmt-test.cpp | 4 +-- clang/tools/diagtool/DiagTool.cpp | 2 +- clang/tools/diagtool/DiagTool.h | 2 +- clang/tools/diagtool/ListWarnings.cpp | 6 ++--- clang/tools/diagtool/TreeView.cpp | 10 +++---- clang/tools/driver/cc1_main.cpp | 4 +-- clang/tools/driver/cc1as_main.cpp | 18 ++++++------- clang/tools/driver/driver.cpp | 17 ++++++------ clang/tools/libclang/ARCMigrate.cpp | 1 - clang/tools/libclang/CIndex.cpp | 26 +++++++++---------- clang/tools/libclang/CIndexCodeCompletion.cpp | 14 +++++----- clang/tools/libclang/CIndexHigh.cpp | 3 +-- clang/tools/libclang/CIndexInclusionStack.cpp | 2 +- clang/tools/libclang/CIndexer.cpp | 6 ++--- clang/tools/libclang/CXComment.cpp | 9 +++---- clang/tools/libclang/CXComment.h | 5 ++-- .../tools/libclang/CXCompilationDatabase.cpp | 2 +- clang/tools/libclang/CXCursor.cpp | 6 ++--- clang/tools/libclang/CXSourceLocation.cpp | 7 +++-- clang/tools/libclang/CXSourceLocation.h | 4 +-- clang/tools/libclang/CXString.cpp | 2 +- clang/tools/libclang/CXString.h | 2 +- clang/tools/libclang/CXType.cpp | 6 ++--- clang/tools/libclang/CursorVisitor.h | 3 +-- clang/tools/libclang/IndexBody.cpp | 1 - clang/tools/libclang/IndexDecl.cpp | 1 - clang/tools/libclang/IndexTypeSourceInfo.cpp | 1 - clang/tools/libclang/Indexing.cpp | 25 +++++++++--------- clang/tools/libclang/IndexingContext.cpp | 5 ++-- clang/tools/libclang/IndexingContext.h | 5 ++-- 30 files changed, 90 insertions(+), 109 deletions(-) diff --git a/clang/tools/arcmt-test/arcmt-test.cpp b/clang/tools/arcmt-test/arcmt-test.cpp index b745893922c6..179a11561bd3 100644 --- a/clang/tools/arcmt-test/arcmt-test.cpp +++ b/clang/tools/arcmt-test/arcmt-test.cpp @@ -10,11 +10,11 @@ #include "clang/ARCMigrate/ARCMT.h" #include "clang/Frontend/ASTUnit.h" #include "clang/Frontend/TextDiagnosticPrinter.h" -#include "clang/Frontend/VerifyDiagnosticConsumer.h" #include "clang/Frontend/Utils.h" +#include "clang/Frontend/VerifyDiagnosticConsumer.h" #include "clang/Lex/Preprocessor.h" -#include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/FileSystem.h" +#include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Signals.h" #include "llvm/Support/system_error.h" diff --git a/clang/tools/diagtool/DiagTool.cpp b/clang/tools/diagtool/DiagTool.cpp index 36e72a2ded5a..c3428c9081e7 100644 --- a/clang/tools/diagtool/DiagTool.cpp +++ b/clang/tools/diagtool/DiagTool.cpp @@ -12,8 +12,8 @@ //===----------------------------------------------------------------------===// #include "DiagTool.h" -#include "llvm/ADT/StringMap.h" #include "llvm/ADT/SmallString.h" +#include "llvm/ADT/StringMap.h" #include using namespace diagtool; diff --git a/clang/tools/diagtool/DiagTool.h b/clang/tools/diagtool/DiagTool.h index dcb6ac7c76cb..93d531babb1c 100644 --- a/clang/tools/diagtool/DiagTool.h +++ b/clang/tools/diagtool/DiagTool.h @@ -15,8 +15,8 @@ #define DIAGTOOL_DIAGTOOL_H #include "llvm/ADT/StringRef.h" -#include "llvm/Support/raw_ostream.h" #include "llvm/Support/ManagedStatic.h" +#include "llvm/Support/raw_ostream.h" #include diff --git a/clang/tools/diagtool/ListWarnings.cpp b/clang/tools/diagtool/ListWarnings.cpp index d554a2ef41ed..16837a158495 100644 --- a/clang/tools/diagtool/ListWarnings.cpp +++ b/clang/tools/diagtool/ListWarnings.cpp @@ -14,11 +14,11 @@ #include "DiagTool.h" #include "DiagnosticNames.h" -#include "clang/Basic/Diagnostic.h" -#include "llvm/Support/Format.h" -#include "llvm/ADT/StringMap.h" #include "clang/AST/ASTDiagnostic.h" #include "clang/Basic/AllDiagnostics.h" +#include "clang/Basic/Diagnostic.h" +#include "llvm/ADT/StringMap.h" +#include "llvm/Support/Format.h" DEF_DIAGTOOL("list-warnings", "List warnings and their corresponding flags", diff --git a/clang/tools/diagtool/TreeView.cpp b/clang/tools/diagtool/TreeView.cpp index bf9f766c309a..629817903040 100644 --- a/clang/tools/diagtool/TreeView.cpp +++ b/clang/tools/diagtool/TreeView.cpp @@ -13,13 +13,13 @@ #include "DiagTool.h" #include "DiagnosticNames.h" -#include "clang/Basic/Diagnostic.h" -#include "clang/Basic/DiagnosticOptions.h" -#include "llvm/Support/Format.h" -#include "llvm/ADT/StringMap.h" -#include "llvm/ADT/DenseSet.h" #include "clang/AST/ASTDiagnostic.h" #include "clang/Basic/AllDiagnostics.h" +#include "clang/Basic/Diagnostic.h" +#include "clang/Basic/DiagnosticOptions.h" +#include "llvm/ADT/DenseSet.h" +#include "llvm/ADT/StringMap.h" +#include "llvm/Support/Format.h" #include "llvm/Support/Process.h" DEF_DIAGTOOL("tree", diff --git a/clang/tools/driver/cc1_main.cpp b/clang/tools/driver/cc1_main.cpp index 9da6723d5fc5..6e1920022f37 100644 --- a/clang/tools/driver/cc1_main.cpp +++ b/clang/tools/driver/cc1_main.cpp @@ -15,9 +15,9 @@ #include "clang/Driver/Arg.h" #include "clang/Driver/ArgList.h" -#include "clang/Driver/Options.h" #include "clang/Driver/DriverDiagnostic.h" #include "clang/Driver/OptTable.h" +#include "clang/Driver/Options.h" #include "clang/Frontend/CompilerInstance.h" #include "clang/Frontend/CompilerInvocation.h" #include "clang/Frontend/FrontendDiagnostic.h" @@ -25,13 +25,13 @@ #include "clang/Frontend/TextDiagnosticPrinter.h" #include "clang/FrontendTool/Utils.h" #include "llvm/ADT/Statistic.h" +#include "llvm/LinkAllPasses.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/Signals.h" #include "llvm/Support/TargetSelect.h" #include "llvm/Support/Timer.h" #include "llvm/Support/raw_ostream.h" -#include "llvm/LinkAllPasses.h" #include using namespace clang; diff --git a/clang/tools/driver/cc1as_main.cpp b/clang/tools/driver/cc1as_main.cpp index 5587e404955c..87e3bfba8453 100644 --- a/clang/tools/driver/cc1as_main.cpp +++ b/clang/tools/driver/cc1as_main.cpp @@ -13,45 +13,45 @@ //===----------------------------------------------------------------------===// #include "clang/Basic/Diagnostic.h" +#include "clang/Basic/DiagnosticOptions.h" #include "clang/Driver/Arg.h" #include "clang/Driver/ArgList.h" -#include "clang/Driver/DriverDiagnostic.h" #include "clang/Driver/CC1AsOptions.h" +#include "clang/Driver/DriverDiagnostic.h" #include "clang/Driver/OptTable.h" #include "clang/Driver/Options.h" #include "clang/Frontend/FrontendDiagnostic.h" #include "clang/Frontend/TextDiagnosticPrinter.h" -#include "clang/Basic/DiagnosticOptions.h" #include "llvm/ADT/OwningPtr.h" #include "llvm/ADT/StringSwitch.h" #include "llvm/ADT/Triple.h" -#include "llvm/MC/MCParser/MCAsmParser.h" +#include "llvm/DataLayout.h" +#include "llvm/MC/MCAsmBackend.h" #include "llvm/MC/MCAsmInfo.h" #include "llvm/MC/MCCodeEmitter.h" #include "llvm/MC/MCContext.h" #include "llvm/MC/MCInstrInfo.h" #include "llvm/MC/MCObjectFileInfo.h" +#include "llvm/MC/MCParser/MCAsmParser.h" #include "llvm/MC/MCRegisterInfo.h" #include "llvm/MC/MCStreamer.h" #include "llvm/MC/MCSubtargetInfo.h" -#include "llvm/MC/MCAsmBackend.h" #include "llvm/MC/MCTargetAsmParser.h" #include "llvm/Support/CommandLine.h" -#include "llvm/Support/FormattedStream.h" #include "llvm/Support/ErrorHandling.h" +#include "llvm/Support/FormattedStream.h" +#include "llvm/Support/Host.h" #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/MemoryBuffer.h" -#include "llvm/Support/PrettyStackTrace.h" -#include "llvm/Support/SourceMgr.h" -#include "llvm/Support/Host.h" #include "llvm/Support/Path.h" +#include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/Signals.h" +#include "llvm/Support/SourceMgr.h" #include "llvm/Support/TargetRegistry.h" #include "llvm/Support/TargetSelect.h" #include "llvm/Support/Timer.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Support/system_error.h" -#include "llvm/DataLayout.h" using namespace clang; using namespace clang::driver; using namespace llvm; diff --git a/clang/tools/driver/driver.cpp b/clang/tools/driver/driver.cpp index a2d5414e9a97..353d06fb14e4 100644 --- a/clang/tools/driver/driver.cpp +++ b/clang/tools/driver/driver.cpp @@ -14,33 +14,32 @@ #include "clang/Basic/DiagnosticOptions.h" #include "clang/Driver/ArgList.h" -#include "clang/Driver/Options.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" -#include "clang/Driver/Option.h" #include "clang/Driver/OptTable.h" +#include "clang/Driver/Option.h" +#include "clang/Driver/Options.h" #include "clang/Frontend/CompilerInvocation.h" #include "clang/Frontend/TextDiagnosticPrinter.h" #include "clang/Frontend/Utils.h" - #include "llvm/ADT/ArrayRef.h" +#include "llvm/ADT/OwningPtr.h" #include "llvm/ADT/SmallString.h" #include "llvm/ADT/SmallVector.h" -#include "llvm/ADT/OwningPtr.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/FileSystem.h" +#include "llvm/Support/Host.h" #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/MemoryBuffer.h" -#include "llvm/Support/PrettyStackTrace.h" -#include "llvm/Support/Regex.h" -#include "llvm/Support/Timer.h" -#include "llvm/Support/raw_ostream.h" -#include "llvm/Support/Host.h" #include "llvm/Support/Path.h" +#include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/Program.h" +#include "llvm/Support/Regex.h" #include "llvm/Support/Signals.h" #include "llvm/Support/TargetRegistry.h" #include "llvm/Support/TargetSelect.h" +#include "llvm/Support/Timer.h" +#include "llvm/Support/raw_ostream.h" #include "llvm/Support/system_error.h" #include using namespace clang; diff --git a/clang/tools/libclang/ARCMigrate.cpp b/clang/tools/libclang/ARCMigrate.cpp index 5ee5cf6e4ef8..649408326c39 100644 --- a/clang/tools/libclang/ARCMigrate.cpp +++ b/clang/tools/libclang/ARCMigrate.cpp @@ -12,7 +12,6 @@ //===----------------------------------------------------------------------===// #include "clang-c/Index.h" - #include "CXString.h" #include "clang/ARCMigrate/ARCMT.h" #include "clang/Frontend/TextDiagnosticBuffer.h" diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp index 81179bd455ae..c0f3f571a4a6 100644 --- a/clang/tools/libclang/CIndex.cpp +++ b/clang/tools/libclang/CIndex.cpp @@ -13,40 +13,38 @@ //===----------------------------------------------------------------------===// #include "CIndexer.h" +#include "CIndexDiagnostic.h" #include "CXComment.h" #include "CXCursor.h" -#include "CXTranslationUnit.h" -#include "CXString.h" -#include "CXType.h" #include "CXSourceLocation.h" -#include "CIndexDiagnostic.h" +#include "CXString.h" +#include "CXTranslationUnit.h" +#include "CXType.h" #include "CursorVisitor.h" - -#include "clang/Basic/Version.h" - #include "clang/AST/StmtVisitor.h" #include "clang/Basic/Diagnostic.h" +#include "clang/Basic/Version.h" #include "clang/Frontend/ASTUnit.h" #include "clang/Frontend/CompilerInstance.h" #include "clang/Frontend/FrontendDiagnostic.h" -#include "clang/Lex/Lexer.h" #include "clang/Lex/HeaderSearch.h" +#include "clang/Lex/Lexer.h" #include "clang/Lex/PreprocessingRecord.h" #include "clang/Lex/Preprocessor.h" -#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/Optional.h" +#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/StringSwitch.h" -#include "llvm/Support/SaveAndRestore.h" +#include "llvm/Support/Compiler.h" #include "llvm/Support/CrashRecoveryContext.h" -#include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/MemoryBuffer.h" -#include "llvm/Support/raw_ostream.h" -#include "llvm/Support/Timer.h" #include "llvm/Support/Mutex.h" +#include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/Program.h" +#include "llvm/Support/SaveAndRestore.h" #include "llvm/Support/Signals.h" #include "llvm/Support/Threading.h" -#include "llvm/Support/Compiler.h" +#include "llvm/Support/Timer.h" +#include "llvm/Support/raw_ostream.h" using namespace clang; using namespace clang::cxcursor; diff --git a/clang/tools/libclang/CIndexCodeCompletion.cpp b/clang/tools/libclang/CIndexCodeCompletion.cpp index 67e64c4e2320..456c47785169 100644 --- a/clang/tools/libclang/CIndexCodeCompletion.cpp +++ b/clang/tools/libclang/CIndexCodeCompletion.cpp @@ -13,16 +13,16 @@ //===----------------------------------------------------------------------===// #include "CIndexer.h" -#include "CXTranslationUnit.h" -#include "CXString.h" +#include "CIndexDiagnostic.h" #include "CXCursor.h" #include "CXString.h" -#include "CIndexDiagnostic.h" -#include "clang/AST/Type.h" +#include "CXString.h" +#include "CXTranslationUnit.h" #include "clang/AST/Decl.h" #include "clang/AST/DeclObjC.h" -#include "clang/Basic/SourceManager.h" +#include "clang/AST/Type.h" #include "clang/Basic/FileManager.h" +#include "clang/Basic/SourceManager.h" #include "clang/Frontend/ASTUnit.h" #include "clang/Frontend/CompilerInstance.h" #include "clang/Frontend/FrontendDiagnostic.h" @@ -32,11 +32,11 @@ #include "llvm/Support/Atomic.h" #include "llvm/Support/CrashRecoveryContext.h" #include "llvm/Support/MemoryBuffer.h" +#include "llvm/Support/Program.h" #include "llvm/Support/Timer.h" #include "llvm/Support/raw_ostream.h" -#include "llvm/Support/Program.h" -#include #include +#include #ifdef UDP_CODE_COMPLETION_LOGGER diff --git a/clang/tools/libclang/CIndexHigh.cpp b/clang/tools/libclang/CIndexHigh.cpp index ec76898cc83b..43f20240799d 100644 --- a/clang/tools/libclang/CIndexHigh.cpp +++ b/clang/tools/libclang/CIndexHigh.cpp @@ -11,9 +11,8 @@ #include "CXCursor.h" #include "CXSourceLocation.h" #include "CXTranslationUnit.h" - -#include "clang/Frontend/ASTUnit.h" #include "clang/AST/DeclObjC.h" +#include "clang/Frontend/ASTUnit.h" using namespace clang; using namespace cxcursor; diff --git a/clang/tools/libclang/CIndexInclusionStack.cpp b/clang/tools/libclang/CIndexInclusionStack.cpp index 848ca31a5e32..f613f0f1c5bd 100644 --- a/clang/tools/libclang/CIndexInclusionStack.cpp +++ b/clang/tools/libclang/CIndexInclusionStack.cpp @@ -13,8 +13,8 @@ //===----------------------------------------------------------------------===// #include "CIndexer.h" -#include "CXTranslationUnit.h" #include "CXSourceLocation.h" +#include "CXTranslationUnit.h" #include "clang/AST/DeclVisitor.h" #include "clang/Frontend/ASTUnit.h" #include "llvm/ADT/SmallString.h" diff --git a/clang/tools/libclang/CIndexer.cpp b/clang/tools/libclang/CIndexer.cpp index d45878919e49..d89e0a41984d 100644 --- a/clang/tools/libclang/CIndexer.cpp +++ b/clang/tools/libclang/CIndexer.cpp @@ -12,7 +12,6 @@ //===----------------------------------------------------------------------===// #include "CIndexer.h" - #include "clang/AST/Decl.h" #include "clang/AST/DeclVisitor.h" #include "clang/AST/StmtVisitor.h" @@ -24,12 +23,11 @@ #include "llvm/Config/llvm-config.h" #include "llvm/Support/Compiler.h" #include "llvm/Support/MemoryBuffer.h" -#include "llvm/Support/raw_ostream.h" #include "llvm/Support/Program.h" - +#include "llvm/Support/raw_ostream.h" #include -#include #include +#include #ifdef __CYGWIN__ #include diff --git a/clang/tools/libclang/CXComment.cpp b/clang/tools/libclang/CXComment.cpp index fa149a0ff9d0..8c8fe74bba5a 100644 --- a/clang/tools/libclang/CXComment.cpp +++ b/clang/tools/libclang/CXComment.cpp @@ -12,19 +12,16 @@ //===----------------------------------------------------------------------===// #include "clang-c/Index.h" -#include "CXString.h" #include "CXComment.h" #include "CXCursor.h" - -#include "clang/AST/PrettyPrinter.h" -#include "clang/AST/CommentVisitor.h" +#include "CXString.h" #include "clang/AST/CommentCommandTraits.h" +#include "clang/AST/CommentVisitor.h" #include "clang/AST/Decl.h" - +#include "clang/AST/PrettyPrinter.h" #include "llvm/ADT/StringSwitch.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/raw_ostream.h" - #include using namespace clang; diff --git a/clang/tools/libclang/CXComment.h b/clang/tools/libclang/CXComment.h index 513431709f48..126227f8d767 100644 --- a/clang/tools/libclang/CXComment.h +++ b/clang/tools/libclang/CXComment.h @@ -14,11 +14,10 @@ #ifndef LLVM_CLANG_CXCOMMENT_H #define LLVM_CLANG_CXCOMMENT_H -#include "clang-c/Index.h" #include "CXTranslationUnit.h" - -#include "clang/AST/Comment.h" +#include "clang-c/Index.h" #include "clang/AST/ASTContext.h" +#include "clang/AST/Comment.h" #include "clang/Frontend/ASTUnit.h" namespace clang { diff --git a/clang/tools/libclang/CXCompilationDatabase.cpp b/clang/tools/libclang/CXCompilationDatabase.cpp index 7216307a96a2..68845932d580 100644 --- a/clang/tools/libclang/CXCompilationDatabase.cpp +++ b/clang/tools/libclang/CXCompilationDatabase.cpp @@ -1,6 +1,6 @@ #include "clang-c/CXCompilationDatabase.h" -#include "clang/Tooling/CompilationDatabase.h" #include "CXString.h" +#include "clang/Tooling/CompilationDatabase.h" using namespace clang; using namespace clang::tooling; diff --git a/clang/tools/libclang/CXCursor.cpp b/clang/tools/libclang/CXCursor.cpp index 8d3e1690edc5..6615e4a6f426 100644 --- a/clang/tools/libclang/CXCursor.cpp +++ b/clang/tools/libclang/CXCursor.cpp @@ -15,9 +15,9 @@ #include "CXTranslationUnit.h" #include "CXCursor.h" -#include "CXType.h" #include "CXString.h" -#include "clang/Frontend/ASTUnit.h" +#include "CXType.h" +#include "clang-c/Index.h" #include "clang/AST/Decl.h" #include "clang/AST/DeclCXX.h" #include "clang/AST/DeclObjC.h" @@ -25,7 +25,7 @@ #include "clang/AST/Expr.h" #include "clang/AST/ExprCXX.h" #include "clang/AST/ExprObjC.h" -#include "clang-c/Index.h" +#include "clang/Frontend/ASTUnit.h" #include "llvm/Support/ErrorHandling.h" using namespace clang; diff --git a/clang/tools/libclang/CXSourceLocation.cpp b/clang/tools/libclang/CXSourceLocation.cpp index a6bf8fcf1cc1..53b8a333f052 100644 --- a/clang/tools/libclang/CXSourceLocation.cpp +++ b/clang/tools/libclang/CXSourceLocation.cpp @@ -12,12 +12,11 @@ //===----------------------------------------------------------------------===// #include "clang/Frontend/ASTUnit.h" - #include "CIndexer.h" -#include "CXString.h" -#include "CXSourceLocation.h" -#include "CXTranslationUnit.h" #include "CXLoadedDiagnostic.h" +#include "CXSourceLocation.h" +#include "CXString.h" +#include "CXTranslationUnit.h" using namespace clang; using namespace clang::cxstring; diff --git a/clang/tools/libclang/CXSourceLocation.h b/clang/tools/libclang/CXSourceLocation.h index 6c5e858aaae7..735629d2c2df 100644 --- a/clang/tools/libclang/CXSourceLocation.h +++ b/clang/tools/libclang/CXSourceLocation.h @@ -15,9 +15,9 @@ #define LLVM_CLANG_CXSOURCELOCATION_H #include "clang-c/Index.h" -#include "clang/Basic/SourceLocation.h" -#include "clang/Basic/LangOptions.h" #include "clang/AST/ASTContext.h" +#include "clang/Basic/LangOptions.h" +#include "clang/Basic/SourceLocation.h" namespace clang { diff --git a/clang/tools/libclang/CXString.cpp b/clang/tools/libclang/CXString.cpp index bb09cd5cdc22..c4ab3f4f1bfc 100644 --- a/clang/tools/libclang/CXString.cpp +++ b/clang/tools/libclang/CXString.cpp @@ -15,8 +15,8 @@ #include "CXString.h" #include "CXTranslationUnit.h" -#include "clang/Frontend/ASTUnit.h" #include "clang-c/Index.h" +#include "clang/Frontend/ASTUnit.h" #include "llvm/ADT/SmallString.h" #include "llvm/Support/ErrorHandling.h" diff --git a/clang/tools/libclang/CXString.h b/clang/tools/libclang/CXString.h index c354bd2334e0..73d94f6bbb2b 100644 --- a/clang/tools/libclang/CXString.h +++ b/clang/tools/libclang/CXString.h @@ -16,8 +16,8 @@ #include "clang-c/Index.h" #include "clang/Basic/LLVM.h" -#include "llvm/ADT/StringRef.h" #include "llvm/ADT/SmallString.h" +#include "llvm/ADT/StringRef.h" namespace clang { namespace cxstring { diff --git a/clang/tools/libclang/CXType.cpp b/clang/tools/libclang/CXType.cpp index 4e031d2d5506..c4b8a09a5476 100644 --- a/clang/tools/libclang/CXType.cpp +++ b/clang/tools/libclang/CXType.cpp @@ -12,15 +12,15 @@ //===--------------------------------------------------------------------===// #include "CIndexer.h" -#include "CXTranslationUnit.h" #include "CXCursor.h" #include "CXString.h" +#include "CXTranslationUnit.h" #include "CXType.h" -#include "clang/AST/Expr.h" -#include "clang/AST/Type.h" #include "clang/AST/Decl.h" #include "clang/AST/DeclObjC.h" #include "clang/AST/DeclTemplate.h" +#include "clang/AST/Expr.h" +#include "clang/AST/Type.h" #include "clang/Frontend/ASTUnit.h" using namespace clang; diff --git a/clang/tools/libclang/CursorVisitor.h b/clang/tools/libclang/CursorVisitor.h index 7cf75086b9b4..fa978b7647f4 100644 --- a/clang/tools/libclang/CursorVisitor.h +++ b/clang/tools/libclang/CursorVisitor.h @@ -10,10 +10,9 @@ #ifndef LLVM_CLANG_LIBCLANG_CURSORVISITOR_H #define LLVM_CLANG_LIBCLANG_CURSORVISITOR_H -#include "Index_Internal.h" #include "CXCursor.h" #include "CXTranslationUnit.h" - +#include "Index_Internal.h" #include "clang/AST/DeclVisitor.h" #include "clang/AST/TypeLocVisitor.h" diff --git a/clang/tools/libclang/IndexBody.cpp b/clang/tools/libclang/IndexBody.cpp index 3614206dee92..95d74efc04e5 100644 --- a/clang/tools/libclang/IndexBody.cpp +++ b/clang/tools/libclang/IndexBody.cpp @@ -8,7 +8,6 @@ //===----------------------------------------------------------------------===// #include "IndexingContext.h" - #include "RecursiveASTVisitor.h" using namespace clang; diff --git a/clang/tools/libclang/IndexDecl.cpp b/clang/tools/libclang/IndexDecl.cpp index 4b6706fba783..792834998313 100644 --- a/clang/tools/libclang/IndexDecl.cpp +++ b/clang/tools/libclang/IndexDecl.cpp @@ -8,7 +8,6 @@ //===----------------------------------------------------------------------===// #include "IndexingContext.h" - #include "clang/AST/DeclVisitor.h" using namespace clang; diff --git a/clang/tools/libclang/IndexTypeSourceInfo.cpp b/clang/tools/libclang/IndexTypeSourceInfo.cpp index 67a06f249889..2c771c854ce8 100644 --- a/clang/tools/libclang/IndexTypeSourceInfo.cpp +++ b/clang/tools/libclang/IndexTypeSourceInfo.cpp @@ -8,7 +8,6 @@ //===----------------------------------------------------------------------===// #include "IndexingContext.h" - #include "RecursiveASTVisitor.h" using namespace clang; diff --git a/clang/tools/libclang/Indexing.cpp b/clang/tools/libclang/Indexing.cpp index 714a36ebddf7..a907c14e2263 100644 --- a/clang/tools/libclang/Indexing.cpp +++ b/clang/tools/libclang/Indexing.cpp @@ -8,25 +8,24 @@ //===----------------------------------------------------------------------===// #include "IndexingContext.h" -#include "CXCursor.h" -#include "CXSourceLocation.h" -#include "CXTranslationUnit.h" -#include "CXString.h" #include "CIndexDiagnostic.h" #include "CIndexer.h" - -#include "clang/Frontend/ASTUnit.h" -#include "clang/Frontend/CompilerInvocation.h" -#include "clang/Frontend/CompilerInstance.h" -#include "clang/Frontend/FrontendAction.h" -#include "clang/Frontend/Utils.h" -#include "clang/Sema/SemaConsumer.h" +#include "CXCursor.h" +#include "CXSourceLocation.h" +#include "CXString.h" +#include "CXTranslationUnit.h" #include "clang/AST/ASTConsumer.h" #include "clang/AST/DeclVisitor.h" -#include "clang/Lex/Preprocessor.h" +#include "clang/Frontend/ASTUnit.h" +#include "clang/Frontend/CompilerInstance.h" +#include "clang/Frontend/CompilerInvocation.h" +#include "clang/Frontend/FrontendAction.h" +#include "clang/Frontend/Utils.h" #include "clang/Lex/PPCallbacks.h" -#include "llvm/Support/MemoryBuffer.h" +#include "clang/Lex/Preprocessor.h" +#include "clang/Sema/SemaConsumer.h" #include "llvm/Support/CrashRecoveryContext.h" +#include "llvm/Support/MemoryBuffer.h" using namespace clang; using namespace cxstring; diff --git a/clang/tools/libclang/IndexingContext.cpp b/clang/tools/libclang/IndexingContext.cpp index d4daa49de910..8ba1854baaab 100644 --- a/clang/tools/libclang/IndexingContext.cpp +++ b/clang/tools/libclang/IndexingContext.cpp @@ -8,12 +8,11 @@ //===----------------------------------------------------------------------===// #include "IndexingContext.h" -#include "CXTranslationUnit.h" #include "CIndexDiagnostic.h" - -#include "clang/Frontend/ASTUnit.h" +#include "CXTranslationUnit.h" #include "clang/AST/DeclCXX.h" #include "clang/AST/DeclTemplate.h" +#include "clang/Frontend/ASTUnit.h" using namespace clang; using namespace cxindex; diff --git a/clang/tools/libclang/IndexingContext.h b/clang/tools/libclang/IndexingContext.h index 0fc7238ee23d..15db83d9bb8b 100644 --- a/clang/tools/libclang/IndexingContext.h +++ b/clang/tools/libclang/IndexingContext.h @@ -7,11 +7,10 @@ // //===----------------------------------------------------------------------===// -#include "Index_Internal.h" #include "CXCursor.h" - -#include "clang/AST/DeclObjC.h" +#include "Index_Internal.h" #include "clang/AST/DeclGroup.h" +#include "clang/AST/DeclObjC.h" #include "llvm/ADT/DenseSet.h" #include