mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-14 05:49:57 +00:00
Khem Raj
394f3537c5
GPR_ASSERT is removed from latest gprc Fixes | /home/pokybuild/yocto-worker/meta-oe/build/build/tmp-glibc/work/core2-64-poky-linux/etcd-cpp-apiv3/0.15.4/git/src/v3/Action.cpp: In member function 'void etcdv3::Action::waitForResponse()': | /home/pokybuild/yocto-worker/meta-oe/build/build/tmp-glibc/work/core2-64-poky-linux/etcd-cpp-apiv3/0.15.4/git/src/v3/Action.cpp:101:5: error: 'GPR_ASSERT' was not declared in this scope | 101 | GPR_ASSERT(got_tag == (void*) this); | | ^~~~~~~~~~ Signed-off-by: Khem Raj <raj.khem@gmail.com>
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From aeb34f58782fb6d06aea4f5cbeccb23a0224466e Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Wed, 4 Sep 2024 14:54:42 -0700
|
|
Subject: [PATCH] Replacing GPR_ASSERT with c assert
|
|
|
|
Latest GRPC >= 2.66 has dropped GRPC_ASSERT macro [1]
|
|
|
|
[1] https://github.com/grpc/grpc/commit/0e23c2259da967a037e839e80cafd62bc6f9f68e
|
|
|
|
Upstream-Status: Submitted [https://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3/pull/281]
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
src/v3/Action.cpp | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
--- a/src/v3/Action.cpp
|
|
+++ b/src/v3/Action.cpp
|
|
@@ -2,6 +2,15 @@
|
|
#include <grpc/support/log.h>
|
|
#include <grpcpp/support/status.h>
|
|
#include "etcd/v3/action_constants.hpp"
|
|
+#include <cstdlib>
|
|
+
|
|
+#ifndef GPR_ASSERT
|
|
+#define GPR_ASSERT(x) \
|
|
+ if (!(x)) { \
|
|
+ fprintf(stderr, "%s:%d assert failed\n", __FILE__, __LINE__); \
|
|
+ abort(); \
|
|
+}
|
|
+#endif
|
|
|
|
etcdv3::Action::Action(etcdv3::ActionParameters const& params) {
|
|
parameters = params;
|