Merge pull request #2629

383ff4f6 remove "using namespace std" from headers (moneromooo-monero)
This commit is contained in:
Riccardo Spagni
2017-11-14 21:29:49 +02:00
24 changed files with 47 additions and 51 deletions

View File

@@ -1026,7 +1026,7 @@ namespace cryptonote
}
blobdata block_blob = t_serializable_object_to_blob(b);
crypto::public_key tx_pub_key = cryptonote::get_tx_pub_key_from_extra(b.miner_tx);
if(tx_pub_key == null_pkey)
if(tx_pub_key == crypto::null_pkey)
{
error_resp.code = CORE_RPC_ERROR_CODE_INTERNAL_ERROR;
error_resp.message = "Internal error: failed to create block template";