From 9383ae1d276484f273cb11b6e5d92d1509118c96 Mon Sep 17 00:00:00 2001 From: Loïc Collignon Date: Fri, 4 Jan 2019 15:49:18 +0100 Subject: c++: Fix multiple definition and cast MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The function was defined as many time as the header was included. Making it a weak function fix the issue. Also, a plain old C cast is required to make this constexpr valid. Change-Id: I278f376e00ec6728272df4fde8ca8984195dd533 Signed-off-by: Loïc Collignon --- include/afb/c++/binding-wrap.hpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'include/afb/c++') diff --git a/include/afb/c++/binding-wrap.hpp b/include/afb/c++/binding-wrap.hpp index 8eddc58b..81122cbc 100644 --- a/include/afb/c++/binding-wrap.hpp +++ b/include/afb/c++/binding-wrap.hpp @@ -571,8 +571,7 @@ constexpr afb_verb_t verb( return r; } -#if AFB_BINDING_VERSION >= 3 -void __afb__verb__cb__for__global__(afb_req_t r) +void __attribute__((weak)) __afb__verb__cb__for__global__(afb_req_t r) { void *vcbdata; void (*callback)(req); @@ -587,8 +586,7 @@ constexpr afb_verb_t verb( void (&callback)(req), const char *info = nullptr, uint16_t session = 0, - const afb_auth *auth = nullptr - , + const afb_auth *auth = nullptr, bool glob = false, void *vcbdata = nullptr ) @@ -600,10 +598,9 @@ constexpr afb_verb_t verb( session, auth, glob, - reinterpret_cast(&callback) + (void*)(&callback) ); } -#endif constexpr afb_verb_t verbend() { -- cgit 1.2.3-korg