diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-11 08:26:17 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-11 08:26:20 +0200 |
| commit | 4e45932659aa04417661b63e7e0546e656997d6c (patch) | |
| tree | 2f13fb0de5dd6fbdcb62c096e9ba3e42b7a2ebcc /src | |
| parent | ec7be4a11c1a547d78f844e339a1c5db4f587a49 (diff) | |
| parent | 699fe635c6f829e06739e096b0997976e2030ddf (diff) | |
| download | bitcoin-4e45932659aa04417661b63e7e0546e656997d6c.tar.xz | |
Merge pull request #4321
699fe63 remove wrong ; in chainparams.h and order includes (Philip Kaufmann)
Diffstat (limited to 'src')
| -rw-r--r-- | src/chainparams.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/chainparams.h b/src/chainparams.h index 988e3ac3a4..8370cc5690 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -6,9 +6,9 @@ #ifndef BITCOIN_CHAIN_PARAMS_H #define BITCOIN_CHAIN_PARAMS_H -#include "uint256.h" #include "core.h" #include "protocol.h" +#include "uint256.h" #include <vector> @@ -62,7 +62,7 @@ public: /* Used if GenerateBitcoins is called with a negative number of threads */ int DefaultMinerThreads() const { return nMinerThreads; } - const CBlock& GenesisBlock() const { return genesis; }; + const CBlock& GenesisBlock() const { return genesis; } bool RequireRPCPassword() const { return fRequireRPCPassword; } /* Make miner wait to have peers to avoid wasting work */ bool MiningRequiresPeers() const { return fMiningRequiresPeers; } |