[clangd] fix compilation errors with newer versions of gRPC

[0xacc]

in recent versions of gRPC, header files with prefix grpc++ are deprecated.

gRPC headers in include/grpc++ are deprecated since gRPC 1.10.0 https://github.com/grpc/grpc/releases/tag/v1.10.0 , this PR should close clangd/clangd#1603

[llvmbot]

@llvm/pr-subscribers-clangd

Changes

in recent versions of gRPC, header files with prefix grpc++ are deprecated.

gRPC headers in include/grpc++ are deprecated since gRPC 1.10.0 https://github.com/grpc/grpc/releases/tag/v1.10.0 , this PR should close clangd/clangd#1603

---

Full diff: https://github.com/llvm/llvm-project/pull/67258.diff

3 Files Affected:

• (modified) clang-tools-extra/clangd/index/remote/Client.cpp (+1-1)
• (modified) clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp (+1-1)
• (modified) clang-tools-extra/clangd/index/remote/server/Server.cpp (+3-3)

diff --git a/clang-tools-extra/clangd/index/remote/Client.cpp b/clang-tools-extra/clangd/index/remote/Client.cpp
index 391da3916259c67..bc95d0787fdb74e 100644
--- a/clang-tools-extra/clangd/index/remote/Client.cpp
+++ b/clang-tools-extra/clangd/index/remote/Client.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <grpc++/grpc++.h>
+#include <grpcpp/grpcpp.h>
 
 #include "Client.h"
 #include "Feature.h"
diff --git a/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp b/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
index 9a58b5871bfce1a..ad391573804f4da 100644
--- a/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
+++ b/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
@@ -16,7 +16,7 @@
 
 #include <chrono>
 #include <google/protobuf/util/json_util.h>
-#include <grpc++/grpc++.h>
+#include <grpcpp/grpcpp.h>
 
 namespace clang {
 namespace clangd {
diff --git a/clang-tools-extra/clangd/index/remote/server/Server.cpp b/clang-tools-extra/clangd/index/remote/server/Server.cpp
index e108d4d0b057ba2..ad075c4446cad18 100644
--- a/clang-tools-extra/clangd/index/remote/server/Server.cpp
+++ b/clang-tools-extra/clangd/index/remote/server/Server.cpp
@@ -33,8 +33,8 @@
 #include "llvm/Support/VirtualFileSystem.h"
 
 #include <chrono>
-#include <grpc++/grpc++.h>
-#include <grpc++/health_check_service_interface.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
 #include <memory>
 #include <optional>
 #include <string>
@@ -42,7 +42,7 @@
 #include <utility>
 
 #if ENABLE_GRPC_REFLECTION
-#include <grpc++/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
 #endif
 
 #ifdef __GLIBC__