Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
c++: Fix multiple definition and cast
[src/app-framework-binder.git]
/
include
/
afb
/
c++
/
binding-wrap.hpp
diff --git
a/include/afb/c++/binding-wrap.hpp
b/include/afb/c++/binding-wrap.hpp
index
8eddc58
..
81122cb
100644
(file)
--- 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;
}
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);
{
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,
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
)
bool glob = false,
void *vcbdata = nullptr
)
@@
-600,10
+598,9
@@
constexpr afb_verb_t verb(
session,
auth,
glob,
session,
auth,
glob,
-
reinterpret_cast<void*>
(&callback)
+
(void*)
(&callback)
);
}
);
}
-#endif
constexpr afb_verb_t verbend()
{
constexpr afb_verb_t verbend()
{