monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 08:17:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8337

Browse source 
1164874 src, epee: fix a couple compiler warnings (selsta)
This commit is contained in:
luigi1111 2022-05-26 21:25:06 -05:00
commit e8252ef99b
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
3 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
contrib/epee/include/storages/portable_storage_from_json.h
View file

@ -51,7 +51,6 @@ namespace epee
{ {
CHECK_AND_ASSERT_THROW_MES(recursion < EPEE_JSON_RECURSION_LIMIT_INTERNAL, "Wrong JSON data: recursion limitation (" << EPEE_JSON_RECURSION_LIMIT_INTERNAL << ") exceeded"); CHECK_AND_ASSERT_THROW_MES(recursion < EPEE_JSON_RECURSION_LIMIT_INTERNAL, "Wrong JSON data: recursion limitation (" << EPEE_JSON_RECURSION_LIMIT_INTERNAL << ") exceeded");
std::string::const_iterator sub_element_start;
std::string name; std::string name;
typename t_storage::harray h_array = nullptr; typename t_storage::harray h_array = nullptr;
enum match_state enum match_state

2
src/cryptonote_basic/account.h
View file

@ -55,8 +55,6 @@ namespace cryptonote
KV_SERIALIZE_VAL_POD_AS_BLOB_OPT(m_encryption_iv, default_iv) KV_SERIALIZE_VAL_POD_AS_BLOB_OPT(m_encryption_iv, default_iv)
END_KV_SERIALIZE_MAP() END_KV_SERIALIZE_MAP()
account_keys& operator=(account_keys const&) = default;
void encrypt(const crypto::chacha_key &key); void encrypt(const crypto::chacha_key &key);
void decrypt(const crypto::chacha_key &key); void decrypt(const crypto::chacha_key &key);
void encrypt_viewkey(const crypto::chacha_key &key); void encrypt_viewkey(const crypto::chacha_key &key);

2
src/simplewallet/simplewallet.cpp
View file

@ -6611,7 +6611,6 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri
vector<cryptonote::address_parse_info> dsts_info; vector<cryptonote::address_parse_info> dsts_info;
vector<cryptonote::tx_destination_entry> dsts; vector<cryptonote::tx_destination_entry> dsts;
size_t num_subaddresses = 0;
for (size_t i = 0; i < local_args.size(); ) for (size_t i = 0; i < local_args.size(); )
{ {
dsts_info.emplace_back(); dsts_info.emplace_back();
@ -6670,7 +6669,6 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri
de.addr = info.address; de.addr = info.address;
de.is_subaddress = info.is_subaddress; de.is_subaddress = info.is_subaddress;
de.is_integrated = info.has_payment_id; de.is_integrated = info.has_payment_id;
num_subaddresses += info.is_subaddress;
if (info.has_payment_id || !payment_id_uri.empty()) if (info.has_payment_id || !payment_id_uri.empty())
{ {