minor style cleanups

Conflicts:

	src/main.cpp
This commit is contained in:
Philip Kaufmann 2014-02-10 16:31:06 +01:00 committed by Ross Nicoll
parent c2b913f10d
commit 3e0de4da6b
3 changed files with 11 additions and 11 deletions

View file

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

View file

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