[PATCH] D144599: [clangd/index/remote]NFC: Adapt code to newer grpc/protobuf versions

Matthias Braun via Phabricator via cfe-commits cfe-commits at lists.llvm.org
Wed Feb 22 15:44:03 PST 2023


MatzeB created this revision.
MatzeB added reviewers: kbobyrev, kuganv.
Herald added subscribers: modimo, wenlei, kadircet, arphaman, mcrosier.
Herald added a project: All.
MatzeB requested review of this revision.
Herald added subscribers: cfe-commits, MaskRay, ilya-biryukov.
Herald added a project: clang-tools-extra.

It seems newer grpc / protobuf versions renamed
`Status::error_message()` and `Status::error_code()` to `message()`
and `code()` to prepare for replacement with `absl::Status` with the
same names.

As far as I can tell the new names are already available in the
grpc-1.36 version mentioned in the `README` file.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D144599

Files:
  clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp


Index: clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
===================================================================
--- clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
+++ clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
@@ -67,8 +67,8 @@
       google::protobuf::util::MessageToJsonString(Response, &Output, Options);
   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(), static_cast<int>(JsonStatus.code()),
+                        JsonStatus.message().as_string());
     return -1;
   }
   llvm::outs() << Output;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D144599.499660.patch
Type: text/x-patch
Size: 796 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20230222/9c5cd176/attachment.bin>


More information about the cfe-commits mailing list