aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2014-12-18 20:17:28 -0500
committerCory Fields <cory-nospam-@coryfields.com>2015-02-03 23:30:59 -0500
commit5a6155ccfa7ee8bb2187054c67f750101986588f (patch)
tree7637a86b5c8e77caf3af820ac20bce10539af56b
parent3447cf87e27262c57031361b3659fef938783295 (diff)
downloadbitcoin-5a6155ccfa7ee8bb2187054c67f750101986588f.tar.xz
c++11: don't forward-declare types used in maps
-rw-r--r--src/keystore.cpp2
-rw-r--r--src/keystore.h5
2 files changed, 2 insertions, 5 deletions
diff --git a/src/keystore.cpp b/src/keystore.cpp
index 22cd08f30c..7531737e04 100644
--- a/src/keystore.cpp
+++ b/src/keystore.cpp
@@ -7,8 +7,6 @@
#include "crypter.h"
#include "key.h"
-#include "script/script.h"
-#include "script/standard.h"
#include "util.h"
#include <boost/foreach.hpp>
diff --git a/src/keystore.h b/src/keystore.h
index 6655264d72..4a4b6d20af 100644
--- a/src/keystore.h
+++ b/src/keystore.h
@@ -8,14 +8,13 @@
#include "key.h"
#include "pubkey.h"
+#include "script/script.h"
+#include "script/standard.h"
#include "sync.h"
#include <boost/signals2/signal.hpp>
#include <boost/variant.hpp>
-class CScript;
-class CScriptID;
-
/** A virtual base class for key stores */
class CKeyStore
{