From f3590b88bc113c2f5d132f7f449d095884475bcf Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Wed, 14 Jan 2015 11:23:58 +0000 Subject: [PATCH] [cleanup] Re-sort the #include lines using llvm/utils/sort_includes.py No functionality changed, this is a purely mechanical cleanup to ensure the #include order remains consistent across the project. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@225975 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/clang-check/ClangCheck.cpp | 2 +- tools/driver/driver.cpp | 2 +- tools/libclang/CIndexUSRs.cpp | 2 +- tools/libclang/CXComment.cpp | 2 +- tools/libclang/CXComment.h | 2 +- tools/libclang/CXLoadedDiagnostic.cpp | 2 +- unittests/AST/ASTVectorTest.cpp | 1 - unittests/AST/EvaluateAsRValueTest.cpp | 8 +++----- unittests/Basic/FileManagerTest.cpp | 2 +- unittests/CodeGen/BufferSourceTest.cpp | 8 ++++---- unittests/libclang/LibclangTest.cpp | 2 +- utils/TableGen/ClangAttrEmitter.cpp | 2 +- utils/TableGen/NeonEmitter.cpp | 6 +++--- 13 files changed, 19 insertions(+), 22 deletions(-) diff --git a/tools/clang-check/ClangCheck.cpp b/tools/clang-check/ClangCheck.cpp index 50ba17b80d..7992026a7c 100644 --- a/tools/clang-check/ClangCheck.cpp +++ b/tools/clang-check/ClangCheck.cpp @@ -25,10 +25,10 @@ #include "clang/StaticAnalyzer/Frontend/FrontendActions.h" #include "clang/Tooling/CommonOptionsParser.h" #include "clang/Tooling/Tooling.h" +#include "llvm/ADT/STLExtras.h" #include "llvm/Option/OptTable.h" #include "llvm/Support/Path.h" #include "llvm/Support/Signals.h" -#include "llvm/ADT/STLExtras.h" using namespace clang::driver; using namespace clang::tooling; diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp index e93fa80c48..e1f9367b0f 100644 --- a/tools/driver/driver.cpp +++ b/tools/driver/driver.cpp @@ -18,8 +18,8 @@ #include "clang/Driver/Driver.h" #include "clang/Driver/DriverDiagnostic.h" #include "clang/Driver/Options.h" -#include "clang/Frontend/CompilerInvocation.h" #include "clang/Frontend/ChainedDiagnosticConsumer.h" +#include "clang/Frontend/CompilerInvocation.h" #include "clang/Frontend/SerializedDiagnosticPrinter.h" #include "clang/Frontend/TextDiagnosticPrinter.h" #include "clang/Frontend/Utils.h" diff --git a/tools/libclang/CIndexUSRs.cpp b/tools/libclang/CIndexUSRs.cpp index 25881c3ef0..d7b6585284 100644 --- a/tools/libclang/CIndexUSRs.cpp +++ b/tools/libclang/CIndexUSRs.cpp @@ -15,9 +15,9 @@ #include "CXCursor.h" #include "CXString.h" #include "CXTranslationUnit.h" +#include "clang/Frontend/ASTUnit.h" #include "clang/Index/USRGeneration.h" #include "clang/Lex/PreprocessingRecord.h" -#include "clang/Frontend/ASTUnit.h" #include "llvm/ADT/SmallString.h" #include "llvm/Support/raw_ostream.h" diff --git a/tools/libclang/CXComment.cpp b/tools/libclang/CXComment.cpp index 454703149c..9cc05ed4e1 100644 --- a/tools/libclang/CXComment.cpp +++ b/tools/libclang/CXComment.cpp @@ -12,10 +12,10 @@ //===----------------------------------------------------------------------===// #include "clang-c/Index.h" -#include "clang-c/Documentation.h" #include "CXComment.h" #include "CXCursor.h" #include "CXString.h" +#include "clang-c/Documentation.h" #include "clang/AST/Decl.h" #include "clang/Index/CommentToXML.h" #include "llvm/ADT/StringExtras.h" diff --git a/tools/libclang/CXComment.h b/tools/libclang/CXComment.h index 0c5418283b..a937a80346 100644 --- a/tools/libclang/CXComment.h +++ b/tools/libclang/CXComment.h @@ -15,8 +15,8 @@ #define LLVM_CLANG_TOOLS_LIBCLANG_CXCOMMENT_H #include "CXTranslationUnit.h" -#include "clang-c/Index.h" #include "clang-c/Documentation.h" +#include "clang-c/Index.h" #include "clang/AST/ASTContext.h" #include "clang/AST/Comment.h" #include "clang/Frontend/ASTUnit.h" diff --git a/tools/libclang/CXLoadedDiagnostic.cpp b/tools/libclang/CXLoadedDiagnostic.cpp index c923b26be9..fe5599a3ab 100644 --- a/tools/libclang/CXLoadedDiagnostic.cpp +++ b/tools/libclang/CXLoadedDiagnostic.cpp @@ -16,8 +16,8 @@ #include "clang/Basic/Diagnostic.h" #include "clang/Basic/FileManager.h" #include "clang/Basic/LLVM.h" -#include "clang/Frontend/SerializedDiagnostics.h" #include "clang/Frontend/SerializedDiagnosticReader.h" +#include "clang/Frontend/SerializedDiagnostics.h" #include "llvm/ADT/Optional.h" #include "llvm/ADT/StringRef.h" #include "llvm/ADT/Twine.h" diff --git a/unittests/AST/ASTVectorTest.cpp b/unittests/AST/ASTVectorTest.cpp index 4b5d569a80..55c06d0071 100644 --- a/unittests/AST/ASTVectorTest.cpp +++ b/unittests/AST/ASTVectorTest.cpp @@ -15,7 +15,6 @@ #include "clang/AST/ASTContext.h" #include "clang/AST/ASTVector.h" #include "clang/Basic/Builtins.h" - #include "gtest/gtest.h" using namespace clang; diff --git a/unittests/AST/EvaluateAsRValueTest.cpp b/unittests/AST/EvaluateAsRValueTest.cpp index b5f9b32740..820edbc7c3 100644 --- a/unittests/AST/EvaluateAsRValueTest.cpp +++ b/unittests/AST/EvaluateAsRValueTest.cpp @@ -12,16 +12,14 @@ // //===----------------------------------------------------------------------===// -#include -#include - +#include "clang/AST/ASTConsumer.h" #include "clang/AST/ASTConsumer.h" #include "clang/AST/ASTContext.h" #include "clang/AST/RecursiveASTVisitor.h" #include "clang/Tooling/Tooling.h" #include "gtest/gtest.h" - -#include "clang/AST/ASTConsumer.h" +#include +#include using namespace clang::tooling; diff --git a/unittests/Basic/FileManagerTest.cpp b/unittests/Basic/FileManagerTest.cpp index e53213b4bc..dd8cf2410a 100644 --- a/unittests/Basic/FileManagerTest.cpp +++ b/unittests/Basic/FileManagerTest.cpp @@ -10,8 +10,8 @@ #include "clang/Basic/FileManager.h" #include "clang/Basic/FileSystemOptions.h" #include "clang/Basic/FileSystemStatCache.h" -#include "gtest/gtest.h" #include "llvm/Config/llvm-config.h" +#include "gtest/gtest.h" using namespace llvm; using namespace clang; diff --git a/unittests/CodeGen/BufferSourceTest.cpp b/unittests/CodeGen/BufferSourceTest.cpp index f9d0991933..8169a6d0c9 100644 --- a/unittests/CodeGen/BufferSourceTest.cpp +++ b/unittests/CodeGen/BufferSourceTest.cpp @@ -10,16 +10,16 @@ #include "clang/AST/ASTConsumer.h" #include "clang/AST/ASTContext.h" #include "clang/AST/RecursiveASTVisitor.h" +#include "clang/Basic/TargetInfo.h" +#include "clang/CodeGen/ModuleBuilder.h" #include "clang/Frontend/CompilerInstance.h" #include "clang/Lex/Preprocessor.h" -#include "clang/CodeGen/ModuleBuilder.h" -#include "clang/Sema/Sema.h" #include "clang/Parse/ParseAST.h" -#include "clang/Basic/TargetInfo.h" +#include "clang/Sema/Sema.h" #include "llvm/ADT/Triple.h" +#include "llvm/IR/LLVMContext.h" #include "llvm/Support/Host.h" #include "llvm/Support/MemoryBuffer.h" -#include "llvm/IR/LLVMContext.h" #include "gtest/gtest.h" using namespace llvm; diff --git a/unittests/libclang/LibclangTest.cpp b/unittests/libclang/LibclangTest.cpp index ee56e22936..a21881429e 100644 --- a/unittests/libclang/LibclangTest.cpp +++ b/unittests/libclang/LibclangTest.cpp @@ -8,11 +8,11 @@ //===----------------------------------------------------------------------===// #include "clang-c/Index.h" -#include "gtest/gtest.h" #include "llvm/Support/Debug.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/Path.h" #include "llvm/Support/raw_ostream.h" +#include "gtest/gtest.h" #include #include #define DEBUG_TYPE "libclang-test" diff --git a/utils/TableGen/ClangAttrEmitter.cpp b/utils/TableGen/ClangAttrEmitter.cpp index 4103a39e70..a73be2e081 100644 --- a/utils/TableGen/ClangAttrEmitter.cpp +++ b/utils/TableGen/ClangAttrEmitter.cpp @@ -12,8 +12,8 @@ //===----------------------------------------------------------------------===// #include "llvm/ADT/SmallString.h" -#include "llvm/ADT/SmallSet.h" #include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/SmallSet.h" #include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringSwitch.h" #include "llvm/TableGen/Error.h" diff --git a/utils/TableGen/NeonEmitter.cpp b/utils/TableGen/NeonEmitter.cpp index a78ae9c062..a8e8e39419 100644 --- a/utils/TableGen/NeonEmitter.cpp +++ b/utils/TableGen/NeonEmitter.cpp @@ -34,11 +34,11 @@ #include "llvm/TableGen/Record.h" #include "llvm/TableGen/SetTheory.h" #include "llvm/TableGen/TableGenBackend.h" -#include +#include +#include #include +#include #include -#include -#include using namespace llvm; namespace { -- 2.40.0