dash/blackcoin-more
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'checknewblock_0.6.0' into checknewblock

Browse Source 
Conflicts:
	src/main.cpp
This commit is contained in:
Luke Dashjr
2012-07-11 04:24:58 +00:00
parent 232393e3bd 3cd01fdf0e
commit fbf99a9cdc
2 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.h
View File

@@ -1016,11 +1016,11 @@ public:
bool DisconnectBlock(CTxDB& txdb, CBlockIndex* pindex);
bool ConnectBlock(CTxDB& txdb, CBlockIndex* pindex);
bool ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck=false);
bool ReadFromDisk(const CBlockIndex* pindex, bool fReadTransactions=true);
bool SetBestChain(CTxDB& txdb, CBlockIndex* pindexNew);
bool AddToBlockIndex(unsigned int nFile, unsigned int nBlockPos);
bool CheckBlock() const;
bool CheckBlock(bool fCheckPOW=true, bool fCheckMerkleRoot=true) const;
bool AcceptBlock();
private: