aboutsummaryrefslogtreecommitdiff
path: root/src/script/standard.cpp
diff options
context:
space:
mode:
authorJorge Timón <jtimon@jtimon.cc>2017-06-02 03:28:42 +0200
committerJorge Timón <jtimon@jtimon.cc>2017-06-05 20:14:53 +0200
commit1238f13cf6ccf1177b66df735f360c61ae1dc20b (patch)
treefd29fef9e9760c49b121f8191307544ae711d426 /src/script/standard.cpp
parent18dc3c396299caccb0df31254aaec0d08b70dd2a (diff)
downloadbitcoin-1238f13cf6ccf1177b66df735f360c61ae1dc20b.tar.xz
scripted-diff: Remove PAIRTYPE
-BEGIN VERIFY SCRIPT- sed -i 's/PAIRTYPE(\([^,]*\), \([^\)]*\))/std::pair<\1, \2>/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ; sed -i ':a;N;$!ba;s/#define std::pair<t1, t2> std::pair<t1, t2>\n//' ./src/utilstrencodings.h ; -END VERIFY SCRIPT-
Diffstat (limited to 'src/script/standard.cpp')
-rw-r--r--src/script/standard.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index 85b33778b7..7efcad7b0f 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -94,7 +94,7 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, std::vector<std::v
// Scan templates
const CScript& script1 = scriptPubKey;
- for (const PAIRTYPE(txnouttype, CScript)& tplate : mTemplates)
+ for (const std::pair<txnouttype, CScript>& tplate : mTemplates)
{
const CScript& script2 = tplate.second;
vSolutionsRet.clear();