|
|
@ -6,7 +6,6 @@ |
|
|
|
#ifndef H_BITCOIN_SCRIPT |
|
|
|
#ifndef H_BITCOIN_SCRIPT |
|
|
|
#define H_BITCOIN_SCRIPT |
|
|
|
#define H_BITCOIN_SCRIPT |
|
|
|
|
|
|
|
|
|
|
|
#include "bignum.h" |
|
|
|
|
|
|
|
#include "key.h" |
|
|
|
#include "key.h" |
|
|
|
#include "util.h" |
|
|
|
#include "util.h" |
|
|
|
|
|
|
|
|
|
|
@ -441,7 +440,6 @@ public: |
|
|
|
explicit CScript(opcodetype b) { operator<<(b); } |
|
|
|
explicit CScript(opcodetype b) { operator<<(b); } |
|
|
|
explicit CScript(const uint256& b) { operator<<(b); } |
|
|
|
explicit CScript(const uint256& b) { operator<<(b); } |
|
|
|
explicit CScript(const CScriptNum& b) { operator<<(b); } |
|
|
|
explicit CScript(const CScriptNum& b) { operator<<(b); } |
|
|
|
explicit CScript(const CBigNum& b) { operator<<(b); } |
|
|
|
|
|
|
|
explicit CScript(const std::vector<unsigned char>& b) { operator<<(b); } |
|
|
|
explicit CScript(const std::vector<unsigned char>& b) { operator<<(b); } |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -477,12 +475,6 @@ public: |
|
|
|
return *this; |
|
|
|
return *this; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
CScript& operator<<(const CBigNum& b) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
*this << b.getvch(); |
|
|
|
|
|
|
|
return *this; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
CScript& operator<<(const CScriptNum& b) |
|
|
|
CScript& operator<<(const CScriptNum& b) |
|
|
|
{ |
|
|
|
{ |
|
|
|
*this << b.getvch(); |
|
|
|
*this << b.getvch(); |
|
|
|