From 85c579e3a63cf505d6cedc454755265572e97d3e Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Wed, 24 Sep 2014 23:32:36 -0400 Subject: [PATCH] script: add a slew of includes all around and drop includes from script.h Lots of files ended up with indirect includes from script.h. --- src/chain.h | 1 + src/chainparams.cpp | 1 + src/core.cpp | 2 ++ src/core_read.cpp | 2 ++ src/core_write.cpp | 1 + src/main.h | 1 + src/protocol.cpp | 1 + src/qt/test/paymentservertests.cpp | 1 + src/script/compressor.cpp | 2 ++ src/script/compressor.h | 3 +++ src/script/interpreter.cpp | 1 + src/script/script.cpp | 3 ++- src/script/script.h | 12 ++++++------ src/script/standard.cpp | 1 + src/script/standard.h | 3 +++ src/test/base58_tests.cpp | 1 + src/txmempool.cpp | 1 + src/utilmoneystr.cpp | 1 + 18 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/chain.h b/src/chain.h index 0aafb40b9..961919d97 100644 --- a/src/chain.h +++ b/src/chain.h @@ -8,6 +8,7 @@ #include "core.h" #include "pow.h" +#include "tinyformat.h" #include "uint256.h" #include diff --git a/src/chainparams.cpp b/src/chainparams.cpp index f2a14b829..689607624 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -7,6 +7,7 @@ #include "random.h" #include "util.h" +#include "utilstrencodings.h" #include diff --git a/src/core.cpp b/src/core.cpp index 6a7a9ff37..73e6de88e 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -5,7 +5,9 @@ #include "core.h" +#include "hash.h" #include "tinyformat.h" +#include "utilstrencodings.h" std::string COutPoint::ToString() const { diff --git a/src/core_read.cpp b/src/core_read.cpp index 6bd3d9a4f..8b85a03c5 100644 --- a/src/core_read.cpp +++ b/src/core_read.cpp @@ -9,6 +9,8 @@ #include "serialize.h" #include "univalue/univalue.h" #include "util.h" +#include "utilstrencodings.h" +#include "version.h" #include #include diff --git a/src/core_write.cpp b/src/core_write.cpp index 40d547fb3..e42e0b62a 100644 --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -12,6 +12,7 @@ #include "univalue/univalue.h" #include "util.h" #include "utilmoneystr.h" +#include "utilstrencodings.h" #include diff --git a/src/main.h b/src/main.h index cad7eebfb..9f9401653 100644 --- a/src/main.h +++ b/src/main.h @@ -20,6 +20,7 @@ #include "script/sigcache.h" #include "script/standard.h" #include "sync.h" +#include "tinyformat.h" #include "txmempool.h" #include "uint256.h" diff --git a/src/protocol.cpp b/src/protocol.cpp index 0e28f3abb..72fdd753a 100644 --- a/src/protocol.cpp +++ b/src/protocol.cpp @@ -7,6 +7,7 @@ #include "chainparams.h" #include "util.h" +#include "utilstrencodings.h" #ifndef WIN32 # include diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp index 5d7fe9628..84cab01c5 100644 --- a/src/qt/test/paymentservertests.cpp +++ b/src/qt/test/paymentservertests.cpp @@ -8,6 +8,7 @@ #include "paymentrequestdata.h" #include "util.h" +#include "utilstrencodings.h" #include #include diff --git a/src/script/compressor.cpp b/src/script/compressor.cpp index dbb4df8b7..af1acf48d 100644 --- a/src/script/compressor.cpp +++ b/src/script/compressor.cpp @@ -4,6 +4,8 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "compressor.h" + +#include "key.h" #include "script/standard.h" bool CScriptCompressor::IsToKeyID(CKeyID &hash) const diff --git a/src/script/compressor.h b/src/script/compressor.h index f48ecf500..154e0b266 100644 --- a/src/script/compressor.h +++ b/src/script/compressor.h @@ -7,7 +7,10 @@ #define H_BITCOIN_SCRIPT_COMPRESSOR #include "script/script.h" +#include "serialize.h" +class CKeyID; +class CPubKey; class CScriptID; /** Compact serializer for scripts. diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index ae66217b7..cd73b8821 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -9,6 +9,7 @@ #include "crypto/ripemd160.h" #include "crypto/sha1.h" #include "crypto/sha2.h" +#include "key.h" #include "script/script.h" #include "uint256.h" #include "util.h" diff --git a/src/script/script.cpp b/src/script/script.cpp index 1ce8ddb6d..3e19d0c2b 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -5,7 +5,8 @@ #include "script.h" -#include +#include "tinyformat.h" +#include "utilstrencodings.h" namespace { inline std::string ValueString(const std::vector& vch) diff --git a/src/script/script.h b/src/script/script.h index 4f6ee0c52..a68924c73 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -6,13 +6,13 @@ #ifndef H_BITCOIN_SCRIPT #define H_BITCOIN_SCRIPT -#include "key.h" -#include "tinyformat.h" -#include "utilstrencodings.h" - +#include +#include +#include #include - -#include +#include +#include +#include static const unsigned int MAX_SCRIPT_ELEMENT_SIZE = 520; // bytes diff --git a/src/script/standard.cpp b/src/script/standard.cpp index 7e6b136a2..05938961b 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -7,6 +7,7 @@ #include "script/script.h" #include "util.h" +#include "utilstrencodings.h" #include diff --git a/src/script/standard.h b/src/script/standard.h index 38d0b5988..961b214c8 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -6,9 +6,12 @@ #ifndef H_BITCOIN_SCRIPT_STANDARD #define H_BITCOIN_SCRIPT_STANDARD +#include "key.h" #include "script/script.h" #include "script/interpreter.h" +#include + #include class CScript; diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp index c298c805d..e495435b8 100644 --- a/src/test/base58_tests.cpp +++ b/src/test/base58_tests.cpp @@ -12,6 +12,7 @@ #include "script/script.h" #include "uint256.h" #include "util.h" +#include "utilstrencodings.h" #include #include diff --git a/src/txmempool.cpp b/src/txmempool.cpp index fa1802ad3..4522c6361 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -8,6 +8,7 @@ #include "core.h" #include "util.h" #include "utilmoneystr.h" +#include "version.h" #include diff --git a/src/utilmoneystr.cpp b/src/utilmoneystr.cpp index 1a5635bfb..95be06aa1 100644 --- a/src/utilmoneystr.cpp +++ b/src/utilmoneystr.cpp @@ -7,6 +7,7 @@ #include "core.h" #include "tinyformat.h" +#include "utilstrencodings.h" using namespace std;