From 8eb1843277aee257024f775c896b60d5090afe9f Mon Sep 17 00:00:00 2001 From: Nikolay Kurtov Date: Fri, 16 May 2025 18:44:03 +0200 Subject: [PATCH 1/2] Define GPR_ASSERT macro to ensure compatibility. Added a fallback definition for GPR_ASSERT using to handle cases where it is not predefined. This ensures smoother compilation and avoids potential issues with missing assertions. Signed-off-by: Nikolay Kurtov Signed-off-by: Nikolay Kurtov --- grpc-sys/grpc_wrap.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/grpc-sys/grpc_wrap.cc b/grpc-sys/grpc_wrap.cc index e37872a9..1975d43c 100644 --- a/grpc-sys/grpc_wrap.cc +++ b/grpc-sys/grpc_wrap.cc @@ -66,6 +66,11 @@ #define GPR_CALLTYPE #endif +#ifndef GPR_ASSERT +#include +#define GPR_ASSERT assert +#endif + grpc_byte_buffer* string_to_byte_buffer(const char* buffer, size_t len) { grpc_slice slice = grpc_slice_from_copied_buffer(buffer, len); grpc_byte_buffer* bb = grpc_raw_byte_buffer_create(&slice, 1); From 76e1ae8588655661a6777cab282c4dc90fac98fc Mon Sep 17 00:00:00 2001 From: Nikolay Kurtov Date: Thu, 22 May 2025 11:19:29 +0200 Subject: [PATCH 2/2] try using ABSL_CHECK. Fails to compile. Needs upgrading to C++14, if not to C++17. --- grpc-sys/build.rs | 4 ++-- grpc-sys/grpc_wrap.cc | 5 +++-- xtask/src/main.rs | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/grpc-sys/build.rs b/grpc-sys/build.rs index 1c3fac68..7dc990ff 100644 --- a/grpc-sys/build.rs +++ b/grpc-sys/build.rs @@ -443,7 +443,7 @@ fn bindgen_grpc(file_path: &Path) { .header("grpc_wrap.cc") .clang_arg("-xc++") .clang_arg("-I./grpc/include") - .clang_arg("-std=c++11") + .clang_arg("-std=c++14") .impl_debug(true) .size_t_is_usize(true) .disable_header_comment() @@ -558,7 +558,7 @@ fn main() { cc.cpp(true); if !cfg!(target_env = "msvc") { - cc.flag("-std=c++11"); + cc.flag("-std=c++14"); } cc.file("grpc_wrap.cc"); cc.warnings_into_errors(true); diff --git a/grpc-sys/grpc_wrap.cc b/grpc-sys/grpc_wrap.cc index 1975d43c..e7cd06ec 100644 --- a/grpc-sys/grpc_wrap.cc +++ b/grpc-sys/grpc_wrap.cc @@ -67,8 +67,9 @@ #endif #ifndef GPR_ASSERT -#include -#define GPR_ASSERT assert +#include +#include +#define GPR_ASSERT ABSL_CHECK #endif grpc_byte_buffer* string_to_byte_buffer(const char* buffer, size_t len) { diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 31bc61fd..97169384 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -105,7 +105,7 @@ fn clang_lint() { "-Igrpc-sys/grpc/include", "-x", "c++", - "-std=c++11", + "-std=c++14", ])); exec(cmd("clang-format").args(&["-i", "grpc-sys/grpc_wrap.cc"])); }