X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmain.h;h=382ef1a33bd04b5caf015727182f24eda8058298;hb=7483713823cea61963ae0051f3e17ffd4b9be706;hp=c9e3fd5a0ce68a3ac087c083e12738e6cc405c48;hpb=28912e9c4dd7a21cc1f4225bfd5c03a708785ea8;p=novacoin.git diff --git a/src/main.h b/src/main.h index c9e3fd5..382ef1a 100644 --- a/src/main.h +++ b/src/main.h @@ -113,7 +113,7 @@ bool LoadBlockIndex(bool fAllowNew=true); void PrintBlockTree(); CBlockIndex* FindBlockByHeight(int nHeight); bool ProcessMessages(CNode* pfrom); -bool SendMessages(CNode* pto, bool fSendTrickle); +bool SendMessages(CNode* pto); bool LoadExternalBlockFile(FILE* fileIn); // Run an instance of the script checking thread @@ -133,7 +133,7 @@ std::string GetWarnings(std::string strFor); bool GetTransaction(const uint256 &hash, CTransaction &tx, uint256 &hashBlock); uint256 WantedByOrphan(const CBlock* pblockOrphan); const CBlockIndex* GetLastBlockIndex(const CBlockIndex* pindex, bool fProofOfStake); -void ResendWalletTransactions(); +void ResendWalletTransactions(bool fForceResend=false); bool VerifySignature(const CTransaction& txFrom, const CTransaction& txTo, unsigned int nIn, unsigned int flags, int nHashType); @@ -620,8 +620,7 @@ public: try { filein >> *this; } - catch (std::exception &e) { - (void)e; + catch (const std::exception&) { return error("%s() : deserialize or I/O error", BOOST_CURRENT_FUNCTION); } @@ -1096,8 +1095,7 @@ public: try { filein >> *this; } - catch (std::exception &e) { - (void)e; + catch (const std::exception&) { return error("%s() : deserialize or I/O error", BOOST_CURRENT_FUNCTION); }