diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-12 08:27:17 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-12 08:35:33 +0200 |
| commit | a63e86e01d6fa340f250202b9e22e09e85d8a0d2 (patch) | |
| tree | 4f9243020389b92b4cd23f0a81dfaaaa5e5e96a2 /src | |
| parent | 47963936d6e13007af4c0bc1f1618fbf05f26239 (diff) | |
| parent | a381ee5d1c1c01c66e681e245f60f2de2b79b264 (diff) | |
| download | bitcoin-a63e86e01d6fa340f250202b9e22e09e85d8a0d2.tar.xz | |
Merge pull request #4680
a381ee5 Remove unnecessary typedef and script.h include (jtimon)
Diffstat (limited to 'src')
| -rw-r--r-- | src/keystore.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/keystore.h b/src/keystore.h index 72411a1387..6a3a0dc13e 100644 --- a/src/keystore.h +++ b/src/keystore.h @@ -8,21 +8,12 @@ #include "key.h" #include "sync.h" -#include "script.h" // for CNoDestination #include <boost/signals2/signal.hpp> #include <boost/variant.hpp> class CScript; -/** A txout script template with a specific destination. It is either: - * * CNoDestination: no destination set - * * CKeyID: TX_PUBKEYHASH destination - * * CScriptID: TX_SCRIPTHASH destination - * A CTxDestination is the internal data type encoded in a CBitcoinAddress - */ -typedef boost::variant<CNoDestination, CKeyID, CScriptID> CTxDestination; - /** A virtual base class for key stores */ class CKeyStore { |