diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2022-05-26 21:25:06 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2022-05-26 21:25:06 -0500 |
| commit | e8252ef99bb4138e4afcac314a191e7fdf8d8553 (patch) | |
| tree | b452a60b7ec89fe38f4d0f5d1489544b5a99bb62 | |
| parent | Merge pull request #8331 (diff) | |
| parent | src, epee: fix a couple compiler warnings (diff) | |
| download | monero-e8252ef99bb4138e4afcac314a191e7fdf8d8553.tar.xz | |
Merge pull request #8337
1164874 src, epee: fix a couple compiler warnings (selsta)
| -rw-r--r-- | contrib/epee/include/storages/portable_storage_from_json.h | 1 | ||||
| -rw-r--r-- | src/cryptonote_basic/account.h | 2 | ||||
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/contrib/epee/include/storages/portable_storage_from_json.h b/contrib/epee/include/storages/portable_storage_from_json.h index 3021598f5..69192ca6b 100644 --- a/contrib/epee/include/storages/portable_storage_from_json.h +++ b/contrib/epee/include/storages/portable_storage_from_json.h @@ -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"); - std::string::const_iterator sub_element_start; std::string name; typename t_storage::harray h_array = nullptr; enum match_state diff --git a/src/cryptonote_basic/account.h b/src/cryptonote_basic/account.h index 6e887db6d..2ee9545d4 100644 --- a/src/cryptonote_basic/account.h +++ b/src/cryptonote_basic/account.h @@ -55,8 +55,6 @@ namespace cryptonote KV_SERIALIZE_VAL_POD_AS_BLOB_OPT(m_encryption_iv, default_iv) END_KV_SERIALIZE_MAP() - account_keys& operator=(account_keys const&) = default; - void encrypt(const crypto::chacha_key &key); void decrypt(const crypto::chacha_key &key); void encrypt_viewkey(const crypto::chacha_key &key); diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 05d10b734..f6e313089 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -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::tx_destination_entry> dsts; - size_t num_subaddresses = 0; for (size_t i = 0; i < local_args.size(); ) { 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.is_subaddress = info.is_subaddress; de.is_integrated = info.has_payment_id; - num_subaddresses += info.is_subaddress; if (info.has_payment_id || !payment_id_uri.empty()) { |