diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/debug_utilities/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/device/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/device/device.cpp | 9 | ||||
| -rw-r--r-- | src/wallet/api/wallet_manager.cpp | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/src/debug_utilities/CMakeLists.txt b/src/debug_utilities/CMakeLists.txt index 6942399e4..1bcbfd0cf 100644 --- a/src/debug_utilities/CMakeLists.txt +++ b/src/debug_utilities/CMakeLists.txt @@ -38,6 +38,8 @@ target_link_libraries(cn_deserialize LINK_PRIVATE cryptonote_core blockchain_db + device + ringct p2p epee ${CMAKE_THREAD_LIBS_INIT}) 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); } diff --git a/src/wallet/api/wallet_manager.cpp b/src/wallet/api/wallet_manager.cpp index 5b6df8a9c..b03332f40 100644 --- a/src/wallet/api/wallet_manager.cpp +++ b/src/wallet/api/wallet_manager.cpp @@ -37,7 +37,7 @@ #include "common/updates.h" #include "version.h" #include "net/http_client.h" -#include "deviuce/device.hpp" +#include "device/device.hpp" #include <boost/filesystem.hpp> #include <boost/regex.hpp> |