sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 04:52:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3650

Browse Source 
2b45345 minor style cleanups (Philip Kaufmann)
This commit is contained in:
Wladimir J. van der Laan 2014-03-15 10:23:54 +01:00
commit acfe60677c
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main.h
View File

@ -427,6 +427,7 @@ class CMerkleTx : public CTransaction
{ {
private: private:
int GetDepthInMainChainINTERNAL(CBlockIndex* &pindexRet) const; int GetDepthInMainChainINTERNAL(CBlockIndex* &pindexRet) const;
public: public:
uint256 hashBlock; uint256 hashBlock;
std::vector<uint256> vMerkleBranch; std::vector<uint256> vMerkleBranch;

3
src/test/checkblock_tests.cpp
View File

@ -15,8 +15,7 @@
BOOST_AUTO_TEST_SUITE(CheckBlock_tests) BOOST_AUTO_TEST_SUITE(CheckBlock_tests)
bool bool read_block(const std::string& filename, CBlock& block)
read_block(const std::string& filename, CBlock& block)
{ {
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
fs::path testFile = fs::current_path() / "data" / filename; fs::path testFile = fs::current_path() / "data" / filename;