diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-03-05 19:13:40 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-03-05 19:13:40 +0200 |
| commit | 05f0762dc5919d457750839e4b2ffc0dc81a6c61 (patch) | |
| tree | 6f1e7b38606bc5a81a85a367e99adbc19411cc9c | |
| parent | Merge pull request #3338 (diff) | |
| parent | Fix invalid device unique_ptr cast (diff) | |
| download | monero-05f0762dc5919d457750839e4b2ffc0dc81a6c61.tar.xz | |
Merge pull request #3346
25ea307d Fix invalid device unique_ptr cast (MoroccanMalinois)
| -rw-r--r-- | src/device/device_default.cpp | 4 | ||||
| -rw-r--r-- | src/device/device_ledger.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/device/device_default.cpp b/src/device/device_default.cpp index a38d96c15..c3ba42000 100644 --- a/src/device/device_default.cpp +++ b/src/device/device_default.cpp @@ -254,10 +254,10 @@ namespace hw { default_core_device->set_name("default_core_device"); } - registry.insert(std::make_pair("default",default_core_device)); + registry.insert(std::make_pair("default", std::unique_ptr<device>(default_core_device))); } } -}
\ No newline at end of file +} diff --git a/src/device/device_ledger.cpp b/src/device/device_ledger.cpp index e8eb7cc8b..cede834a1 100644 --- a/src/device/device_ledger.cpp +++ b/src/device/device_ledger.cpp @@ -2054,7 +2054,7 @@ namespace hw { legder_device = new device_ledger(); legder_device->set_name("Ledger"); } - registry.insert(std::make_pair("Ledger", legder_device)); + registry.insert(std::make_pair("Ledger", std::unique_ptr<device>(legder_device))); } #else //WITH_DEVICE_LEDGER |