X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmain.h;h=b4187098131bfa437879c9a3b73177f0c74d2382;hb=0254a08409f54ac2b37fecb63d9867748823cde3;hp=5ecc4900da4fd2e3a23178b6c50535aca52c358b;hpb=4978be72a4a823bec7c9b6656e8162ce44a29dce;p=novacoin.git diff --git a/src/main.h b/src/main.h index 5ecc490..b418709 100644 --- a/src/main.h +++ b/src/main.h @@ -427,7 +427,7 @@ enum GetMinFee_mode { GMF_BLOCK, GMF_RELAY, - GMF_SEND, + GMF_SEND }; typedef std::map > MapPrevTx; @@ -1176,7 +1176,7 @@ public: { BLOCK_PROOF_OF_STAKE = (1 << 0), // is proof-of-stake block BLOCK_STAKE_ENTROPY = (1 << 1), // entropy bit for stake modifier - BLOCK_STAKE_MODIFIER = (1 << 2), // regenerated stake modifier + BLOCK_STAKE_MODIFIER = (1 << 2) // regenerated stake modifier }; uint64_t nStakeModifier; // hash modifier for proof-of-stake @@ -1367,10 +1367,10 @@ public: std::string ToString() const { return strprintf("CBlockIndex(nprev=%p, pnext=%p, nFile=%u, nBlockPos=%-6d nHeight=%d, nMint=%s, nMoneySupply=%s, nFlags=(%s)(%d)(%s), nStakeModifier=%016" PRIx64 ", nStakeModifierChecksum=%08x, hashProofOfStake=%s, prevoutStake=(%s), nStakeTime=%d merkle=%s, hashBlock=%s)", - pprev, pnext, nFile, nBlockPos, nHeight, + (const void*)pprev, (const void*)pnext, nFile, nBlockPos, nHeight, FormatMoney(nMint).c_str(), FormatMoney(nMoneySupply).c_str(), GeneratedStakeModifier() ? "MOD" : "-", GetStakeEntropyBit(), IsProofOfStake()? "PoS" : "PoW", - nStakeModifier, nStakeModifierChecksum, + nStakeModifier, nStakeModifierChecksum, hashProofOfStake.ToString().c_str(), prevoutStake.ToString().c_str(), nStakeTime, hashMerkleRoot.ToString().c_str(),