Browse Source

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.
pull/1/head
Cory Fields 8 years ago
parent
commit
85c579e3a6
  1. 1
      src/chain.h
  2. 1
      src/chainparams.cpp
  3. 2
      src/core.cpp
  4. 2
      src/core_read.cpp
  5. 1
      src/core_write.cpp
  6. 1
      src/main.h
  7. 1
      src/protocol.cpp
  8. 1
      src/qt/test/paymentservertests.cpp
  9. 2
      src/script/compressor.cpp
  10. 3
      src/script/compressor.h
  11. 1
      src/script/interpreter.cpp
  12. 3
      src/script/script.cpp
  13. 12
      src/script/script.h
  14. 1
      src/script/standard.cpp
  15. 3
      src/script/standard.h
  16. 1
      src/test/base58_tests.cpp
  17. 1
      src/txmempool.cpp
  18. 1
      src/utilmoneystr.cpp

1
src/chain.h

@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
#include "core.h"
#include "pow.h"
#include "tinyformat.h"
#include "uint256.h"
#include <vector>

1
src/chainparams.cpp

@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
#include "random.h"
#include "util.h"
#include "utilstrencodings.h"
#include <assert.h>

2
src/core.cpp

@ -5,7 +5,9 @@ @@ -5,7 +5,9 @@
#include "core.h"
#include "hash.h"
#include "tinyformat.h"
#include "utilstrencodings.h"
std::string COutPoint::ToString() const
{

2
src/core_read.cpp

@ -9,6 +9,8 @@ @@ -9,6 +9,8 @@
#include "serialize.h"
#include "univalue/univalue.h"
#include "util.h"
#include "utilstrencodings.h"
#include "version.h"
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/predicate.hpp>

1
src/core_write.cpp

@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
#include "univalue/univalue.h"
#include "util.h"
#include "utilmoneystr.h"
#include "utilstrencodings.h"
#include <boost/foreach.hpp>

1
src/main.h

@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
#include "script/sigcache.h"
#include "script/standard.h"
#include "sync.h"
#include "tinyformat.h"
#include "txmempool.h"
#include "uint256.h"

1
src/protocol.cpp

@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
#include "chainparams.h"
#include "util.h"
#include "utilstrencodings.h"
#ifndef WIN32
# include <arpa/inet.h>

1
src/qt/test/paymentservertests.cpp

@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
#include "paymentrequestdata.h"
#include "util.h"
#include "utilstrencodings.h"
#include <openssl/x509.h>
#include <openssl/x509_vfy.h>

2
src/script/compressor.cpp

@ -4,6 +4,8 @@ @@ -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

3
src/script/compressor.h

@ -7,7 +7,10 @@ @@ -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.

1
src/script/interpreter.cpp

@ -9,6 +9,7 @@ @@ -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"

3
src/script/script.cpp

@ -5,7 +5,8 @@ @@ -5,7 +5,8 @@
#include "script.h"
#include <boost/foreach.hpp>
#include "tinyformat.h"
#include "utilstrencodings.h"
namespace {
inline std::string ValueString(const std::vector<unsigned char>& vch)

12
src/script/script.h

@ -6,13 +6,13 @@ @@ -6,13 +6,13 @@
#ifndef H_BITCOIN_SCRIPT
#define H_BITCOIN_SCRIPT
#include "key.h"
#include "tinyformat.h"
#include "utilstrencodings.h"
#include <assert.h>
#include <climits>
#include <limits>
#include <stdexcept>
#include <boost/variant.hpp>
#include <stdint.h>
#include <string.h>
#include <vector>
static const unsigned int MAX_SCRIPT_ELEMENT_SIZE = 520; // bytes

1
src/script/standard.cpp

@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
#include "script/script.h"
#include "util.h"
#include "utilstrencodings.h"
#include <boost/foreach.hpp>

3
src/script/standard.h

@ -6,9 +6,12 @@ @@ -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 <boost/variant.hpp>
#include <stdint.h>
class CScript;

1
src/test/base58_tests.cpp

@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
#include "script/script.h"
#include "uint256.h"
#include "util.h"
#include "utilstrencodings.h"
#include <boost/foreach.hpp>
#include <boost/test/unit_test.hpp>

1
src/txmempool.cpp

@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
#include "core.h"
#include "util.h"
#include "utilmoneystr.h"
#include "version.h"
#include <boost/circular_buffer.hpp>

1
src/utilmoneystr.cpp

@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
#include "core.h"
#include "tinyformat.h"
#include "utilstrencodings.h"
using namespace std;

Loading…
Cancel
Save