feedc0de/sdbus-cpp
1
0
Fork 0
forked from Kistler-Group/sdbus-cpp
Code Pull Requests Activity

refactor: remove deprecated dont_request_slot_t tag

Browse Source
This commit is contained in:
Stanislav Angelovic
2023-12-30 19:27:22 +01:00
committed by Stanislav Angelovič
parent dc0c2562b8
commit f1b9226491
3 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/sdbus-c++/Message.h
View File

@ -245,7 +245,6 @@ namespace sdbus {
MethodCall() = default; MethodCall() = default;
MethodReply send(uint64_t timeout) const; 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; void send(void* callback, void* userData, uint64_t timeout, floating_slot_t) const;
[[nodiscard]] Slot send(void* callback, void* userData, uint64_t timeout) const; [[nodiscard]] Slot send(void* callback, void* userData, uint64_t timeout) const;

3
include/sdbus-c++/TypeTraits.h
View File

@ -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) // 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; }; struct floating_slot_t { explicit floating_slot_t() = default; };
inline constexpr floating_slot_t floating_slot{}; 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 // Tag denoting the assumption that the caller has already obtained message ownership
struct adopt_message_t { explicit adopt_message_t() = default; }; struct adopt_message_t { explicit adopt_message_t() = default; };
inline constexpr adopt_message_t adopt_message{}; inline constexpr adopt_message_t adopt_message{};

5
src/Message.cpp
View File

@ -813,11 +813,6 @@ MethodReply MethodCall::sendWithNoReply() const
return Factory::create<MethodReply>(); // No reply return Factory::create<MethodReply>(); // 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 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); auto r = sdbus_->sd_bus_call_async(nullptr, nullptr, (sd_bus_message*)msg_, (sd_bus_message_handler_t)callback, userData, timeout);