From 7cc743ff5ea61da7a6f3ba57e39815d2efe66ecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Mon, 11 Sep 2023 11:30:22 -0400 Subject: [PATCH] callbacks: make raw callbacks noexcept --- include/opendht/callbacks.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/include/opendht/callbacks.h b/include/opendht/callbacks.h index f01c8b48..1fc21070 100644 --- a/include/opendht/callbacks.h +++ b/include/opendht/callbacks.h @@ -173,18 +173,17 @@ using IdentityAnnouncedCb = std::function<void(bool)>; using PublicAddressChangedCb = std::function<void(std::vector<SockAddr>)>; using CertificateStoreQuery = std::function<std::vector<std::shared_ptr<crypto::Certificate>>(const InfoHash& pk_id)>; - -typedef bool (*GetCallbackRaw)(std::shared_ptr<Value>, void *user_data); -typedef bool (*ValueCallbackRaw)(std::shared_ptr<Value>, bool expired, void *user_data); - using DoneCallback = std::function<void(bool success, const std::vector<std::shared_ptr<Node>>& nodes)>; -typedef void (*DoneCallbackRaw)(bool, std::vector<std::shared_ptr<Node>>*, void *user_data); -typedef void (*ShutdownCallbackRaw)(void *user_data); -typedef void (*DoneCallbackSimpleRaw)(bool, void *user_data); -typedef bool (*FilterRaw)(const Value&, void *user_data); - using DoneCallbackSimple = std::function<void(bool success)>; +typedef bool (*GetCallbackRaw)(std::shared_ptr<Value>, void *user_data) noexcept; +typedef bool (*ValueCallbackRaw)(std::shared_ptr<Value>, bool expired, void *user_data) noexcept; +typedef void (*DoneCallbackRaw)(bool, std::vector<std::shared_ptr<Node>>*, void *user_data) noexcept; +typedef void (*ShutdownCallbackRaw)(void *user_data) noexcept; +typedef void (*DoneCallbackSimpleRaw)(bool, void *user_data) noexcept; +typedef bool (*FilterRaw)(const Value&, void *user_data) noexcept; + + OPENDHT_PUBLIC GetCallbackSimple bindGetCb(GetCallbackRaw raw_cb, void* user_data); OPENDHT_PUBLIC GetCallback bindGetCb(GetCallbackSimple cb); OPENDHT_PUBLIC ValueCallback bindValueCb(ValueCallbackRaw raw_cb, void* user_data); -- GitLab