diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-01-20 17:34:30 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-01-20 17:34:43 +0100 |
| commit | 7810a0a1e6fc4088694a45b5c86493a47d5c7c8a (patch) | |
| tree | b8f8ce111e156e728d22eee8d56ae32fa8cc89a9 /src/main.h | |
| parent | 848f55d52fe2f7143f9ccfa5ab8bd82c098a7b6d (diff) | |
| parent | 2ce63d395fe3d71e921ecd9f4263031b25efa14e (diff) | |
| download | bitcoin-7810a0a1e6fc4088694a45b5c86493a47d5c7c8a.tar.xz | |
Merge pull request #5648
2ce63d3 MOVEONLY: Move struct CBlockTemplate to miner.h (from main.h) (Luke Dashjr)
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/main.h b/src/main.h index 2b260a665b..a7360d2f70 100644 --- a/src/main.h +++ b/src/main.h @@ -45,7 +45,6 @@ class CScriptCheck; class CValidationInterface; class CValidationState; -struct CBlockTemplate; struct CNodeStateStats; /** Default for -blockmaxsize and -blockminsize, which control the range of sizes the mining code will create **/ @@ -513,17 +512,6 @@ extern CCoinsViewCache *pcoinsTip; /** Global variable that points to the active block tree (protected by cs_main) */ extern CBlockTreeDB *pblocktree; -struct CBlockTemplate -{ - CBlock block; - std::vector<CAmount> vTxFees; - std::vector<int64_t> vTxSigOps; -}; - - - - - class CValidationInterface { protected: |