rebase of the patch

This commit is contained in:
Sylvestre Ledru 2023-02-23 23:31:26 +01:00
parent f5433cbb4d
commit 16ee64a21c

View File

@ -1,15 +1,15 @@
Index: llvm-toolchain-snapshot_16~++20221126040739+502c246519ec/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
Index: llvm-toolchain-snapshot_17~++20230223111257+4f0aa2517d0c/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
===================================================================
--- llvm-toolchain-snapshot_16~++20221126040739+502c246519ec.orig/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
+++ llvm-toolchain-snapshot_16~++20221126040739+502c246519ec/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
@@ -67,8 +67,8 @@ int main(int argc, char *argv[]) {
google::protobuf::util::MessageToJsonString(Response, &Output, Options);
--- llvm-toolchain-snapshot_17~++20230223111257+4f0aa2517d0c.orig/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
+++ llvm-toolchain-snapshot_17~++20230223111257+4f0aa2517d0c/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
@@ -68,8 +68,9 @@ int main(int argc, char *argv[]) {
if (!JsonStatus.ok()) {
clang::clangd::elog("Can not convert response ({0}) to JSON ({1}): {2}\n",
- Response.DebugString(), JsonStatus.error_code(),
- JsonStatus.error_message().as_string());
+ Response.DebugString(), (int)JsonStatus.code(),
+ JsonStatus.message().as_string());
Response.DebugString(),
- static_cast<int>(JsonStatus.code()),
+ (int)JsonStatus.code(),
JsonStatus.message().as_string());
+
return -1;
}
llvm::outs() << Output;