diff options
author | mydesktop <dev.mc2@gmail.com> | 2014-05-25 13:06:40 -0400 |
---|---|---|
committer | mydesktop <dev.mc2@gmail.com> | 2014-05-25 13:06:40 -0400 |
commit | 3a3a8176782a4fa75b0607fba0393c9d4a1746be (patch) | |
tree | e8e38bdeaf0e9ea8ba773bb27e1de4b288b8150d /src/simplewallet | |
parent | Merge pull request #12 from quazarcoin/MRO_master (diff) | |
download | monero-3a3a8176782a4fa75b0607fba0393c9d4a1746be.tar.xz |
0.8.8update
Diffstat (limited to 'src/simplewallet')
-rw-r--r-- | src/simplewallet/simplewallet.cpp | 10 | ||||
-rw-r--r-- | src/simplewallet/simplewallet.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 0f84b81de..b1fdd2688 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -202,7 +202,7 @@ bool simple_wallet::set_log(const std::vector<std::string> &args) return true; } uint16_t l = 0; - if(!string_tools::get_xtype_from_string(l, args[0])) + if(!epee::string_tools::get_xtype_from_string(l, args[0])) { fail_msg_writer() << "wrong number format, use: set_log <log_level_number_0-4>"; return true; @@ -229,8 +229,8 @@ bool simple_wallet::ask_wallet_create_if_needed() wallet_path = string_tools::trim(wallet_path); bool keys_file_exists; - bool wallet_file_exitst; - tools::wallet2::wallet_exists(wallet_path, keys_file_exists, wallet_file_exitst); + bool wallet_file_exists; + tools::wallet2::wallet_exists(wallet_path, keys_file_exists, wallet_file_exists); bool r; if(keys_file_exists) @@ -239,7 +239,7 @@ bool simple_wallet::ask_wallet_create_if_needed() r = true; }else { - if(!wallet_file_exitst) + if(!wallet_file_exists) { std::cout << "The wallet doesn't exist, generating new one" << std::endl; m_generate_new = wallet_path; @@ -749,7 +749,7 @@ bool simple_wallet::transfer(const std::vector<std::string> &args_) } size_t fake_outs_count; - if(!string_tools::get_xtype_from_string(fake_outs_count, local_args[0])) + if(!epee::string_tools::get_xtype_from_string(fake_outs_count, local_args[0])) { fail_msg_writer() << "mixin_count should be non-negative integer, got " << local_args[0]; return true; diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h index 3aa0789ae..3dcaaeaa0 100644 --- a/src/simplewallet/simplewallet.h +++ b/src/simplewallet/simplewallet.h @@ -132,7 +132,7 @@ namespace cryptonote epee::console_handlers_binder m_cmd_binder; std::unique_ptr<tools::wallet2> m_wallet; - net_utils::http::http_simple_client m_http_client; + epee::net_utils::http::http_simple_client m_http_client; refresh_progress_reporter_t m_refresh_progress_reporter; }; } |