From f1b922649190d69843148939afd4ac39c23ca973 Mon Sep 17 00:00:00 2001 From: Stanislav Angelovic Date: Sat, 30 Dec 2023 19:27:22 +0100 Subject: [PATCH] refactor: remove deprecated dont_request_slot_t tag --- include/sdbus-c++/Message.h | 1 - include/sdbus-c++/TypeTraits.h | 3 --- src/Message.cpp | 5 ----- 3 files changed, 9 deletions(-) diff --git a/include/sdbus-c++/Message.h b/include/sdbus-c++/Message.h index 14d04ad..f112515 100644 --- a/include/sdbus-c++/Message.h +++ b/include/sdbus-c++/Message.h @@ -245,7 +245,6 @@ namespace sdbus { MethodCall() = default; MethodReply send(uint64_t timeout) const; - [[deprecated("Use send overload with floating_slot instead")]] void send(void* callback, void* userData, uint64_t timeout, dont_request_slot_t) const; void send(void* callback, void* userData, uint64_t timeout, floating_slot_t) const; [[nodiscard]] Slot send(void* callback, void* userData, uint64_t timeout) const; diff --git a/include/sdbus-c++/TypeTraits.h b/include/sdbus-c++/TypeTraits.h index 0c6e6de..1131384 100644 --- a/include/sdbus-c++/TypeTraits.h +++ b/include/sdbus-c++/TypeTraits.h @@ -79,9 +79,6 @@ namespace sdbus { // Tag specifying that the library shall own the slot resulting from the call of the function (so-called floating slot) struct floating_slot_t { explicit floating_slot_t() = default; }; inline constexpr floating_slot_t floating_slot{}; - // Deprecated name for the above -- a floating slot - struct dont_request_slot_t { explicit dont_request_slot_t() = default; }; - [[deprecated("Replaced by floating_slot")]] inline constexpr dont_request_slot_t dont_request_slot{}; // Tag denoting the assumption that the caller has already obtained message ownership struct adopt_message_t { explicit adopt_message_t() = default; }; inline constexpr adopt_message_t adopt_message{}; diff --git a/src/Message.cpp b/src/Message.cpp index 2e9ce32..05e6226 100644 --- a/src/Message.cpp +++ b/src/Message.cpp @@ -813,11 +813,6 @@ MethodReply MethodCall::sendWithNoReply() const return Factory::create(); // No reply } -void MethodCall::send(void* callback, void* userData, uint64_t timeout, dont_request_slot_t) const -{ - MethodCall::send(callback, userData, timeout, floating_slot); -} - void MethodCall::send(void* callback, void* userData, uint64_t timeout, floating_slot_t) const { auto r = sdbus_->sd_bus_call_async(nullptr, nullptr, (sd_bus_message*)msg_, (sd_bus_message_handler_t)callback, userData, timeout);