diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-10-28 05:22:34 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-10-28 05:27:41 -0700 |
| commit | 723c7526368badda15df8ac1ffc047a0ab2e384a (patch) | |
| tree | ee490e57014cea5b59355a48251b5df69020a90c /src/main.h | |
| parent | cd9114e5136ecc1f60baa43fffeeb632782f2353 (diff) | |
| parent | 99f41b9cf7b8e039cea75500a905498a1f6969f3 (diff) | |
| download | bitcoin-723c7526368badda15df8ac1ffc047a0ab2e384a.tar.xz | |
Merge pull request #5100
99f41b9 MOVEONLY: core.o -> core/block.o (jtimon)
561e9e9 MOVEONLY: Move script/compressor out of script and put CTxOutCompressor (from core) with it (jtimon)
999a2ab MOVEONLY: separate CTxUndo out of core (jtimon)
4a3587d MOVEONLY: Separate CTransaction and dependencies from core (jtimon)
eda3733 MOVEONLY: Move CFeeRate and Amount constants to amount.o (jtimon)
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main.h b/src/main.h index 1ef51918c5..1941ca7059 100644 --- a/src/main.h +++ b/src/main.h @@ -10,10 +10,12 @@ #include "config/bitcoin-config.h" #endif +#include "amount.h" #include "chain.h" #include "chainparams.h" #include "coins.h" -#include "core.h" +#include "core/block.h" +#include "core/transaction.h" #include "net.h" #include "pow.h" #include "script/script.h" @@ -23,6 +25,7 @@ #include "tinyformat.h" #include "txmempool.h" #include "uint256.h" +#include "undo.h" #include <algorithm> #include <exception> @@ -127,7 +130,6 @@ static const uint64_t nMinDiskSpace = 52428800; class CBlockTreeDB; -class CTxUndo; class CScriptCheck; class CValidationState; class CValidationInterface; |