You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ch...@apache.org on 2018/03/21 20:31:18 UTC
[04/11] mesos git commit: Adapted the new `grpcpp` C++ headers for
gRPC v1.10 in Mesos.
Adapted the new `grpcpp` C++ headers for gRPC v1.10 in Mesos.
Review: https://reviews.apache.org/r/66097
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d68e50cc
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d68e50cc
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d68e50cc
Branch: refs/heads/master
Commit: d68e50ccf447036ca326b407fe63342e2c18ff3b
Parents: a97611d
Author: Chun-Hung Hsiao <ch...@mesosphere.io>
Authored: Fri Mar 16 14:49:19 2018 -0700
Committer: Chun-Hung Hsiao <ch...@mesosphere.io>
Committed: Wed Mar 21 12:23:10 2018 -0700
----------------------------------------------------------------------
configure.ac | 4 ++--
src/examples/test_csi_plugin.cpp | 8 ++++----
src/tests/mock_csi_plugin.hpp | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/d68e50cc/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index f3d1169..f0f901f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1990,9 +1990,9 @@ if test "x$enable_grpc" = "xyes"; then
saved_LIBS="$LIBS"
LIBS="-lgrpc++ -lgrpc -lgpr $LIBS"
AC_LANG_PUSH([C++])
- AC_CHECK_HEADERS([grpc++/grpc++.h],
+ AC_CHECK_HEADERS([grpcpp/grpcpp.h],
[AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([#include <grpc++/grpc++.h>],
+ [AC_LANG_PROGRAM([#include <grpcpp/grpcpp.h>],
[grpc::Version();])],
[found_grpc=yes],
[found_grpc=no])],
http://git-wip-us.apache.org/repos/asf/mesos/blob/d68e50cc/src/examples/test_csi_plugin.cpp
----------------------------------------------------------------------
diff --git a/src/examples/test_csi_plugin.cpp b/src/examples/test_csi_plugin.cpp
index 0f65c40..1779338 100644
--- a/src/examples/test_csi_plugin.cpp
+++ b/src/examples/test_csi_plugin.cpp
@@ -14,10 +14,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include <grpc++/server.h>
-#include <grpc++/server_builder.h>
-#include <grpc++/server_context.h>
-#include <grpc++/security/server_credentials.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/server_context.h>
+#include <grpcpp/security/server_credentials.h>
#include <stout/bytes.hpp>
#include <stout/flags.hpp>
http://git-wip-us.apache.org/repos/asf/mesos/blob/d68e50cc/src/tests/mock_csi_plugin.hpp
----------------------------------------------------------------------
diff --git a/src/tests/mock_csi_plugin.hpp b/src/tests/mock_csi_plugin.hpp
index c1a9697..d957042 100644
--- a/src/tests/mock_csi_plugin.hpp
+++ b/src/tests/mock_csi_plugin.hpp
@@ -22,7 +22,7 @@
#include <gmock/gmock.h>
-#include <grpc++/grpc++.h>
+#include <grpcpp/grpcpp.h>
#include <stout/nothing.hpp>
#include <stout/try.hpp>