diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-10-10 15:47:08 +0100 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-11-14 16:56:10 +0000 |
| commit | 383ff4f68943c5d998fba8caa20aee481583f214 (patch) | |
| tree | 23eefe275400a75af13faa49af8198ba3ab1183c /src/simplewallet/simplewallet.cpp | |
| parent | Merge pull request #2720 (diff) | |
| download | monero-383ff4f68943c5d998fba8caa20aee481583f214.tar.xz | |
remove "using namespace std" from headers
It's nasty, and actually breaks on Solaris, where if.h fails to
build due to:
struct map *if_memmap;
Diffstat (limited to 'src/simplewallet/simplewallet.cpp')
| -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 24e7d54dd..b55224560 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -4266,7 +4266,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; @@ -4993,7 +4993,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) { |