Update the gRPC inports.

<grpc++/*.h> has been deprecated in favor of <grpcpp/*.h>. Include all of grpcpp.h to avoid inclusion issues. Import <grpcpp/support/sync_stream.h> to get the streaming APIs.
OpenSSE · Nov 14, 2019 · 2c2468e · 2c2468e
1 parent be28a29
commit 2c2468e
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 35 deletions.
diff --git a/ci/install_grpc.sh b/ci/install_grpc.sh
@@ -7,7 +7,7 @@ normal=$(tput sgr0)
 green=$(tput setaf 2)
 
 
-if [ -d "$INSTALL_DIR/include/google" ] && [ -d "$INSTALL_DIR/include/grpc" ] && [ -d "$INSTALL_DIR/include/grpc++" ]  && [ -f "$INSTALL_DIR/lib/libprotobuf.a" ] && [ -f "$INSTALL_DIR/lib/libgrpc.a" ]  && [ -f "$INSTALL_DIR/bin/protoc" ]; then
+if [ -d "$INSTALL_DIR/include/google" ] && [ -d "$INSTALL_DIR/include/grpc" ] && [ -d "$INSTALL_DIR/include/grpcpp" ]  && [ -f "$INSTALL_DIR/lib/libprotobuf.a" ] && [ -f "$INSTALL_DIR/lib/libgrpc.a" ]  && [ -f "$INSTALL_DIR/bin/protoc" ]; then
 	echo "${bold}${green}gRPC is already installed${normal}"
 else
 	echo "${bold}${green}Install gRPC${normal}"

diff --git a/cmake/FindGRPC.cmake b/cmake/FindGRPC.cmake
@@ -85,6 +85,10 @@ endif()
 find_path(GRPC_INCLUDE_DIR grpc/grpc.h)
 mark_as_advanced(GRPC_INCLUDE_DIR)
 
+# Find gRPC C++ include directory
+find_path(GRPCPP_INCLUDE_DIR grpcpp/grpcpp.h)
+mark_as_advanced(GRPCPP_INCLUDE_DIR)
+
 # Find gRPC library
 find_library(GRPC_LIBRARY NAMES grpc)
 mark_as_advanced(GRPC_LIBRARY)
@@ -100,7 +104,7 @@ find_library(GRPC_GRPC++_LIBRARY NAMES grpc++)
 mark_as_advanced(GRPC_GRPC++_LIBRARY)
 add_library(gRPC::grpc++ UNKNOWN IMPORTED)
 set_target_properties(gRPC::grpc++ PROPERTIES
-    INTERFACE_INCLUDE_DIRECTORIES ${GRPC_INCLUDE_DIR}
+    INTERFACE_INCLUDE_DIRECTORIES ${GRPCPP_INCLUDE_DIR}
     INTERFACE_LINK_LIBRARIES gRPC::grpc
     IMPORTED_LOCATION ${GRPC_GRPC++_LIBRARY}
 )

diff --git a/lib/diana/client_runner.cpp b/lib/diana/client_runner.cpp
@@ -30,11 +30,10 @@
 
 #include <sse/dbparser/json/DBParserJSON.h>
 
-#include <grpc++/client_context.h>
-#include <grpc++/create_channel.h>
-#include <grpc++/security/credentials.h>
 #include <grpc/grpc.h>
 
+#include <grpcpp/grpcpp.h>
+
 #include <chrono>
 #include <fstream>
 #include <iostream>

diff --git a/lib/diana/server_runner.cpp b/lib/diana/server_runner.cpp
@@ -27,12 +27,10 @@
 
 #include <sse/crypto/wrapper.hpp>
 
-#include <grpc++/security/server_credentials.h>
-#include <grpc++/server.h>
-#include <grpc++/server_builder.h>
-#include <grpc++/server_context.h>
 #include <grpc/grpc.h>
 
+#include <grpcpp/grpcpp.h>
+
 #include <atomic>
 #include <fstream>
 #include <thread>

diff --git a/lib/diana/server_runner_private.hpp b/lib/diana/server_runner_private.hpp
@@ -27,8 +27,7 @@
 
 #include <sse/crypto/wrapper.hpp>
 
-#include <grpc++/server.h>
-#include <grpc++/server_context.h>
+#include <grpcpp/grpcpp.h>
 
 #include <memory>
 #include <mutex>

diff --git a/lib/include/sse/runners/diana/client_runner.hpp b/lib/include/sse/runners/diana/client_runner.hpp
@@ -26,8 +26,9 @@
 #include <sse/crypto/wrapper.hpp>
 
 #include <google/protobuf/empty.pb.h> // For ::google::protobuf::Empty
-#include <grpc++/channel.h>
-#include <grpc++/completion_queue.h>
+
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/support/sync_stream.h>
 
 #include <atomic>
 #include <condition_variable>

diff --git a/lib/include/sse/runners/diana/server_runner.hpp b/lib/include/sse/runners/diana/server_runner.hpp
@@ -23,7 +23,7 @@
 
 #include <sse/schemes/diana/diana_server.hpp>
 
-#include <grpc++/server.h>
+#include <grpcpp/grpcpp.h>
 
 #include <mutex>
 #include <string>

diff --git a/lib/include/sse/runners/sophos/sophos_client_runner.hpp b/lib/include/sse/runners/sophos/sophos_client_runner.hpp
@@ -24,8 +24,9 @@
 #include <sse/schemes/sophos/sophos_client.hpp>
 
 #include <google/protobuf/empty.pb.h> // For ::google::protobuf::Empty
-#include <grpc++/channel.h>
-#include <grpc++/completion_queue.h>
+
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/support/sync_stream.h>
 
 #include <atomic>
 #include <condition_variable>

diff --git a/lib/include/sse/runners/sophos/sophos_server_runner.hpp b/lib/include/sse/runners/sophos/sophos_server_runner.hpp
@@ -21,8 +21,7 @@
 
 #pragma once
 
-#include <grpc++/server.h>
-#include <grpc++/server_builder.h>
+#include <grpcpp/grpcpp.h>
 
 #include <string>
 

diff --git a/lib/sophos/sophos_client_runner.cpp b/lib/sophos/sophos_client_runner.cpp
@@ -32,10 +32,10 @@
 
 #include <sse/dbparser/json/DBParserJSON.h>
 
-#include <grpc++/client_context.h>
-#include <grpc++/security/credentials.h>
 #include <grpc/grpc.h>
 
+#include <grpcpp/grpcpp.h>
+
 #include <chrono>
 #include <fstream>
 #include <iostream>

diff --git a/lib/sophos/sophos_server_runner.cpp b/lib/sophos/sophos_server_runner.cpp
@@ -25,12 +25,10 @@
 #include <sse/schemes/utils/logger.hpp>
 #include <sse/schemes/utils/utils.hpp>
 
-#include <grpc++/security/server_credentials.h>
-#include <grpc++/server.h>
-#include <grpc++/server_builder.h>
-#include <grpc++/server_context.h>
 #include <grpc/grpc.h>
 
+#include <grpcpp/grpcpp.h>
+
 #include <atomic>
 #include <fstream>
 #include <thread>

diff --git a/lib/sophos/sophos_server_runner_private.hpp b/lib/sophos/sophos_server_runner_private.hpp
@@ -26,8 +26,8 @@
 #include <sse/schemes/sophos/sophos_server.hpp>
 
 #include <google/protobuf/empty.pb.h> // For ::google::protobuf::Empty
-#include <grpc++/server.h>
-#include <grpc++/server_context.h>
+
+#include <grpcpp/grpcpp.h>
 
 #include <memory>
 #include <mutex>

diff --git a/src/diana_client.cpp b/src/diana_client.cpp
@@ -12,8 +12,6 @@
 
 #include <sse/crypto/utils.hpp>
 
-#include <grpc++/create_channel.h>
-
 #include <cstdio>
 #include <unistd.h>
 

diff --git a/src/diana_server.cpp b/src/diana_server.cpp
@@ -11,10 +11,9 @@
 
 #include <sse/crypto/utils.hpp>
 
-#include <grpc++/server.h>
-
 #include <csignal>
 #include <cstdio>
+#include <grpcpp/grpcpp.h>
 #include <unistd.h>
 
 sse::diana::DianaServerRunner* server_ptr__ = nullptr;

diff --git a/src/sophos_client.cpp b/src/sophos_client.cpp
@@ -12,9 +12,8 @@
 
 #include <sse/crypto/utils.hpp>
 
-#include <grpc++/create_channel.h>
-
 #include <cstdio>
+#include <grpcpp/grpcpp.h>
 #include <unistd.h>
 
 #include <mutex>

diff --git a/test/runners.cpp b/test/runners.cpp
@@ -8,9 +8,7 @@
 #include <sse/crypto/utils.hpp>
 #include <sse/dbparser/json/DBParserJSON.h>
 
-#include <grpc++/create_channel.h>
-#include <grpc++/impl/codegen/service_type.h>
-#include <grpc++/server_builder.h>
+#include <grpcpp/grpcpp.h>
 
 #include <algorithm>
 #include <condition_variable>