From 1bb33156f7ce15cf6e7b4736dbce845428ca4819 Mon Sep 17 00:00:00 2001 From: Kyle Schwarz Date: Thu, 21 Jul 2022 22:37:48 -0400 Subject: [PATCH] Device: Use lambda instead of std::bind --- include/icsneo/device/device.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/include/icsneo/device/device.h b/include/icsneo/device/device.h index efdd120..03abb4e 100644 --- a/include/icsneo/device/device.h +++ b/include/icsneo/device/device.h @@ -398,7 +398,11 @@ protected: setupDecoder(*decoder); com = makeCommunication( makeDriver(report, getWritableNeoDevice()), - std::bind(&Device::makeConfiguredPacketizer, this), + [this]() -> std::unique_ptr { + auto packetizer = makePacketizer(); + setupPacketizer(*packetizer); + return packetizer; + }, std::move(encoder), std::move(decoder) ); @@ -420,11 +424,6 @@ protected: virtual std::unique_ptr makePacketizer() { return std::unique_ptr(new Packetizer(report)); } virtual void setupPacketizer(Packetizer&) {} - std::unique_ptr makeConfiguredPacketizer() { - auto packetizer = makePacketizer(); - setupPacketizer(*packetizer); - return packetizer; - } virtual std::unique_ptr makeEncoder() { return std::unique_ptr(new Encoder(report)); } virtual void setupEncoder(Encoder&) {}