diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-03-08 18:43:37 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-03-08 18:43:37 +0200 |
| commit | f4cf613e34ff9c67d837e00029e9a47975e17dd2 (patch) | |
| tree | 66290c9218ca4a0ab40649ecc4e99c9a0fd1844e | |
| parent | Merge pull request #3357 (diff) | |
| parent | device: remove dependency on readline (diff) | |
| download | monero-f4cf613e34ff9c67d837e00029e9a47975e17dd2.tar.xz | |
Merge pull request #3362
49c70962 device: remove dependency on readline (stoffu)
| -rw-r--r-- | src/device/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/device/device.cpp | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt index 26389220f..7eccc1cc2 100644 --- a/src/device/CMakeLists.txt +++ b/src/device/CMakeLists.txt @@ -70,8 +70,6 @@ target_link_libraries(device cncrypto ringct ${OPENSSL_CRYPTO_LIBRARIES} - ${GNU_READLINE_LIBRARY} - ${EPEE_READLINE} PRIVATE ${Blocks} ${EXTRA_LIBRARIES}) diff --git a/src/device/device.cpp b/src/device/device.cpp index 080d83c7e..068529388 100644 --- a/src/device/device.cpp +++ b/src/device/device.cpp @@ -32,7 +32,7 @@ #ifdef HAVE_PCSC #include "device_ledger.hpp" #endif -#include "common/scoped_message_writer.h" +#include "misc_log_ex.h" namespace hw { @@ -56,12 +56,11 @@ namespace hw { auto device = devices.registry.find(device_descriptor); if (device == devices.registry.end()) { - auto logger = tools::fail_msg_writer(); - logger << "device not found in registry '"<<device_descriptor<<"'\n" << - "known devices:"<<device_descriptor<<"'"; + MERROR("device not found in registry: '" << device_descriptor << "'\n" << + "known devices:"); for( const auto& sm_pair : devices.registry ) { - logger<< " - " << sm_pair.first ; + MERROR(" - " << sm_pair.first); } throw std::runtime_error("device not found: "+ device_descriptor); } |