diff options
| author | stoffu <stoffu@protonmail.ch> | 2018-03-06 11:58:57 +0900 |
|---|---|---|
| committer | stoffu <stoffu@protonmail.ch> | 2018-03-07 07:42:28 +0900 |
| commit | 49c70962eeb113a2399ba4fe8a6778565c9dac78 (patch) | |
| tree | a296559419adb42d61a1ac41db1a765514c0804d | |
| parent | Merge pull request #3253 (diff) | |
| download | monero-49c70962eeb113a2399ba4fe8a6778565c9dac78.tar.xz | |
device: remove dependency on readline
| -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); } |