diff options
| author | Luke Dashjr <[email protected]> | 2016-02-03 05:41:13 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2016-02-03 05:41:13 +0000 |
| commit | a68bb9f5e7ef1da5c044907dc3a1d3d4a4dbc2cc (patch) | |
| tree | 7e3932c75353499d6659b4f5a94b40e07e64c364 /src/script/interpreter.cpp | |
| parent | When/if the copyright line does not mention Bitcoin Core developers, add a se... (diff) | |
| parent | Merge #7091: Consensus build package (diff) | |
| download | discoin-a68bb9f5e7ef1da5c044907dc3a1d3d4a4dbc2cc.tar.xz discoin-a68bb9f5e7ef1da5c044907dc3a1d3d4a4dbc2cc.zip | |
Merge branch 'master' into single_prodname
Diffstat (limited to 'src/script/interpreter.cpp')
| -rw-r--r-- | src/script/interpreter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index 8dcab832c..a92822326 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2014 The Bitcoin Core developers +// Copyright (c) 2009-2015 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -1023,7 +1023,7 @@ public: // Serialize the script if (nInput != nIn) // Blank out other inputs' signatures - ::Serialize(s, CScript(), nType, nVersion); + ::Serialize(s, CScriptBase(), nType, nVersion); else SerializeScriptCode(s, nType, nVersion); // Serialize the nSequence |