diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-11-14 21:29:49 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-11-14 21:29:49 +0200 |
| commit | 5de492be40e9d55a9b432b562c72e933d0df0efb (patch) | |
| tree | 46d23b2a38a41bbc6f1786f6c97413c1de3aefb5 /src/simplewallet | |
| parent | Merge pull request #2756 (diff) | |
| parent | remove "using namespace std" from headers (diff) | |
| download | monero-5de492be40e9d55a9b432b562c72e933d0df0efb.tar.xz | |
Merge pull request #2629
383ff4f6 remove "using namespace std" from headers (moneromooo-monero)
Diffstat (limited to 'src/simplewallet')
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 3d8d395db..e6e318764 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -4287,7 +4287,7 @@ bool simple_wallet::check_tx_proof(const std::vector<std::string> &args) return true; } crypto::public_key tx_pub_key = get_tx_pub_key_from_extra(tx); - if (tx_pub_key == null_pkey) + if (tx_pub_key == crypto::null_pkey) { fail_msg_writer() << tr("Tx pubkey was not found"); return true; @@ -5015,7 +5015,7 @@ bool simple_wallet::address_book(const std::vector<std::string> &args/* = std::v fail_msg_writer() << tr("failed to parse address"); return true; } - crypto::hash payment_id = null_hash; + crypto::hash payment_id = crypto::null_hash; size_t description_start = 2; if (info.has_payment_id) { |