diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-11-26 10:43:01 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-11-26 10:44:42 +0100 |
| commit | e6751ca68abdb15db0ad91a9040d7bc1a413ae31 (patch) | |
| tree | 66275c62d8a579c18d9c6886a646f12620da3bb3 /src/script | |
| parent | Merge pull request #5340 (diff) | |
| parent | libbitcoinconsensus: don't require any global constructors (diff) | |
| download | discoin-e6751ca68abdb15db0ad91a9040d7bc1a413ae31.tar.xz discoin-e6751ca68abdb15db0ad91a9040d7bc1a413ae31.zip | |
Merge pull request #5361
3223179 libbitcoinconsensus: don't require any global constructors (Cory Fields)
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/interpreter.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index 5eda23731..a10cefcc0 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -17,13 +17,6 @@ using namespace std; typedef vector<unsigned char> valtype; -static const valtype vchFalse(0); -static const valtype vchZero(0); -static const valtype vchTrue(1, 1); -static const CScriptNum bnZero(0); -static const CScriptNum bnOne(1); -static const CScriptNum bnFalse(0); -static const CScriptNum bnTrue(1); namespace { @@ -239,6 +232,14 @@ bool static CheckMinimalPush(const valtype& data, opcodetype opcode) { bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, unsigned int flags, const BaseSignatureChecker& checker, ScriptError* serror) { + static const CScriptNum bnZero(0); + static const CScriptNum bnOne(1); + static const CScriptNum bnFalse(0); + static const CScriptNum bnTrue(1); + static const valtype vchFalse(0); + static const valtype vchZero(0); + static const valtype vchTrue(1, 1); + CScript::const_iterator pc = script.begin(); CScript::const_iterator pend = script.end(); CScript::const_iterator pbegincodehash = script.begin(); |