forked from Kistler-Group/sdbus-cpp
Improve ABI
This commit is contained in:
@ -64,10 +64,6 @@ namespace sdbus {
|
|||||||
*/
|
*/
|
||||||
struct PollData
|
struct PollData
|
||||||
{
|
{
|
||||||
/*!
|
|
||||||
* The read fd to be monitored by the event loop.
|
|
||||||
*/
|
|
||||||
int event_fd;
|
|
||||||
/*!
|
/*!
|
||||||
* The read fd to be monitored by the event loop.
|
* The read fd to be monitored by the event loop.
|
||||||
*/
|
*/
|
||||||
@ -82,6 +78,11 @@ namespace sdbus {
|
|||||||
*/
|
*/
|
||||||
uint64_t timeout_usec;
|
uint64_t timeout_usec;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* The read fd to be monitored by the event loop.
|
||||||
|
*/
|
||||||
|
int event_fd;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* Get the event poll timeout.
|
* Get the event poll timeout.
|
||||||
*
|
*
|
||||||
|
@ -146,7 +146,7 @@ Connection::PollData Connection::getEventLoopPollData() const
|
|||||||
auto r = iface_->sd_bus_get_poll_data(bus_.get(), &pollData);
|
auto r = iface_->sd_bus_get_poll_data(bus_.get(), &pollData);
|
||||||
SDBUS_THROW_ERROR_IF(r < 0, "Failed to get bus poll data", -r);
|
SDBUS_THROW_ERROR_IF(r < 0, "Failed to get bus poll data", -r);
|
||||||
|
|
||||||
return {eventFd_.fd, pollData.fd, pollData.events, pollData.timeout_usec};
|
return {pollData.fd, pollData.events, pollData.timeout_usec, eventFd_.fd};
|
||||||
}
|
}
|
||||||
|
|
||||||
const ISdBus& Connection::getSdBusInterface() const
|
const ISdBus& Connection::getSdBusInterface() const
|
||||||
|
Reference in New Issue
Block a user