sammccall created this revision. sammccall added a reviewer: kadircet. Herald added subscribers: usaxena95, arphaman, mgorny. sammccall requested review of this revision. Herald added subscribers: cfe-commits, MaskRay, ilya-biryukov. Herald added a project: clang-tools-extra.
Fixes https://github.com/clangd/clangd/issues/835 Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D107624 Files: clang-tools-extra/clangd/CMakeLists.txt clang-tools-extra/clangd/ClangdLSPServer.cpp clang-tools-extra/clangd/ConfigCompile.cpp clang-tools-extra/clangd/Feature.cpp clang-tools-extra/clangd/Feature.h clang-tools-extra/clangd/Features.cpp clang-tools-extra/clangd/Features.h clang-tools-extra/clangd/ParsedAST.cpp clang-tools-extra/clangd/Transport.h clang-tools-extra/clangd/index/remote/Client.cpp clang-tools-extra/clangd/index/remote/server/Server.cpp clang-tools-extra/clangd/tool/ClangdMain.cpp clang-tools-extra/clangd/unittests/ConfigCompileTests.cpp clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
Index: clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp =================================================================== --- clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp +++ clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp @@ -9,8 +9,8 @@ #include "Annotations.h" #include "Config.h" #include "Diagnostics.h" +#include "Feature.h" #include "FeatureModule.h" -#include "Features.h" #include "ParsedAST.h" #include "Protocol.h" #include "SourceCode.h" Index: clang-tools-extra/clangd/unittests/ConfigCompileTests.cpp =================================================================== --- clang-tools-extra/clangd/unittests/ConfigCompileTests.cpp +++ clang-tools-extra/clangd/unittests/ConfigCompileTests.cpp @@ -9,7 +9,7 @@ #include "Config.h" #include "ConfigFragment.h" #include "ConfigTesting.h" -#include "Features.h" +#include "Feature.h" #include "TestFS.h" #include "clang/Basic/DiagnosticSema.h" #include "llvm/ADT/None.h" Index: clang-tools-extra/clangd/tool/ClangdMain.cpp =================================================================== --- clang-tools-extra/clangd/tool/ClangdMain.cpp +++ clang-tools-extra/clangd/tool/ClangdMain.cpp @@ -10,7 +10,7 @@ #include "CodeComplete.h" #include "Config.h" #include "ConfigProvider.h" -#include "Features.h" +#include "Feature.h" #include "PathMapping.h" #include "Protocol.h" #include "TidyProvider.h" Index: clang-tools-extra/clangd/index/remote/server/Server.cpp =================================================================== --- clang-tools-extra/clangd/index/remote/server/Server.cpp +++ clang-tools-extra/clangd/index/remote/server/Server.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "Features.h" +#include "Feature.h" #include "Index.pb.h" #include "MonitoringService.grpc.pb.h" #include "MonitoringService.pb.h" Index: clang-tools-extra/clangd/index/remote/Client.cpp =================================================================== --- clang-tools-extra/clangd/index/remote/Client.cpp +++ clang-tools-extra/clangd/index/remote/Client.cpp @@ -9,7 +9,7 @@ #include <grpc++/grpc++.h> #include "Client.h" -#include "Features.h" +#include "Feature.h" #include "Service.grpc.pb.h" #include "index/Index.h" #include "marshalling/Marshalling.h" Index: clang-tools-extra/clangd/Transport.h =================================================================== --- clang-tools-extra/clangd/Transport.h +++ clang-tools-extra/clangd/Transport.h @@ -18,7 +18,7 @@ #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_TRANSPORT_H_ #define LLVM_CLANG_TOOLS_EXTRA_CLANGD_TRANSPORT_H_ -#include "Features.h" +#include "Feature.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/JSON.h" #include "llvm/Support/raw_ostream.h" Index: clang-tools-extra/clangd/ParsedAST.cpp =================================================================== --- clang-tools-extra/clangd/ParsedAST.cpp +++ clang-tools-extra/clangd/ParsedAST.cpp @@ -14,8 +14,8 @@ #include "Compiler.h" #include "Config.h" #include "Diagnostics.h" +#include "Feature.h" #include "FeatureModule.h" -#include "Features.h" #include "Headers.h" #include "HeuristicResolver.h" #include "IncludeFixer.h" Index: clang-tools-extra/clangd/Feature.h =================================================================== --- clang-tools-extra/clangd/Feature.h +++ clang-tools-extra/clangd/Feature.h @@ -1,13 +1,16 @@ -//===--- Features.h - Compile-time configuration ------------------*-C++-*-===// +//===--- Feature.h - Compile-time configuration ------------------*-C++-*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// +// This file is not named "Features.h" because of a conflict with libstdc++: +// https://github.com/clangd/clangd/issues/835 +//===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_FEATURES_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_FEATURES_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_FEATURE_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_FEATURE_H #include <string> // Export constants like CLANGD_BUILD_XPC Index: clang-tools-extra/clangd/Feature.cpp =================================================================== --- clang-tools-extra/clangd/Feature.cpp +++ clang-tools-extra/clangd/Feature.cpp @@ -1,4 +1,4 @@ -//===--- Features.cpp - Compile-time configuration ------------------------===// +//===--- Feature.cpp - Compile-time configuration ------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "Features.h" +#include "Feature.h" #include "clang/Basic/Version.h" #include "llvm/Support/Compiler.h" #include "llvm/Support/Host.h" Index: clang-tools-extra/clangd/ConfigCompile.cpp =================================================================== --- clang-tools-extra/clangd/ConfigCompile.cpp +++ clang-tools-extra/clangd/ConfigCompile.cpp @@ -28,7 +28,7 @@ #include "ConfigFragment.h" #include "ConfigProvider.h" #include "Diagnostics.h" -#include "Features.h" +#include "Feature.h" #include "TidyProvider.h" #include "support/Logger.h" #include "support/Path.h" Index: clang-tools-extra/clangd/ClangdLSPServer.cpp =================================================================== --- clang-tools-extra/clangd/ClangdLSPServer.cpp +++ clang-tools-extra/clangd/ClangdLSPServer.cpp @@ -12,7 +12,7 @@ #include "Diagnostics.h" #include "DraftStore.h" #include "DumpAST.h" -#include "Features.h" +#include "Feature.h" #include "GlobalCompilationDatabase.h" #include "LSPBinder.h" #include "Protocol.h" Index: clang-tools-extra/clangd/CMakeLists.txt =================================================================== --- clang-tools-extra/clangd/CMakeLists.txt +++ clang-tools-extra/clangd/CMakeLists.txt @@ -71,7 +71,7 @@ DumpAST.cpp ExpectedTypes.cpp FeatureModule.cpp - Features.cpp + Feature.cpp FindSymbols.cpp FindTarget.cpp FileDistance.cpp
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
