diff --git a/libspinscale b/libspinscale index 42076d6..a53e0ca 160000 --- a/libspinscale +++ b/libspinscale @@ -1 +1 @@ -Subproject commit 42076d6c780a69fb3f645e271adcfb5111c64e0e +Subproject commit a53e0ca32547b07bdcd0bd1e9762ac18c4c0347c diff --git a/smocore/deviceManager/deviceReattacher.cpp b/smocore/deviceManager/deviceReattacher.cpp index 8fe9b0a..f2cde88 100644 --- a/smocore/deviceManager/deviceReattacher.cpp +++ b/smocore/deviceManager/deviceReattacher.cpp @@ -23,9 +23,9 @@ DeviceReattacher::DeviceReattacher( } mrntt::MrnttNonViralPostingInvoker DeviceReattacher::reattachKnownListCReq( + [[maybe_unused]] sscl::co::ExplicitPostTarget postTarget, [[maybe_unused]] std::exception_ptr &exceptionPtr, - [[maybe_unused]] std::function callback, - [[maybe_unused]] sscl::co::ExplicitPostTarget postTarget) + [[maybe_unused]] std::function callback) { /** EXPLANATION: * DeviceManager attach APIs require the marionette thread; postTarget @@ -92,13 +92,13 @@ void DeviceReattacher::holdReattachCReq() reattachCReqInvoker.reset(); reattachCReqInvoker.emplace(reattachKnownListCReq( + sscl::co::ExplicitPostTarget{ioThread->getIoContext()}, reattachLifetimeExceptionPtr, [this]() { sscl::SpinLock::Guard guard(deviceReattacherCanceler.s.lock); reattachOpInFlight = false; - }, - sscl::co::ExplicitPostTarget{ioThread->getIoContext()})); + })); } void DeviceReattacher::onTimeout(const boost::system::error_code& error) diff --git a/smocore/include/deviceManager/deviceReattacher.h b/smocore/include/deviceManager/deviceReattacher.h index c3a542c..93babca 100644 --- a/smocore/include/deviceManager/deviceReattacher.h +++ b/smocore/include/deviceManager/deviceReattacher.h @@ -38,9 +38,9 @@ private: void holdReattachCReq(); mrntt::MrnttNonViralPostingInvoker reattachKnownListCReq( + sscl::co::ExplicitPostTarget postTarget, std::exception_ptr &exceptionPtr, - std::function callback, - sscl::co::ExplicitPostTarget postTarget); + std::function callback); DeviceManager &parent; std::shared_ptr ioThread;