mirror of
https://github.com/monero-project/monero.git
synced 2026-07-28 14:47:15 -07:00
Merge pull request #10921
edea850 general: replace auto_scope_leave_caller with scope_guard (jeffro256)
ACKs: selsta, tobtoht
This commit is contained in:
@@ -35,8 +35,6 @@
|
||||
#include <cstdint>
|
||||
#include <chrono>
|
||||
#include <cstring>
|
||||
#include "include_base_utils.h"
|
||||
using namespace epee;
|
||||
|
||||
#include "version.h"
|
||||
#include "wallet_rpc_server.h"
|
||||
@@ -49,7 +47,6 @@ using namespace epee;
|
||||
#include "cryptonote_basic/account.h"
|
||||
#include "multisig/multisig.h"
|
||||
#include "wallet_rpc_server_commands_defs.h"
|
||||
#include "misc_language.h"
|
||||
#include "string_coding.h"
|
||||
#include "string_tools.h"
|
||||
#include "crypto/hash.h"
|
||||
@@ -136,6 +133,8 @@ using namespace epee;
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
using namespace epee;
|
||||
|
||||
namespace
|
||||
{
|
||||
const command_line::arg_descriptor<std::string, true> arg_rpc_bind_port = {"rpc-bind-port", "Sets bind port for server"};
|
||||
@@ -3519,7 +3518,7 @@ namespace tools
|
||||
return false;
|
||||
}
|
||||
|
||||
cryptonote::COMMAND_RPC_START_MINING::request daemon_req = AUTO_VAL_INIT(daemon_req);
|
||||
cryptonote::COMMAND_RPC_START_MINING::request daemon_req{};
|
||||
daemon_req.miner_address = m_wallet->get_account().get_public_address_str(m_wallet->nettype());
|
||||
daemon_req.threads_count = req.threads_count;
|
||||
daemon_req.do_background_mining = req.do_background_mining;
|
||||
|
||||
Reference in New Issue
Block a user