diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-11-04 08:58:43 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-11-04 09:26:45 +0100 |
| commit | 73b82a30892224b17aa1b9db9b6de4eeeb903b7f (patch) | |
| tree | 0416c14ba1e546a85abc8ab71320bd3f6e5a62c7 /src/script/standard.h | |
| parent | ff17816abf2d2be2b349c4ba4d49633a126074fa (diff) | |
| parent | d2e74c55bdd8cee6a0cca49aca0e2ab1a182c9b5 (diff) | |
| download | bitcoin-73b82a30892224b17aa1b9db9b6de4eeeb903b7f.tar.xz | |
Merge pull request #5162
d2e74c5 boost: moveonly: split CPubKey and friends to new files (Cory Fields)
78c228c boost: moveonly: move BIP32Hash to hash.h (Cory Fields)
900078a boost: moveonly: create eccryptoverify.h|cpp and move helper functions there (Cory Fields)
Diffstat (limited to 'src/script/standard.h')
| -rw-r--r-- | src/script/standard.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/standard.h b/src/script/standard.h index 504d98c686..7d480cd560 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -6,8 +6,7 @@ #ifndef H_BITCOIN_SCRIPT_STANDARD #define H_BITCOIN_SCRIPT_STANDARD -#include "key.h" -#include "script/script.h" +#include "uint256.h" #include "script/interpreter.h" #include <boost/variant.hpp> @@ -15,6 +14,7 @@ #include <stdint.h> class CScript; +class CKeyID; /** A reference to a CScript: the Hash160 of its serialization (see script.h) */ class CScriptID : public uint160 |