diff options
| author | Cory Fields <[email protected]> | 2014-09-24 22:24:46 -0400 |
|---|---|---|
| committer | Cory Fields <[email protected]> | 2014-10-17 13:44:14 -0400 |
| commit | 066e2a1403fe306787a2ce0c8571aa9de57386cf (patch) | |
| tree | 5a4257c467978f1260a0d69e937c16ba16a01773 /src/script/script.h | |
| parent | Merge pull request #5082 (diff) | |
| download | discoin-066e2a1403fe306787a2ce0c8571aa9de57386cf.tar.xz discoin-066e2a1403fe306787a2ce0c8571aa9de57386cf.zip | |
script: move CScriptID to standard.h and add a ctor for creating them from CScripts
This allows for a reversal of the current behavior.
This:
CScript foo;
CScriptID bar(foo.GetID());
Becomes:
CScript foo;
CScriptID bar(foo);
This way, CScript is no longer dependent on CScriptID or Hash();
Diffstat (limited to 'src/script/script.h')
| -rw-r--r-- | src/script/script.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/script/script.h b/src/script/script.h index caf176476..4d685f559 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -610,12 +610,6 @@ public: } return str; } - - CScriptID GetID() const - { - return CScriptID(Hash160(*this)); - } - void clear() { // The default std::vector::clear() does not release memory. |