aboutsummaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2014-10-28 17:47:18 -0400
committerCory Fields <cory-nospam-@coryfields.com>2014-10-31 01:19:37 -0400
commitd2e74c55bdd8cee6a0cca49aca0e2ab1a182c9b5 (patch)
treee7b9bb9ee8b0aa0302389cc9d9c6b6e9a78d6836 /src/script
parent78c228c6e5f35b6f2e1917d8677694779f837618 (diff)
boost: moveonly: split CPubKey and friends to new files
Diffstat (limited to 'src/script')
-rw-r--r--src/script/interpreter.cpp2
-rw-r--r--src/script/sigcache.cpp2
-rw-r--r--src/script/standard.cpp1
-rw-r--r--src/script/standard.h4
4 files changed, 5 insertions, 4 deletions
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index e1e242882f..54c2847f79 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -10,7 +10,7 @@
#include "crypto/sha1.h"
#include "crypto/sha2.h"
#include "eccryptoverify.h"
-#include "key.h"
+#include "pubkey.h"
#include "script/script.h"
#include "uint256.h"
#include "util.h"
diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp
index ab366898d8..d76a5acd63 100644
--- a/src/script/sigcache.cpp
+++ b/src/script/sigcache.cpp
@@ -5,7 +5,7 @@
#include "sigcache.h"
-#include "key.h"
+#include "pubkey.h"
#include "random.h"
#include "uint256.h"
#include "util.h"
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index 05938961bc..9cae0508e1 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -5,6 +5,7 @@
#include "script/standard.h"
+#include "pubkey.h"
#include "script/script.h"
#include "util.h"
#include "utilstrencodings.h"
diff --git a/src/script/standard.h b/src/script/standard.h
index 248b941a64..171178ce3d 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