Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

fixed android/linux warnings

Browse source
This commit is contained in:
cryptozoidberg 2020-06-04 19:31:29 +02:00
parent 8f53591cd9
commit 2cf31bca10
No known key found for this signature in database
GPG key ID: 22DEB97A54C6FDEC
4 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/ntp.cpp
View file

@ -201,7 +201,7 @@ namespace tools
udp_blocking_client ubc(sender_endpoint, socket, io_service);
boost::system::error_code ec;
size_t len = ubc.receive(boost::asio::buffer(&packet_received, sizeof packet_received), boost::posix_time::seconds(static_cast<long>(timeout_sec)), ec);
ubc.receive(boost::asio::buffer(&packet_received, sizeof packet_received), boost::posix_time::seconds(static_cast<long>(timeout_sec)), ec);
if (ec)
{
LOG_PRINT_L3("NTP: get_ntp_time(" << host_name << "): boost error: " << ec.message());

2
src/currency_core/blockchain_storage.cpp
View file

@ -3027,7 +3027,6 @@ bool blockchain_storage::get_est_height_from_date(uint64_t date, uint64_t& res_h
//goal is to get timestamp in window in between 1day+1hour and 1 hour before target(1 hour is just to be sure that
//we didn't miss actual wallet start because of timestamp and difficulty fluctuations)
uint64_t low_boundary = date - 90000; //1 day + 1 hour
uint64_t aim = date - 46800;
uint64_t high_boundary = date - 3600; //1 hour
//std::cout << "ENTRY: low_boundary(minutes):" << low_boundary/60 << " high_boundary(minutes): " << high_boundary / 60 << std::endl;
@ -3043,7 +3042,6 @@ bool blockchain_storage::get_est_height_from_date(uint64_t date, uint64_t& res_h
LOG_ERROR("Internal error: too much iterations on get_est_height_from_date, date = " << date);
return true;
}
uint64_t correction = 0;
uint64_t ts = m_db_blocks[calculated_estimated_height]->bl.timestamp;
if (ts > high_boundary)
{

2
src/wallet/plain_wallet_api.cpp
View file

@ -401,7 +401,7 @@ namespace plain_wallet
{
GET_INSTANCE_PTR(inst_ptr);
epee::json_rpc::response<std::list<view::open_wallet_response>, epee::json_rpc::dummy_error> ok_response = AUTO_VAL_INIT(ok_response);
bool r = inst_ptr->gwm.get_opened_wallets(ok_response.result);
inst_ptr->gwm.get_opened_wallets(ok_response.result);
return epee::serialization::store_t_to_json(ok_response);
}

2
src/wallet/wallet2.cpp
View file

@ -266,7 +266,7 @@ void wallet2::process_new_transaction(const currency::transaction& tx, uint64_t
const currency::txin_to_key& intk = boost::get<currency::txin_to_key>(in);
// check if this input spends our output
transfer_details* p_td = nullptr;
//transfer_details* p_td = nullptr;
uint64_t tid = UINT64_MAX;
if (is_auditable() && is_watch_only())