From efe04128fb6456d32f6aa89b2f635a90d25a231a Mon Sep 17 00:00:00 2001 From: Paul Hollinsky Date: Thu, 4 Oct 2018 17:28:35 -0400 Subject: [PATCH] IDeviceSettings is now referenced by unique_ptr, rather than shared_ptr --- device/include/device.h | 2 +- device/neovifire2/include/neovifire2eth.h | 2 +- device/neovifire2/include/neovifire2usb.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/device/include/device.h b/device/include/device.h index 8264536..75f9e6b 100644 --- a/device/include/device.h +++ b/device/include/device.h @@ -56,7 +56,7 @@ public: enforcePollingMessageLimit(); } - std::shared_ptr settings; + std::unique_ptr settings; protected: uint16_t productId = 0; diff --git a/device/neovifire2/include/neovifire2eth.h b/device/neovifire2/include/neovifire2eth.h index 17556fb..7f78a8e 100644 --- a/device/neovifire2/include/neovifire2eth.h +++ b/device/neovifire2/include/neovifire2eth.h @@ -17,7 +17,7 @@ public: auto encoder = std::unique_ptr(new Encoder(packetizer)); auto decoder = std::unique_ptr(new Decoder()); com = std::make_shared(std::move(transport), packetizer, std::move(encoder), std::move(decoder)); - settings = std::make_shared(com); + settings = std::unique_ptr(new NeoVIFIRE2Settings(com)); productId = PRODUCT_ID; } diff --git a/device/neovifire2/include/neovifire2usb.h b/device/neovifire2/include/neovifire2usb.h index ad78c01..4c968a0 100644 --- a/device/neovifire2/include/neovifire2usb.h +++ b/device/neovifire2/include/neovifire2usb.h @@ -16,7 +16,7 @@ public: auto encoder = std::unique_ptr(new Encoder(packetizer)); auto decoder = std::unique_ptr(new Decoder()); com = std::make_shared(std::move(transport), packetizer, std::move(encoder), std::move(decoder)); - settings = std::make_shared(com); + settings = std::unique_ptr(new NeoVIFIRE2Settings(com)); productId = PRODUCT_ID; }