aboutsummaryrefslogtreecommitdiff
path: root/src/main.h
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2011-12-19 07:27:25 -0800
committerGavin Andresen <gavinandresen@gmail.com>2011-12-19 07:27:25 -0800
commit99a289f531e9dc42aa81ea32ff84b807a46b6a9c (patch)
treea4d7f89dbfdb11aef1fe4b6644a1ba127d0e97f5 /src/main.h
parentfc90967876a0b8c762cba4a9f40a80db7a8b0432 (diff)
parent95d888a6d1f659a5cb81124e0d97966b9de1f139 (diff)
Merge pull request #574 from sipa/dumpprivkey
Dumpprivkey
Diffstat (limited to 'src/main.h')
-rw-r--r--src/main.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/main.h b/src/main.h
index e519ef6551..7f8da4e898 100644
--- a/src/main.h
+++ b/src/main.h
@@ -699,8 +699,8 @@ public:
int SetMerkleBranch(const CBlock* pblock=NULL);
- int GetDepthInMainChain(int& nHeightRet) const;
- int GetDepthInMainChain() const { int nHeight; return GetDepthInMainChain(nHeight); }
+ int GetDepthInMainChain(CBlockIndex* &pindexRet) const;
+ int GetDepthInMainChain() const { CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet); }
bool IsInMainChain() const { return GetDepthInMainChain() > 0; }
int GetBlocksToMaturity() const;
bool AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs=true);
@@ -762,6 +762,7 @@ public:
return !(a == b);
}
int GetDepthInMainChain() const;
+
};
@@ -1267,6 +1268,11 @@ public:
Set((*mi).second);
}
+ CBlockLocator(const std::vector<uint256>& vHaveIn)
+ {
+ vHave = vHaveIn;
+ }
+
IMPLEMENT_SERIALIZE
(
if (!(nType & SER_GETHASH))