From 35ce466db3aac743f2f40c0e53daac6c480dc147 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Thu, 6 Oct 2022 15:59:40 -0400 Subject: [PATCH 1/2] dbus_cb: change lambda return type to void This avoids build failures on recent OpenBMC like: error: too many arguments to function --- dbus_cb.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/dbus_cb.cpp b/dbus_cb.cpp index 0235426..ed150c7 100644 --- a/dbus_cb.cpp +++ b/dbus_cb.cpp @@ -131,7 +131,6 @@ int onInterfacesAdded(sd_bus_message* rawMsg, void* userData, context->addToEidMap(yield, serviceName); context->networkChangeCallback( userData, event, yield); - return 1; }); } } @@ -179,7 +178,6 @@ int onInterfacesRemoved(sd_bus_message* rawMsg, void* userData, event](boost::asio::yield_context yield) { context->networkChangeCallback( userData, event, yield); - return 1; }); } else From e592a653b6798469a8f28b68095bf939bac9c4ec Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Thu, 6 Oct 2022 16:02:43 -0400 Subject: [PATCH 2/2] meson: move to c++20 sdbusplus no longer supports c++17. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 2302636..a2c991d 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,7 @@ project( default_options: [ 'warning_level=3', 'werror=false', - 'cpp_std=c++17' + 'cpp_std=c++20' ], )